', content)
+ self.assertIn('
Language
', content)
+
+
+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, """
Custom Page Response
""", self.status_code)
diff --git a/frappe/translate.py b/frappe/translate.py
index a407ad9579..4ff50d3fd0 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -284,8 +284,8 @@ def clear_cache():
def get_messages_for_app(app, deduplicate=True):
"""Returns all messages (list) for a specified `app`"""
messages = []
- modules = ", ".join(['"{}"'.format(m.title().replace("_", " ")) \
- for m in frappe.local.app_modules[app]])
+ modules = ", ".join('"{}"'.format(m.title().replace("_", " ")) \
+ for m in frappe.local.app_modules[app])
# doctypes
if modules:
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 969e8194e4..af9d5de1ee 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -189,7 +189,7 @@ def random_string(length):
"""generate a random string"""
import string
from random import choice
- return ''.join([choice(string.ascii_letters + string.digits) for i in range(length)])
+ return ''.join(choice(string.ascii_letters + string.digits) for i in range(length))
def has_gravatar(email):
@@ -311,7 +311,7 @@ def make_esc(esc_chars):
"""
Function generator for Escaping special characters
"""
- return lambda s: ''.join(['\\' + c if c in esc_chars else c for c in s])
+ return lambda s: ''.join('\\' + c if c in esc_chars else c for c in s)
# esc / unescape characters -- used for command line
def esc(s, esc_chars):
@@ -748,9 +748,9 @@ def set_request(**kwargs):
frappe.local.request = Request(builder.get_environ())
def get_html_for_route(route):
- from frappe.website import render
+ from frappe.website.serve import get_response
set_request(method='GET', path=route)
- response = render.render()
+ response = get_response()
html = frappe.safe_decode(response.get_data())
return html
diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index b21efc5e89..908be52452 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -307,8 +307,8 @@ class BackupGenerator:
backup_summary = self.get_summary()
print("Backup Summary for {0} at {1}".format(frappe.local.site, now()))
- title = max([len(x) for x in backup_summary])
- path = max([len(x["path"]) for x in backup_summary.values()])
+ title = max(len(x) for x in backup_summary)
+ path = max(len(x["path"]) for x in backup_summary.values())
for _type, info in backup_summary.items():
template = "{{0:{0}}}: {{1:{1}}} {{2}}".format(title, path)
@@ -381,7 +381,7 @@ class BackupGenerator:
"",
])
- generated_header = "\n".join([f"-- {x}" for x in database_header_content]) + "\n"
+ generated_header = "\n".join(f"-- {x}" for x in database_header_content) + "\n"
with gzip.open(args.backup_path_db, "wt") as f:
f.write(generated_header)
diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index 92150b79cf..8dab9b748f 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -70,7 +70,7 @@ def make_boilerplate(dest, app_name):
f.write(frappe.as_unicode(setup_template.format(**hooks)))
with open(os.path.join(dest, hooks.app_name, "requirements.txt"), "w") as f:
- f.write("frappe")
+ f.write("# frappe -- https://github.com/frappe/frappe is installed via 'bench init'")
with open(os.path.join(dest, hooks.app_name, "README.md"), "w") as f:
f.write(frappe.as_unicode("## {0}\n\n{1}\n\n#### License\n\n{2}".format(hooks.app_title,
@@ -359,7 +359,6 @@ Configuration for docs
"""
# source_link = "https://github.com/[org_name]/{app_name}"
-# docs_base_url = "https://[org_name].github.io/{app_name}"
# headline = "App that does everything"
# sub_heading = "Yes, you got that right the first time, everything"
diff --git a/frappe/utils/bot.py b/frappe/utils/bot.py
index 572723c056..c75b48ab49 100644
--- a/frappe/utils/bot.py
+++ b/frappe/utils/bot.py
@@ -38,10 +38,10 @@ class BotParser(object):
def format_list(self, data):
'''Format list as markdown'''
- return _('I found these: ') + ', '.join([' [{title}](/app/Form/{doctype}/{name})'.format(
+ return _('I found these:') + ' ' + ', '.join(' [{title}](/app/Form/{doctype}/{name})'.format(
title = d.title or d.name,
doctype=self.get_doctype(),
- name=d.name) for d in data])
+ name=d.name) for d in data)
def get_doctype(self):
'''returns the doctype name from self.tables'''
@@ -56,8 +56,8 @@ class ShowNotificationBot(BotParser):
if open_items:
return ("Following items need your attention:\n\n"
- + "\n\n".join(["{0} [{1}](/app/List/{1})".format(d[1], d[0])
- for d in open_items if d[1] > 0]))
+ + "\n\n".join("{0} [{1}](/app/List/{1})".format(d[1], d[0])
+ for d in open_items if d[1] > 0))
else:
return 'Take it easy, nothing urgent needs your attention'
diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py
index 3cf10cd9e0..efe92232d9 100644
--- a/frappe/utils/global_search.py
+++ b/frappe/utils/global_search.py
@@ -307,14 +307,14 @@ def get_routes_to_index():
def add_route_to_global_search(route):
from bs4 import BeautifulSoup
- from frappe.website.render import render_page
+ from frappe.website.serve import get_response_content
from frappe.utils import set_request
frappe.set_user('Guest')
frappe.local.no_cache = True
try:
set_request(method='GET', path=route)
- content = render_page(route)
+ content = get_response_content(route)
soup = BeautifulSoup(content, 'html.parser')
page_content = soup.find(class_='page_content')
text_content = page_content.text if page_content else ''
@@ -329,7 +329,7 @@ def add_route_to_global_search(route):
route=route
)
sync_value_in_queue(value)
- except (frappe.PermissionError, frappe.DoesNotExistError, frappe.ValidationError, Exception):
+ except Exception:
pass
frappe.set_user('Administrator')
diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py
index 924b8bb8b9..2c14249672 100644
--- a/frappe/utils/jinja_globals.py
+++ b/frappe/utils/jinja_globals.py
@@ -10,10 +10,10 @@ def resolve_class(classes):
return classes
if isinstance(classes, (list, tuple)):
- return " ".join([resolve_class(c) for c in classes]).strip()
+ return " ".join(resolve_class(c) for c in classes).strip()
if isinstance(classes, dict):
- return " ".join([classname for classname in classes if classes[classname]]).strip()
+ return " ".join(classname for classname in classes if classes[classname]).strip()
return classes
diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 92459abc46..fcf483bea6 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -42,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
diff --git a/frappe/utils/print_format.py b/frappe/utils/print_format.py
index 6cf2ecc304..40a393a2cc 100644
--- a/frappe/utils/print_format.py
+++ b/frappe/utils/print_format.py
@@ -7,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/response.py b/frappe/utils/response.py
index 84f30f22fd..ca04f6def4 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -147,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)
@@ -215,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/website/context.py b/frappe/website/context.py
deleted file mode 100644
index 8278edb958..0000000000
--- a/frappe/website/context.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
-
-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/about_us_settings/about_us_settings.py b/frappe/website/doctype/about_us_settings/about_us_settings.py
index 938a8de1b9..1d45adeb42 100644
--- a/frappe/website/doctype/about_us_settings/about_us_settings.py
+++ b/frappe/website/doctype/about_us_settings/about_us_settings.py
@@ -10,7 +10,7 @@ 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():
diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py
index 91b213744f..d7eb92ca7a 100644
--- a/frappe/website/doctype/blog_category/blog_category.py
+++ b/frappe/website/doctype/blog_category/blog_category.py
@@ -2,7 +2,7 @@
# MIT License. See license.txt
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_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 b39b7c7d04..965fc8e3e0 100644
--- a/frappe/website/doctype/blog_post/blog_post.py
+++ b/frappe/website/doctype/blog_post/blog_post.py
@@ -4,18 +4,13 @@
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:
@@ -102,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):
@@ -149,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' %}