-
-
- 
-
+
+ 
+
+
+ 
+
+
+
+
-
- 
-
+
+
+
Test purely for testing with the debugger has email =
+attached
From:=
+ =
+Notification [mailto:test_receiver@example.com]
Sent: Wednesday, 27 =
+January 2016 9:30 AM
To: =
+test_receiver@example.com
Subject: Sales Invoice: =
+SINV-12276
test no 3 sent from bench to outlook to be replied to with =
+messaging
fizz buzz
This email was sent to test_receiver@example.=
+com and copied to SuperUser
Leave this conversation =
+
hi
${html}
`) + .html(`${html}
`) .get(0); }, sort: function() { @@ -200,10 +200,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat if(frappe.model.can_create(doctype)) { // new item r.results.push({ - label: "" + html: "" + " " + __("Create a new {0}", [__(me.get_options())]) + "", + label: __("Create a new {0}", [__(me.get_options())]), value: "create_new__link_option", action: me.new_doc }); @@ -213,10 +214,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat if (locals && locals['DocType']) { // not applicable in web forms r.results.push({ - label: "" + html: "" + " " + __("Advanced Search") + "", + label: __("Advanced Search"), value: "advanced_search__link_option", action: me.open_advanced_search }); diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index 059b0f76f8..99e87c5f21 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -1,7 +1,10 @@ import Quill from 'quill'; import ImageResize from 'quill-image-resize'; +import MagicUrl from 'quill-magic-url'; + Quill.register('modules/imageResize', ImageResize); +Quill.register('modules/magicUrl', MagicUrl); const CodeBlockContainer = Quill.import('formats/code-block-container'); CodeBlockContainer.tagName = 'PRE'; Quill.register(CodeBlockContainer, true); @@ -148,7 +151,8 @@ frappe.ui.form.ControlTextEditor = class ControlTextEditor extends frappe.ui.for modules: { toolbar: this.get_toolbar_options(), table: true, - imageResize: {} + imageResize: {}, + magicUrl: true }, theme: 'snow' }; diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index c1c95d94cf..6833f68073 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -5,6 +5,7 @@ frappe.ui.form.Dashboard = class FormDashboard { constructor(opts) { $.extend(this, opts); this.setup_dashboard_sections(); + this.set_open_count = frappe.utils.throttle(this.set_open_count, 500); } setup_dashboard_sections() { @@ -178,7 +179,7 @@ frappe.ui.form.Dashboard = class FormDashboard { return; } this.render_links(); - this.set_open_count(); + // this.set_open_count(); show = true; } diff --git a/frappe/public/js/frappe/form/footer/form_timeline.js b/frappe/public/js/frappe/form/footer/form_timeline.js index ab83ed2f71..115a62e098 100644 --- a/frappe/public/js/frappe/form/footer/form_timeline.js +++ b/frappe/public/js/frappe/form/footer/form_timeline.js @@ -190,6 +190,7 @@ class FormTimeline extends BaseTimeline { } doc.owner = doc.sender; doc.user_full_name = doc.sender_full_name; + doc.content = frappe.dom.remove_script_and_style(doc.content); let communication_content = $(frappe.render_template('timeline_message_box', { doc })); if (allow_reply) { this.setup_reply(communication_content, doc); @@ -248,6 +249,7 @@ class FormTimeline extends BaseTimeline { } get_comment_timeline_content(doc) { + doc.content = frappe.dom.remove_script_and_style(doc.content); const comment_content = $(frappe.render_template('timeline_message_box', { doc })); this.setup_comment_actions(comment_content, doc); return comment_content; diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 88d7ceaa94..8064f90a98 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -12,6 +12,7 @@ import './script_manager'; import './script_helpers'; import './sidebar/form_sidebar'; import './footer/footer'; +import './form_tour'; frappe.ui.form.Controller = class FormController { constructor(opts) { @@ -152,6 +153,10 @@ frappe.ui.form.Form = class FrappeForm { parent: $('${__('Dear')} ${this.real_name},
-${__('Dear {0},', [this.real_name], 'Salutation in new email')},
+ ${SALUTATION_END_COMMENT}{0} ({1})
".format(feedback.feedback, feedback.rating) + + "".format(frappe.utils.get_request_site_address(), + feedback.name, + _("View Feedback"))) + + # notify creator + frappe.sendmail( + recipients=frappe.db.get_value('User', doc.owner, 'email') or doc.owner, + subject=subject, + message=message, + reference_doctype=doc.doctype, + reference_name=doc.name + ) diff --git a/frappe/templates/includes/full_index.html b/frappe/templates/includes/full_index.html index a7443c482a..eb8fb322f6 100644 --- a/frappe/templates/includes/full_index.html +++ b/frappe/templates/includes/full_index.html @@ -3,11 +3,6 @@ {% for item in children_map[route] %}Test content
', content) + + def test_json_sidebar_data(self): + frappe.flags.look_for_sidebar = False + content = get_response_content('/_test/_test_folder/_test_page') + self.assertNotIn('Test Sidebar', content) + clear_website_cache() + frappe.flags.look_for_sidebar = True + content = get_response_content('/_test/_test_folder/_test_page') + self.assertIn('Test Sidebar', content) + frappe.flags.look_for_sidebar = False + + def test_base_template(self): + content = get_response_content('/_test/_test_custom_base.html') + + # assert the text in base template is rendered + self.assertIn('Test content
', content) + + def test_index_and_next_comment(self): + content = get_response_content('/_test/_test_folder') + # test if {index} was rendered + self.assertIn(' Test Page', content) + + self.assertIn('Test TOC', content) + + content = get_response_content('/_test/_test_folder/_test_page') + # test if {next} was rendered + self.assertIn('Next: Test TOC', content) + + def test_colocated_assets(self): + content = get_response_content('/_test/_test_folder/_test_page') + self.assertIn("", content) + self.assertIn("background-color: var(--bg-color);", content) + + def test_raw_assets_are_loaded(self): + content = get_response_content('/_test/assets/js_asset.js') + self.assertEqual("console.log('in');", content) + + content = get_response_content('/_test/assets/css_asset.css') + self.assertEqual("""body{color:red}""", content) + + def test_breadcrumbs(self): + content = get_response_content('/_test/_test_folder/_test_page') + self.assertIn('Test Folder', content) + self.assertIn(' Test Page', content) + + content = get_response_content('/_test/_test_folder/index') + self.assertIn(' Test', content) + self.assertIn('Test Folder', content) + + def test_get_context_without_context_object(self): + content = get_response_content('/_test/_test_no_context') + self.assertIn("Custom Content", content) + + def test_caching(self): + # to enable caching + frappe.flags.force_website_cache = True + + clear_website_cache() + # first response no-cache + response = get_response('/_test/_test_folder/_test_page') + self.assertIn(('X-From-Cache', 'False'), list(response.headers)) + + # first response returned from cache + response = get_response('/_test/_test_folder/_test_page') + self.assertIn(('X-From-Cache', 'True'), list(response.headers)) + + frappe.flags.force_website_cache = False + + +def set_home_page_hook(key, value): + from frappe import hooks + # reset home_page hooks + for hook in ('get_website_user_home_page','website_user_home_page','role_home_page','home_page'): + if hasattr(hooks, hook): + delattr(hooks, hook) + + setattr(hooks, key, value) + frappe.cache().delete_key('app_hooks') + +class CustomPageRenderer(): + def __init__(self, path, status_code=None): + self.path = path + # custom status code + self.status_code = 3984 + + def can_render(self): + if self.path in ('new', 'custom'): + return True + + def render(self): + return build_response(self.path, """{{ var | pprint | e }}"
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 364ffa776d..617572deb7 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -1,13 +1,9 @@
-# imports - compatibility imports
-from __future__ import unicode_literals
-
# imports - standard imports
import logging
import os
from logging.handlers import RotatingFileHandler
# imports - third party imports
-from six import text_type
# imports - module imports
import frappe
@@ -83,10 +79,10 @@ class SiteContextFilter(logging.Filter):
"""This is a filter which injects request information (if available) into the log."""
def filter(self, record):
- if "Form Dict" not in text_type(record.msg):
+ if "Form Dict" not in str(record.msg):
site = getattr(frappe.local, "site", None)
form_dict = getattr(frappe.local, "form_dict", None)
- record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, form_dict)
+ record.msg = str(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, form_dict)
return True
diff --git a/frappe/utils/make_random.py b/frappe/utils/make_random.py
index ad353dea84..2ebabb78f9 100644
--- a/frappe/utils/make_random.py
+++ b/frappe/utils/make_random.py
@@ -1,7 +1,5 @@
-from __future__ import unicode_literals
+
import frappe, random
-from six.moves import range
-from six import string_types
settings = frappe._dict(
prob = {
@@ -17,7 +15,7 @@ def add_random_children(doc, fieldname, rows, randomize, unique=None):
for i in range(nrows):
d = {}
for key, val in randomize.items():
- if isinstance(val[0], string_types):
+ if isinstance(val[0], str):
d[key] = get_random(*val)
else:
d[key] = random.randrange(*val)
diff --git a/frappe/utils/minify.py b/frappe/utils/minify.py
index 08d05c7225..b2cc93e554 100644
--- a/frappe/utils/minify.py
+++ b/frappe/utils/minify.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
# This code is original from jsmin by Douglas Crockford, it was translated to
# Python by Baruch Even. The original code had the following copyright and
# license.
@@ -29,7 +29,7 @@ from __future__ import unicode_literals
# SOFTWARE.
# */
-from six import StringIO
+from io import StringIO
def jsmin(js):
ins = StringIO(js)
diff --git a/frappe/utils/momentjs.py b/frappe/utils/momentjs.py
index 3c5ec91f63..18df9903a7 100644
--- a/frappe/utils/momentjs.py
+++ b/frappe/utils/momentjs.py
@@ -1,5 +1,4 @@
# get data for moment.js
-from __future__ import unicode_literals
def update(tz, out):
ltz = data["links"].get(tz, tz)
zone = data["zones"].get(ltz)
diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py
index 531699db0c..3c024c40e4 100644
--- a/frappe/utils/nestedset.py
+++ b/frappe/utils/nestedset.py
@@ -10,8 +10,6 @@
# 3. call update_nsm(doc_obj) in the on_upate method
# ------------------------------------------
-from __future__ import unicode_literals
-
import frappe
from frappe import _
from frappe.model.document import Document
diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py
index 6a92737a0d..9f5ff9d360 100644
--- a/frappe/utils/oauth.py
+++ b/frappe/utils/oauth.py
@@ -1,14 +1,12 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
import frappe
import frappe.utils
import json, jwt
import base64
from frappe import _
from frappe.utils.password import get_decrypted_password
-from six import string_types
class SignupDisabledError(frappe.PermissionError): pass
@@ -136,7 +134,7 @@ def get_info_via_oauth(provider, code, decoder=None, id_token=False):
token = parsed_access['id_token']
- info = jwt.decode(token, flow.client_secret, verify=False)
+ info = jwt.decode(token, flow.client_secret, options={"verify_signature": False})
else:
api_endpoint = oauth2_providers[provider].get("api_endpoint")
api_endpoint_args = oauth2_providers[provider].get("api_endpoint_args")
@@ -163,10 +161,10 @@ def login_oauth_user(data=None, provider=None, state=None, email_id=None, key=No
# return
# json.loads data and state
- if isinstance(data, string_types):
+ if isinstance(data, str):
data = json.loads(data)
- if isinstance(state, string_types):
+ if isinstance(state, str):
state = base64.b64decode(state)
state = json.loads(state.decode("utf-8"))
diff --git a/frappe/utils/password.py b/frappe/utils/password.py
index fbed3cd8e7..428f2e9577 100644
--- a/frappe/utils/password.py
+++ b/frappe/utils/password.py
@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
import string
import frappe
from frappe import _
@@ -61,7 +60,7 @@ def set_encrypted_password(doctype, name, pwd, fieldname='password'):
except frappe.db.DataError as e:
if ((frappe.db.db_type == 'mariadb' and e.args[0] == DATA_TOO_LONG) or
(frappe.db.db_type == 'postgres' and e.pgcode == STRING_DATA_RIGHT_TRUNCATION)):
- frappe.throw("Most probably your password is too long.", exc=e)
+ frappe.throw(_("Most probably your password is too long."), exc=e)
raise e
@@ -157,20 +156,29 @@ def create_auth_table():
frappe.db.create_auth_table()
-def encrypt(pwd):
- cipher_suite = Fernet(encode(get_encryption_key()))
- cipher_text = cstr(cipher_suite.encrypt(encode(pwd)))
+def encrypt(txt, encryption_key=None):
+ # Only use Fernet.generate_key().decode() to enter encyption_key value
+
+ try:
+ cipher_suite = Fernet(encode(encryption_key or get_encryption_key()))
+ except Exception:
+ # encryption_key is not in 32 url-safe base64-encoded format
+ frappe.throw(_('Encryption key is in invalid format!'))
+
+ cipher_text = cstr(cipher_suite.encrypt(encode(txt)))
return cipher_text
-def decrypt(pwd):
+def decrypt(txt, encryption_key=None):
+ # Only use encryption_key value generated with Fernet.generate_key().decode()
+
try:
- cipher_suite = Fernet(encode(get_encryption_key()))
- plain_text = cstr(cipher_suite.decrypt(encode(pwd)))
+ cipher_suite = Fernet(encode(encryption_key or get_encryption_key()))
+ plain_text = cstr(cipher_suite.decrypt(encode(txt)))
return plain_text
except InvalidToken:
# encryption_key in site_config is changed and not valid
- frappe.throw(_('Encryption key is invalid, Please check site_config.json'))
+ frappe.throw(_('Encryption key is invalid' + '!' if encryption_key else ', please check site_config.json.'))
def get_encryption_key():
diff --git a/frappe/utils/password_strength.py b/frappe/utils/password_strength.py
index a4182d1cab..3959d8c3dd 100644
--- a/frappe/utils/password_strength.py
+++ b/frappe/utils/password_strength.py
@@ -1,8 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
-
try:
from zxcvbn import zxcvbn
except Exception:
diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 70464aafc5..fcf483bea6 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -1,7 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
-
import io
import os
import re
@@ -9,7 +7,6 @@ from distutils.version import LooseVersion
import subprocess
import pdfkit
-import six
from bs4 import BeautifulSoup
from PyPDF2 import PdfFileReader, PdfFileWriter
@@ -45,6 +42,7 @@ def get_pdf(html, options=None, output=None):
except OSError as e:
if any([error in str(e) for error in PDF_CONTENT_ERRORS]):
if not filedata:
+ print(html, options)
frappe.throw(_("PDF generation failed because of broken image links"))
# allow pdfs with missing images if file got created
@@ -57,8 +55,6 @@ def get_pdf(html, options=None, output=None):
if "password" in options:
password = options["password"]
- if six.PY2:
- password = frappe.safe_encode(password)
if output:
output.appendPagesFromReader(reader)
diff --git a/frappe/utils/print_format.py b/frappe/utils/print_format.py
index e83a5f6c71..40a393a2cc 100644
--- a/frappe/utils/print_format.py
+++ b/frappe/utils/print_format.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
import frappe, os
from frappe import _
@@ -9,7 +7,7 @@ from PyPDF2 import PdfFileWriter
no_cache = 1
-base_template_path = "templates/www/printview.html"
+base_template_path = "www/printview.html"
standard_format = "templates/print_formats/standard.html"
@frappe.whitelist()
diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py
index 678a61ca6e..8a7ff8334b 100644
--- a/frappe/utils/redis_wrapper.py
+++ b/frappe/utils/redis_wrapper.py
@@ -1,11 +1,12 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
+import pickle
+import re
-import redis, frappe, re
-from six.moves import cPickle as pickle
+import redis
+
+import frappe
from frappe.utils import cstr
-from six import iteritems
class RedisWrapper(redis.Redis):
@@ -165,8 +166,10 @@ class RedisWrapper(redis.Redis):
pass
def hgetall(self, name):
- return {key: pickle.loads(value) for key, value in
- iteritems(super(RedisWrapper, self).hgetall(self.make_key(name)))}
+ value = super(RedisWrapper, self).hgetall(self.make_key(name))
+ return {
+ key: pickle.loads(value) for key, value in value.items()
+ }
def hget(self, name, key, generator=None, shared=False):
_name = self.make_key(name, shared=shared)
diff --git a/frappe/utils/reset_doc.py b/frappe/utils/reset_doc.py
index 2119df5897..15aff4dc6c 100755
--- a/frappe/utils/reset_doc.py
+++ b/frappe/utils/reset_doc.py
@@ -1,4 +1,4 @@
-from __future__ import unicode_literals
+
import frappe
import json, os
from frappe.modules import scrub, get_module_path, utils
@@ -7,7 +7,7 @@ from frappe.custom.doctype.property_setter.property_setter import make_property_
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from frappe.core.page.permission_manager.permission_manager import get_standard_permissions
from frappe.permissions import setup_custom_perms
-from six.moves.urllib.request import urlopen
+from urllib.request import urlopen
branch = 'develop'
diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index b152d69d8d..ca04f6def4 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -1,7 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
import json
import datetime
import decimal
@@ -18,8 +17,7 @@ from werkzeug.wsgi import wrap_file
from werkzeug.wrappers import Response
from werkzeug.exceptions import NotFound, Forbidden
from frappe.utils import cint
-from six import text_type
-from six.moves.urllib.parse import quote
+from urllib.parse import quote
from frappe.core.doctype.access_log.access_log import make_access_log
@@ -125,13 +123,13 @@ def json_handler(obj):
import collections.abc
if isinstance(obj, (datetime.date, datetime.timedelta, datetime.datetime)):
- return text_type(obj)
+ return str(obj)
elif isinstance(obj, decimal.Decimal):
return float(obj)
elif isinstance(obj, LocalProxy):
- return text_type(obj)
+ return str(obj)
elif isinstance(obj, frappe.model.document.BaseDocument):
doc = obj.as_dict(no_nulls=True)
@@ -149,8 +147,8 @@ def json_handler(obj):
def as_page():
"""print web page"""
- from frappe.website.render import render
- return render(frappe.response['route'], http_status_code=frappe.response.get("http_status_code"))
+ from frappe.website.serve import get_response
+ return get_response(frappe.response['route'], http_status_code=frappe.response.get("http_status_code"))
def redirect():
return werkzeug.utils.redirect(frappe.response.location)
@@ -217,7 +215,8 @@ def send_private_file(path):
return response
def handle_session_stopped():
+ from frappe.website.serve import get_response
frappe.respond_as_web_page(_("Updating"),
_("Your system is being updated. Please refresh again after a few moments."),
http_status_code=503, indicator_color='orange', fullpage = True, primary_action=None)
- return frappe.website.render.render("message", http_status_code=503)
+ return get_response("message", http_status_code=503)
diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
index 643812b226..2e27859faa 100644
--- a/frappe/utils/safe_exec.py
+++ b/frappe/utils/safe_exec.py
@@ -5,6 +5,7 @@ from html2text import html2text
from RestrictedPython import compile_restricted, safe_globals
import RestrictedPython.Guards
import frappe
+from frappe import _
import frappe.utils
import frappe.utils.data
from frappe.website.utils import (get_shade, get_toc, get_next_link)
@@ -31,7 +32,7 @@ class NamespaceDict(frappe._dict):
def safe_exec(script, _globals=None, _locals=None):
# script reports must be enabled via site_config.json
if not frappe.conf.server_script_enabled:
- frappe.throw('Please Enable Server Scripts', ServerScriptNotEnabled)
+ frappe.throw(_('Please Enable Server Scripts'), ServerScriptNotEnabled)
# build globals
exec_globals = get_safe_globals()
@@ -61,7 +62,9 @@ def get_safe_globals():
out = NamespaceDict(
# make available limited methods of frappe
- json=json,
+ json=NamespaceDict(
+ loads = json.loads,
+ dumps = json.dumps),
dict=dict,
log=frappe.log,
_dict=frappe._dict,
@@ -82,6 +85,7 @@ def get_safe_globals():
get_list=frappe.get_list,
get_all=frappe.get_all,
get_system_settings=frappe.get_system_settings,
+ rename_doc=frappe.rename_doc,
utils=datautils,
get_url=frappe.utils.get_url,
@@ -148,6 +152,7 @@ def get_safe_globals():
# default writer allows write access
out._write_ = _write
out._getitem_ = _getitem
+ out._getattr_ = _getattr
# allow iterators and list comprehension
out._getiter_ = iter
@@ -174,6 +179,27 @@ def _getitem(obj, key):
raise SyntaxError('Key starts with _')
return obj[key]
+def _getattr(object, name, default=None):
+ # guard function for RestrictedPython
+ # allow any key to be accessed as long as
+ # 1. it does not start with an underscore (safer_getattr)
+ # 2. it is not an UNSAFE_ATTRIBUTES
+
+ UNSAFE_ATTRIBUTES = {
+ # Generator Attributes
+ "gi_frame", "gi_code",
+ # Coroutine Attributes
+ "cr_frame", "cr_code", "cr_origin",
+ # Async Generator Attributes
+ "ag_code", "ag_frame",
+ # Traceback Attributes
+ "tb_frame", "tb_next",
+ }
+
+ if isinstance(name, str) and (name in UNSAFE_ATTRIBUTES):
+ raise SyntaxError("{name} is an unsafe attribute".format(name=name))
+ return RestrictedPython.Guards.safer_getattr(object, name, default=default)
+
def _write(obj):
# guard function for RestrictedPython
# allow writing to any object
diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py
index 749a41682f..0bfc50eab5 100755
--- a/frappe/utils/scheduler.py
+++ b/frappe/utils/scheduler.py
@@ -7,8 +7,6 @@ Events:
monthly
weekly
"""
-# imports - compatibility imports
-from __future__ import print_function, unicode_literals
# imports - standard imports
import os
diff --git a/frappe/utils/testutils.py b/frappe/utils/testutils.py
index 4af3ad647c..c451d090f1 100644
--- a/frappe/utils/testutils.py
+++ b/frappe/utils/testutils.py
@@ -1,7 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
-
import frappe
def add_custom_field(doctype, fieldname, fieldtype='Data', options=None):
diff --git a/frappe/utils/user.py b/frappe/utils/user.py
index 61b698db9f..fe768c28c5 100755
--- a/frappe/utils/user.py
+++ b/frappe/utils/user.py
@@ -1,8 +1,6 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
-
import frappe, json
from frappe import _dict
import frappe.share
diff --git a/frappe/utils/verified_command.py b/frappe/utils/verified_command.py
index 971c0a243c..4b038b88c3 100644
--- a/frappe/utils/verified_command.py
+++ b/frappe/utils/verified_command.py
@@ -1,20 +1,17 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-
-from __future__ import unicode_literals
import hmac, hashlib
-from six.moves.urllib.parse import urlencode
+from urllib.parse import urlencode
from frappe import _
import frappe
import frappe.utils
-from six import string_types
def get_signed_params(params):
"""Sign a url by appending `&_signature=xxxxx` to given params (string or dict).
:param params: String or dict of parameters."""
- if not isinstance(params, string_types):
+ if not isinstance(params, str):
params = urlencode(params)
signature = hmac.new(params.encode(), digestmod=hashlib.md5)
diff --git a/frappe/website/context.py b/frappe/website/context.py
deleted file mode 100644
index c898d39869..0000000000
--- a/frappe/website/context.py
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-from __future__ import unicode_literals
-import frappe, os, json
-
-from frappe.website.doctype.website_settings.website_settings import get_website_settings
-from frappe.website.router import get_page_context
-from frappe.model.document import Document
-
-def get_context(path, args=None):
- if args and args.source:
- context = args
- else:
- context = get_page_context(path)
- if args:
- context.update(args)
-
- if hasattr(frappe.local, 'request'):
- # for (remove leading slash)
- # path could be overriden in render.resolve_from_map
- context["path"] = frappe.local.request.path.strip('/ ')
- else:
- context["path"] = path
-
- context.canonical = frappe.utils.get_url(frappe.utils.escape_html(context.path))
- context.route = context.path
- context = build_context(context)
-
- # set using frappe.respond_as_web_page
- if hasattr(frappe.local, 'response') and frappe.local.response.get('context'):
- context.update(frappe.local.response.context)
-
- # to be able to inspect the context dict
- # Use the macro "inspect" from macros.html
- context._context_dict = context
-
- context.developer_mode = frappe.conf.developer_mode
-
- return context
-
-def update_controller_context(context, controller):
- module = frappe.get_module(controller)
-
- if module:
- # get config fields
- for prop in ("base_template_path", "template", "no_cache", "sitemap",
- "condition_field"):
- if hasattr(module, prop):
- context[prop] = getattr(module, prop)
-
- if hasattr(module, "get_context"):
- import inspect
- try:
- if inspect.getfullargspec(module.get_context).args:
- ret = module.get_context(context)
- else:
- ret = module.get_context()
- if ret:
- context.update(ret)
- except (frappe.PermissionError, frappe.PageDoesNotExistError, frappe.Redirect):
- raise
- except:
- if not any([frappe.flags.in_migrate, frappe.flags.in_website_search_build]):
- frappe.errprint(frappe.utils.get_traceback())
-
- if hasattr(module, "get_children"):
- context.children = module.get_children(context)
-
-
-def build_context(context):
- """get_context method of doc or module is supposed to render
- content templates and push it into context"""
- context = frappe._dict(context)
-
- if not "url_prefix" in context:
- context.url_prefix = ""
-
- if context.url_prefix and context.url_prefix[-1]!='/':
- context.url_prefix += '/'
-
- # for backward compatibility
- context.docs_base_url = '/docs'
-
- context.update(get_website_settings(context))
- context.update(frappe.local.conf.get("website_context") or {})
-
- # provide doc
- if context.doc:
- context.update(context.doc.as_dict())
- context.update(context.doc.get_website_properties())
-
- if not context.template:
- context.template = context.doc.meta.get_web_template()
-
- if hasattr(context.doc, "get_context"):
- ret = context.doc.get_context(context)
-
- if ret:
- context.update(ret)
-
- for prop in ("no_cache", "sitemap"):
- if not prop in context:
- context[prop] = getattr(context.doc, prop, False)
-
- elif context.controller:
- # controller based context
- update_controller_context(context, context.controller)
-
- # controller context extensions
- context_controller_hooks = frappe.get_hooks("extend_website_page_controller_context") or {}
- for controller, extension in context_controller_hooks.items():
- if isinstance(extension, list):
- for ext in extension:
- if controller == context.controller:
- update_controller_context(context, ext)
- else:
- update_controller_context(context, extension)
-
- add_metatags(context)
- add_sidebar_and_breadcrumbs(context)
-
- # determine templates to be used
- if not context.base_template_path:
- app_base = frappe.get_hooks("base_template")
- context.base_template_path = app_base[-1] if app_base else "templates/base.html"
-
- if context.title_prefix and context.title and not context.title.startswith(context.title_prefix):
- context.title = '{0} - {1}'.format(context.title_prefix, context.title)
-
- # apply context from hooks
- update_website_context = frappe.get_hooks('update_website_context')
- for method in update_website_context:
- values = frappe.get_attr(method)(context)
- if values:
- context.update(values)
-
- return context
-
-def load_sidebar(context, sidebar_json_path):
- with open(sidebar_json_path, 'r') as sidebarfile:
- try:
- sidebar_json = sidebarfile.read()
- context.sidebar_items = json.loads(sidebar_json)
- context.show_sidebar = 1
- except json.decoder.JSONDecodeError:
- frappe.throw('Invalid Sidebar JSON at ' + sidebar_json_path)
-
-def get_sidebar_json_path(path, look_for=False):
- '''
- Get _sidebar.json path from directory path
-
- :param path: path of the current diretory
- :param look_for: if True, look for _sidebar.json going upwards from given path
-
- :return: _sidebar.json path
- '''
- if os.path.split(path)[1] == 'www' or path == '/' or not path:
- return ''
-
- sidebar_json_path = os.path.join(path, '_sidebar.json')
- if os.path.exists(sidebar_json_path):
- return sidebar_json_path
- else:
- if look_for:
- return get_sidebar_json_path(os.path.split(path)[0], look_for)
- else:
- return ''
-
-def add_sidebar_and_breadcrumbs(context):
- '''Add sidebar and breadcrumbs to context'''
- from frappe.website.router import get_page_info_from_template
- if context.show_sidebar:
- context.no_cache = 1
- add_sidebar_data(context)
- else:
- if context.basepath:
- hooks = frappe.get_hooks('look_for_sidebar_json')
- look_for_sidebar_json = hooks[0] if hooks else 0
- sidebar_json_path = get_sidebar_json_path(
- context.basepath,
- look_for_sidebar_json
- )
- if sidebar_json_path:
- load_sidebar(context, sidebar_json_path)
-
- if context.add_breadcrumbs and not context.parents:
- if context.basepath:
- parent_path = os.path.dirname(context.path).rstrip('/')
- page_info = get_page_info_from_template(parent_path)
- if page_info:
- context.parents = [dict(route=parent_path, title=page_info.title)]
-
-def add_sidebar_data(context):
- from frappe.utils.user import get_fullname_and_avatar
- import frappe.www.list
-
- if context.show_sidebar and context.website_sidebar:
- context.sidebar_items = frappe.get_all('Website Sidebar Item',
- filters=dict(parent=context.website_sidebar), fields=['title', 'route', '`group`'],
- order_by='idx asc')
-
- if not context.sidebar_items:
- sidebar_items = frappe.cache().hget('portal_menu_items', frappe.session.user)
- if sidebar_items == None:
- sidebar_items = []
- roles = frappe.get_roles()
- portal_settings = frappe.get_doc('Portal Settings', 'Portal Settings')
-
- def add_items(sidebar_items, items):
- for d in items:
- if d.get('enabled') and ((not d.get('role')) or d.get('role') in roles):
- sidebar_items.append(d.as_dict() if isinstance(d, Document) else d)
-
- if not portal_settings.hide_standard_menu:
- add_items(sidebar_items, portal_settings.get('menu'))
-
- if portal_settings.custom_menu:
- add_items(sidebar_items, portal_settings.get('custom_menu'))
-
- items_via_hooks = frappe.get_hooks('portal_menu_items')
- if items_via_hooks:
- for i in items_via_hooks: i['enabled'] = 1
- add_items(sidebar_items, items_via_hooks)
-
- frappe.cache().hset('portal_menu_items', frappe.session.user, sidebar_items)
-
- context.sidebar_items = sidebar_items
-
- info = get_fullname_and_avatar(frappe.session.user)
- context["fullname"] = info.fullname
- context["user_image"] = info.avatar
- context["user"] = info.name
-
-
-def add_metatags(context):
- tags = frappe._dict(context.get("metatags") or {})
-
- if "og:type" not in tags:
- tags["og:type"] = "article"
-
- if "title" not in tags and context.title:
- tags["title"] = context.title
-
- title = tags.get("name") or tags.get("title")
- if title:
- tags["og:title"] = tags["twitter:title"] = title
- tags["twitter:card"] = "summary"
-
- if "description" not in tags and context.description:
- tags["description"] = context.description
-
- description = tags.get("description")
- if description:
- tags["og:description"] = tags["twitter:description"] = description
-
- if "image" not in tags and context.image:
- tags["image"] = context.image
-
- image = tags.get("image")
- if image:
- tags["og:image"] = tags["twitter:image"] = tags["image"] = frappe.utils.get_url(image)
- tags['twitter:card'] = "summary_large_image"
-
- if "author" not in tags and context.author:
- tags["author"] = context.author
-
- tags["og:url"] = tags["url"] = frappe.utils.get_url(context.path)
-
- if "published_on" not in tags and context.published_on:
- tags["published_on"] = context.published_on
-
- if "published_on" in tags:
- tags["datePublished"] = tags["published_on"]
- del tags["published_on"]
-
- tags["language"] = frappe.local.lang or "en"
-
- # Get meta tags from Website Route meta
- # they can override the defaults set above
- route = context.path
- if route == '':
- # homepage
- route = frappe.db.get_single_value('Website Settings', 'home_page')
-
- route_exists = (route
- and not route.endswith(('.js', '.css'))
- and frappe.db.exists('Website Route Meta', route))
-
- if route_exists:
- website_route_meta = frappe.get_doc('Website Route Meta', route)
- for meta_tag in website_route_meta.meta_tags:
- d = meta_tag.get_meta_dict()
- tags.update(d)
-
- # update tags in context
- context.metatags = tags
diff --git a/frappe/website/doctype/__init__.py b/frappe/website/doctype/__init__.py
index baffc48825..8b13789179 100644
--- a/frappe/website/doctype/__init__.py
+++ b/frappe/website/doctype/__init__.py
@@ -1 +1 @@
-from __future__ import unicode_literals
+
diff --git a/frappe/website/doctype/about_us_settings/about_us_settings.py b/frappe/website/doctype/about_us_settings/about_us_settings.py
index 5b93cdcede..1d45adeb42 100644
--- a/frappe/website/doctype/about_us_settings/about_us_settings.py
+++ b/frappe/website/doctype/about_us_settings/about_us_settings.py
@@ -3,17 +3,16 @@
# For license information, please see license.txt
-from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
class AboutUsSettings(Document):
-
+
def on_update(self):
- from frappe.website.render import clear_cache
+ from frappe.website.utils import clear_cache
clear_cache("about")
-
+
def get_args():
obj = frappe.get_doc("About Us Settings")
return {
diff --git a/frappe/website/doctype/about_us_settings/test_about_us_settings.py b/frappe/website/doctype/about_us_settings/test_about_us_settings.py
index 85173a20e5..ab47505fb1 100644
--- a/frappe/website/doctype/about_us_settings/test_about_us_settings.py
+++ b/frappe/website/doctype/about_us_settings/test_about_us_settings.py
@@ -1,8 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies and Contributors
# See license.txt
-from __future__ import unicode_literals
-
# import frappe
import unittest
diff --git a/frappe/website/doctype/about_us_team_member/about_us_team_member.py b/frappe/website/doctype/about_us_team_member/about_us_team_member.py
index a872a6e5e2..864b6a3e81 100644
--- a/frappe/website/doctype/about_us_team_member/about_us_team_member.py
+++ b/frappe/website/doctype/about_us_team_member/about_us_team_member.py
@@ -3,7 +3,6 @@
# For license information, please see license.txt
-from __future__ import unicode_literals
import frappe
from frappe.model.document import Document
diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py
index 375ba5b6a3..d7eb92ca7a 100644
--- a/frappe/website/doctype/blog_category/blog_category.py
+++ b/frappe/website/doctype/blog_category/blog_category.py
@@ -1,9 +1,8 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
from frappe.website.website_generator import WebsiteGenerator
-from frappe.website.render import clear_cache
+from frappe.website.utils import clear_cache
class BlogCategory(WebsiteGenerator):
def autoname(self):
diff --git a/frappe/website/doctype/blog_category/test_blog_category.py b/frappe/website/doctype/blog_category/test_blog_category.py
index fe8f4544cd..d9093e76f0 100644
--- a/frappe/website/doctype/blog_category/test_blog_category.py
+++ b/frappe/website/doctype/blog_category/test_blog_category.py
@@ -1,7 +1,5 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
-
import frappe
import unittest
diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json
index 909cecf867..c2491ee5a4 100644
--- a/frappe/website/doctype/blog_post/blog_post.json
+++ b/frappe/website/doctype/blog_post/blog_post.json
@@ -18,6 +18,7 @@
"featured",
"hide_cta",
"disable_comments",
+ "disable_feedback",
"section_break_5",
"blog_intro",
"content_type",
@@ -191,6 +192,13 @@
"fieldtype": "Data",
"label": "Meta Title",
"length": 60
+ },
+ {
+ "default": "0",
+ "description": "Feedback on this blog post will be disabled if checked.",
+ "fieldname": "disable_feedback",
+ "fieldtype": "Check",
+ "label": "Disable Feedback"
}
],
"has_web_view": 1,
@@ -200,7 +208,7 @@
"is_published_field": "published",
"links": [],
"max_attachments": 5,
- "modified": "2020-12-23 14:28:36.311389",
+ "modified": "2021-06-14 13:50:02.109719",
"modified_by": "Administrator",
"module": "Website",
"name": "Blog Post",
diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py
index bfccc0bbc7..965fc8e3e0 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -1,23 +1,16 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# MIT License. See license.txt
-from __future__ import unicode_literals
-
import frappe
from frappe import _
from frappe.website.website_generator import WebsiteGenerator
-from frappe.website.render import clear_cache
+from frappe.website.utils import clear_cache
from frappe.utils import today, cint, global_date_format, get_fullname, strip_html_tags, markdown, sanitize_html
from math import ceil
from frappe.website.utils import (find_first_image, get_html_content_based_on_type,
get_comment_list)
class BlogPost(WebsiteGenerator):
- website = frappe._dict(
- route = 'blog',
- order_by = "published_on desc"
- )
-
@frappe.whitelist()
def make_route(self):
if not self.route:
@@ -104,12 +97,14 @@ class BlogPost(WebsiteGenerator):
context.metatags["image"] = self.meta_image or image or None
self.load_comments(context)
+ self.load_feedback(context)
context.category = frappe.db.get_value("Blog Category",
context.doc.blog_category, ["title", "route"], as_dict=1)
context.parents = [{"name": _("Home"), "route":"/"},
{"name": "Blog", "route": "/blog"},
{"label": context.category.title, "route":context.category.route}]
+ context.guest_allowed = True
def fetch_cta(self):
if frappe.db.get_single_value("Blog Settings", "show_cta_in_blog", cache=True):
@@ -151,6 +146,17 @@ class BlogPost(WebsiteGenerator):
else:
context.comment_text = _('{0} comments').format(len(context.comment_list))
+ def load_feedback(self, context):
+ feedback = frappe.get_all('Feedback',
+ fields=['email', 'feedback', 'rating'],
+ filters=dict(
+ reference_doctype=self.doctype,
+ reference_name=self.name,
+ email=frappe.session.user
+ )
+ )
+ context.user_feedback = feedback[0] if feedback else ''
+
def set_read_time(self):
content = self.content or self.content_html or ''
if self.content_type == "Markdown":
diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html
index dad8b97164..4678622062 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post.html
@@ -65,6 +65,11 @@
{% include 'templates/includes/comments/comments.html' %}
{{ content or '' }}
@@ -34,8 +40,9 @@ {%- set title = values['card_' + index + '_title'] -%} {%- set content = values['card_' + index + '_content'] -%} {%- set url = values['card_' + index + '_url'] -%} + {%- set image = values['card_' + index + '_image'] -%} {%- if title -%} - {{ card(title, content, url) }} + {{ card(title, content, url, image) }} {%- endif -%} {%- endfor -%}Test content
+{next} +{% endblock %} diff --git a/frappe/www/_test/_test_folder/_test_page.js b/frappe/www/_test/_test_folder/_test_page.js new file mode 100644 index 0000000000..6e0c1f3a87 --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_page.js @@ -0,0 +1 @@ +console.log('test data'); \ No newline at end of file diff --git a/frappe/www/_test/_test_folder/_test_page.py b/frappe/www/_test/_test_folder/_test_page.py new file mode 100644 index 0000000000..3d4a645f9b --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_page.py @@ -0,0 +1,3 @@ +def get_context(context): + context.base_template_path = 'frappe/templates/test/_test_base_breadcrumbs.html' + context.add_breadcrumbs = 1 diff --git a/frappe/www/_test/_test_folder/_test_toc.md b/frappe/www/_test/_test_folder/_test_toc.md new file mode 100644 index 0000000000..02cc3c82be --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_toc.md @@ -0,0 +1,19 @@ +--- +title: Test TOC +add_breadcrumbs: 1 +show_sidebar: 0 + +metatags: + description: Test Description. + keywords: Frappe Framework. +--- + +# Level 1 + +## Level 1.1 + +## Level 1.2 + +## Level 1.3 + +### Level 1.3.1 diff --git a/frappe/www/_test/_test_folder/index.md b/frappe/www/_test/_test_folder/index.md new file mode 100644 index 0000000000..ca8c55e9d5 --- /dev/null +++ b/frappe/www/_test/_test_folder/index.md @@ -0,0 +1,9 @@ +--- +title: Test Folder +add_breadcrumbs: 1 +show_sidebar: 1 +base_template: templates/web.html +--- +# Index + +{index} \ No newline at end of file diff --git a/frappe/patches/v5_2/__init__.py b/frappe/www/_test/_test_folder/new.csv/__init__.py similarity index 100% rename from frappe/patches/v5_2/__init__.py rename to frappe/www/_test/_test_folder/new.csv/__init__.py diff --git a/frappe/www/_test/_test_folder/new.csv/index.html b/frappe/www/_test/_test_folder/new.csv/index.html new file mode 100644 index 0000000000..7a1bb69558 --- /dev/null +++ b/frappe/www/_test/_test_folder/new.csv/index.html @@ -0,0 +1,12 @@ + + + + + + +