@@ -117,73 +117,11 @@ id="page-{{ name or route | e }}" data-path="{{ pathname | e }}"
{%- block script -%}
{%- endblock -%}
diff --git a/frappe/templates/includes/image_with_blur.html b/frappe/templates/includes/image_with_blur.html
index dbddb9d8ef..20b0380b88 100644
--- a/frappe/templates/includes/image_with_blur.html
+++ b/frappe/templates/includes/image_with_blur.html
@@ -1,9 +1,7 @@
{%- set res = frappe.utils.get_thumbnail_base64_for_image(src) if src else false -%}
{%- if res and res['base64'].startswith('data:') -%}
+ alt="{{ alt or '' }}" width="{{ res['width'] }}" height="{{ res['height'] }}" data-src="{{ src or '' }}" />
{%- else -%}
{%- endif -%}
diff --git a/frappe/templates/includes/meta_block.html b/frappe/templates/includes/meta_block.html
index 3d867aaef3..1aef8a160e 100644
--- a/frappe/templates/includes/meta_block.html
+++ b/frappe/templates/includes/meta_block.html
@@ -1,5 +1,8 @@
{%- if metatags -%}
{%- for name in metatags %}
-
+{%- set content = metatags.get(name, '') -%}
+{%- if content -%}
+
+{%- endif -%}
{%- endfor -%}
{%- endif -%}
diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py
index 90ab6a6a94..b47fb809ca 100644
--- a/frappe/tests/test_naming.py
+++ b/frappe/tests/test_naming.py
@@ -88,6 +88,7 @@ class TestNaming(unittest.TestCase):
series = 'TEST-'
key = 'TEST-'
name = 'TEST-00003'
+ frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
revert_series_if_last(key, name)
count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py
index e554fd23be..30818e6f17 100644
--- a/frappe/tests/test_scheduler.py
+++ b/frappe/tests/test_scheduler.py
@@ -49,7 +49,7 @@ class TestScheduler(TestCase):
# 2nd job not loaded
self.assertFalse(job.enqueue())
- job.delete()
+ frappe.db.sql('DELETE FROM `tabScheduled Job Log` WHERE `scheduled_job_type`=%s', job.name)
def test_is_dormant(self):
self.assertTrue(is_dormant(check_time= get_datetime('2100-01-01 00:00:00')))
diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py
index 5cab827218..192fe9dd25 100644
--- a/frappe/tests/test_search.py
+++ b/frappe/tests/test_search.py
@@ -50,3 +50,31 @@ class TestSearch(unittest.TestCase):
def tearDown(self):
frappe.local.lang = 'en'
+
+ def test_validate_and_sanitize_search_inputs(self):
+
+ # should raise error if searchfield is injectable
+ self.assertRaises(frappe.DataError,
+ get_data, *('User', 'Random', 'select * from tabSessions) --', '1', '10', dict()))
+
+ # page_len and start should be converted to int
+ self.assertListEqual(get_data('User', 'Random', 'email', 'name or (select * from tabSessions)', '10', dict()),
+ ['User', 'Random', 'email', 0, 10, {}])
+ self.assertListEqual(get_data('User', 'Random', 'email', page_len='2', start='10', filters=dict()),
+ ['User', 'Random', 'email', 10, 2, {}])
+
+ # DocType can be passed as None which should be accepted
+ self.assertListEqual(get_data(None, 'Random', 'email', '2', '10', dict()),
+ [None, 'Random', 'email', 2, 10, {}])
+
+ # return empty string if passed doctype is invalid
+ self.assertListEqual(get_data("Random DocType", 'Random', 'email', '2', '10', dict()), [])
+
+ # should not fail if function is called via frappe.call with extra arguments
+ args = ("Random DocType", 'Random', 'email', '2', '10', dict())
+ kwargs = {'as_dict': False}
+ self.assertListEqual(frappe.call('frappe.tests.test_search.get_data', *args, **kwargs), [])
+
+@frappe.validate_and_sanitize_search_inputs
+def get_data(doctype, txt, searchfield, start, page_len, filters):
+ return [doctype, txt, searchfield, start, page_len, filters]
\ No newline at end of file
diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py
index d114f7d1b2..c708f670c1 100644
--- a/frappe/tests/test_website.py
+++ b/frappe/tests/test_website.py
@@ -4,10 +4,46 @@ import unittest
import frappe
from frappe.website import render
+from frappe.website.utils import get_home_page
from frappe.utils import set_request
class TestWebsite(unittest.TestCase):
+ def test_home_page_for_role(self):
+ frappe.delete_doc_if_exists('User', 'test-user-for-home-page@example.com')
+ frappe.delete_doc_if_exists('Role', 'home-page-test')
+ frappe.delete_doc_if_exists('Web Page', 'home-page-test')
+ user = frappe.get_doc(dict(
+ doctype='User',
+ email='test-user-for-home-page@example.com',
+ first_name='test')).insert()
+
+ role = frappe.get_doc(dict(
+ doctype = 'Role',
+ role_name = 'home-page-test',
+ desk_access = 0,
+ home_page = '/home-page-test'
+ )).insert()
+
+ user.add_roles(role.name)
+ user.save()
+
+ frappe.set_user('test-user-for-home-page@example.com')
+ self.assertEqual(get_home_page(), 'home-page-test')
+
+ frappe.set_user('Administrator')
+ role.home_page = ''
+ role.save()
+
+ # home page via portal settings
+ frappe.db.set_value('Portal Settings', None, 'default_portal_home', 'test-portal-home')
+
+ frappe.set_user('test-user-for-home-page@example.com')
+ frappe.cache().hdel('home_page', frappe.session.user)
+ self.assertEqual(get_home_page(), 'test-portal-home')
+
+
+
def test_page_load(self):
frappe.set_user('Guest')
set_request(method='POST', path='login')
diff --git a/frappe/translate.py b/frappe/translate.py
index 2fc2d3f328..ee1f8fa5ff 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -119,7 +119,7 @@ def get_dict(fortype, name=None):
messages += frappe.db.sql("select 'Role:', name from tabRole")
messages += frappe.db.sql("select 'Module:', name from `tabModule Def`")
- message_dict = make_dict_from_messages(messages)
+ message_dict = make_dict_from_messages(messages, load_user_translation=False)
message_dict.update(get_dict_from_hooks(fortype, name))
# remove untranslated
message_dict = {k:v for k, v in iteritems(message_dict) if k!=v}
@@ -127,6 +127,7 @@ def get_dict(fortype, name=None):
cache.hset("translation_assets", frappe.local.lang, translation_assets, shared=True)
translation_map = translation_assets[asset_key]
+
if fortype == "boot":
translation_map.update(get_user_translations(frappe.local.lang))
@@ -144,14 +145,17 @@ def get_dict_from_hooks(fortype, name):
return translated_dict
-def make_dict_from_messages(messages, full_dict=None):
+def make_dict_from_messages(messages, full_dict=None, load_user_translation=True):
"""Returns translated messages as a dict in Language specified in `frappe.local.lang`
:param messages: List of untranslated messages
"""
out = {}
if full_dict==None:
- full_dict = get_full_dict(frappe.local.lang)
+ if load_user_translation:
+ full_dict = get_full_dict(frappe.local.lang)
+ else:
+ full_dict = load_lang(frappe.local.lang)
for m in messages:
if m[1] in full_dict:
@@ -189,11 +193,9 @@ def get_full_dict(lang):
try:
# get user specific transaltion data
user_translations = get_user_translations(lang)
- except Exception:
- user_translations = None
-
- if user_translations:
frappe.local.lang_full_dict.update(user_translations)
+ except Exception:
+ pass
return frappe.local.lang_full_dict
diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 7eb00ceccd..a64ba8c3a7 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -7,7 +7,9 @@ from __future__ import print_function, unicode_literals
import os
import json
+from calendar import timegm
from datetime import datetime
+from glob import glob
import frappe
from frappe import _, conf
@@ -94,26 +96,47 @@ class BackupGenerator:
self.backup_path_private_files = os.path.join(backup_path, for_private_files)
def get_recent_backup(self, older_than):
- file_list = os.listdir(get_backup_path())
- backup_path_files = None
- backup_path_db = None
- backup_path_private_files = None
- site_config_backup_path = None
+ backup_path = get_backup_path()
- for this_file in file_list:
- this_file = cstr(this_file)
- this_file_path = os.path.join(get_backup_path(), this_file)
- if not is_file_old(this_file_path, older_than):
- if "-private-files" in this_file_path:
- backup_path_private_files = this_file_path
- elif "-files" in this_file_path:
- backup_path_files = this_file_path
- elif "-database" in this_file_path:
- backup_path_db = this_file_path
- elif "site_config" in this_file_path:
- site_config_backup_path = this_file_path
+ file_type_slugs = {
+ "database": "*-{}-database.sql.gz",
+ "public": "*-{}-files.tar",
+ "private": "*-{}-private-files.tar",
+ "config": "*-{}-site_config_backup.json",
+ }
- return (backup_path_db, backup_path_files, backup_path_private_files, site_config_backup_path)
+ def backup_time(file_path):
+ file_name = file_path.split(os.sep)[-1]
+ file_timestamp = file_name.split("-")[0]
+ return timegm(datetime.strptime(file_timestamp, "%Y%m%d_%H%M%S").utctimetuple())
+
+ def get_latest(file_pattern):
+ file_pattern = os.path.join(backup_path, file_pattern.format(self.site_slug))
+ file_list = glob(file_pattern)
+ if file_list:
+ return max(file_list, key=backup_time)
+
+ def old_enough(file_path):
+ if file_path:
+ if not os.path.isfile(file_path) or is_file_old(file_path, older_than):
+ return None
+ return file_path
+
+ latest_backups = {
+ file_type: get_latest(pattern)
+ for file_type, pattern in file_type_slugs.items()
+ }
+
+ recent_backups = {
+ file_type: old_enough(file_name) for file_type, file_name in latest_backups.items()
+ }
+
+ return (
+ recent_backups.get("database"),
+ recent_backups.get("public"),
+ recent_backups.get("private"),
+ recent_backups.get("config"),
+ )
def zip_files(self):
for folder in ("public", "private"):
@@ -216,7 +239,14 @@ def fetch_latest_backups():
dict: relative Backup Paths
"""
frappe.only_for("System Manager")
- odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name, frappe.conf.db_password, db_host=frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port)
+ odb = BackupGenerator(
+ frappe.conf.db_name,
+ frappe.conf.db_name,
+ frappe.conf.db_password,
+ db_host=frappe.db.host,
+ db_type=frappe.conf.db_type,
+ db_port=frappe.conf.db_port,
+ )
database, public, private, config = odb.get_recent_backup(older_than=24 * 30)
return {
diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py
index 7dfa2ca1b0..d3b206559f 100755
--- a/frappe/utils/boilerplate.py
+++ b/frappe/utils/boilerplate.py
@@ -181,9 +181,6 @@ app_license = "{app_license}"
# "Role": "home_page"
# }}
-# Website user home page (by function)
-# get_website_user_home_page = "{app_name}.utils.get_home_page"
-
# Generators
# ----------
diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py
index 53c83cfe99..c75b3289db 100644
--- a/frappe/utils/change_log.py
+++ b/frappe/utils/change_log.py
@@ -118,8 +118,9 @@ def get_versions():
def get_app_branch(app):
'''Returns branch of an app'''
try:
+ null_stream = open(os.devnull, 'wb')
result = subprocess.check_output('cd ../apps/{0} && git rev-parse --abbrev-ref HEAD'.format(app),
- shell=True)
+ shell=True, stdin=null_stream, stderr=null_stream)
result = safe_decode(result)
result = result.strip()
return result
@@ -128,8 +129,9 @@ def get_app_branch(app):
def get_app_last_commit_ref(app):
try:
+ null_stream = open(os.devnull, 'wb')
result = subprocess.check_output('cd ../apps/{0} && git rev-parse HEAD --short 7'.format(app),
- shell=True)
+ shell=True, stdin=null_stream, stderr=null_stream)
result = safe_decode(result)
result = result.strip()
return result
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index d1b409d1fc..fd5c838b57 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -8,6 +8,7 @@ import frappe
from dateutil.parser._parser import ParserError
import subprocess
import operator
+import json
import re, datetime, math, time
import babel.dates
from babel.core import UnknownLocaleError
@@ -94,7 +95,10 @@ def add_to_date(date, years=0, months=0, weeks=0, days=0, hours=0, minutes=0, se
as_string = True
if " " in date:
as_datetime = True
- date = parser.parse(date)
+ try:
+ date = parser.parse(date)
+ except ParserError:
+ frappe.throw(frappe._("Please select a valid date filter"), title=frappe._("Invalid Date"))
date = date + relativedelta(years=years, months=months, weeks=weeks, days=days, hours=hours, minutes=minutes, seconds=seconds)
@@ -1236,8 +1240,6 @@ def is_subset(list_a, list_b):
def generate_hash(*args, **kwargs):
return frappe.generate_hash(*args, **kwargs)
-
-
def guess_date_format(date_string):
DATE_FORMATS = [
r"%d-%m-%Y",
@@ -1310,3 +1312,9 @@ def guess_date_format(date_string):
if date_format and time_format:
return (date_format + ' ' + time_format).strip()
+
+def validate_json_string(string):
+ try:
+ json.loads(string)
+ except (TypeError, ValueError):
+ raise frappe.ValidationError
\ No newline at end of file
diff --git a/frappe/utils/install.py b/frappe/utils/install.py
index bb384fb300..d20abdb11d 100644
--- a/frappe/utils/install.py
+++ b/frappe/utils/install.py
@@ -10,6 +10,8 @@ from frappe.utils.password import update_password
def before_install():
frappe.reload_doc("core", "doctype", "docfield")
frappe.reload_doc("core", "doctype", "docperm")
+ frappe.reload_doc("core", "doctype", "doctype_action")
+ frappe.reload_doc("core", "doctype", "doctype_link")
frappe.reload_doc("core", "doctype", "doctype")
def after_install():
@@ -43,6 +45,8 @@ def after_install():
with open(frappe.get_site_path('.test_log'), 'w') as f:
f.write('')
+ add_standard_navbar_items()
+
frappe.db.commit()
def install_basic_docs():
@@ -164,3 +168,88 @@ def add_country_and_currency(name, country):
"number_format": country.number_format,
"docstatus": 0
}).db_insert()
+
+def add_standard_navbar_items():
+ navbar_settings = frappe.get_single("Navbar Settings")
+
+ standard_navbar_items = [
+ {
+ 'item_label': 'My Profile',
+ 'item_type': 'Route',
+ 'route': '#user-profile',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'My Settings',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.route_to_user()',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Session Defaults',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.setup_session_defaults()',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Reload',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.clear_cache()',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'View Website',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.view_website()',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Toggle Full Width',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.toggle_full_width()',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Background Jobs',
+ 'item_type': 'Route',
+ 'route': '#background_jobs',
+ 'is_standard': 1
+ },
+ {
+ 'item_type': 'Separator',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Logout',
+ 'item_type': 'Action',
+ 'action': 'frappe.app.logout()',
+ 'is_standard': 1
+ }
+ ]
+
+ standard_help_items = [
+ {
+ 'item_type': 'Separator',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'About',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.show_about()',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Keyboard Shortcuts',
+ 'item_type': 'Action',
+ 'action': 'frappe.ui.toolbar.show_shortcuts(event)',
+ 'is_standard': 1
+ }
+ ]
+
+ for item in standard_navbar_items:
+ navbar_settings.append('settings_dropdown', item)
+
+ for item in standard_help_items:
+ navbar_settings.append('help_dropdown', item)
+
+ navbar_settings.save()
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 89e3711b0f..364ffa776d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -11,56 +11,86 @@ from six import text_type
# imports - module imports
import frappe
+from frappe.utils import get_sites
default_log_level = logging.DEBUG
-site = getattr(frappe.local, 'site', None)
-def get_logger(module, with_more_info=False):
- global site
- if module in frappe.loggers:
- return frappe.loggers[module]
+def get_logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
+ """Application Logger for your given module
+
+ Args:
+ module (str, optional): Name of your logger and consequently your log file. Defaults to None.
+ with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
+ allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
+ filter (function, optional): Add a filter function for your logger. Defaults to None.
+ max_size (int, optional): Max file size of each log file in bytes. Defaults to 100_000.
+ file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
+
+ Returns:
+
: Returns a Python logger object with Site and Bench level logging capabilities.
+ """
+
+ if allow_site is True:
+ site = getattr(frappe.local, "site", None)
+ elif allow_site in get_sites():
+ site = allow_site
+ else:
+ site = False
+
+ logger_name = "{0}-{1}".format(module, site or "all")
+
+ try:
+ return frappe.loggers[logger_name]
+ except KeyError:
+ pass
if not module:
module = "frappe"
with_more_info = True
- logfile = module + '.log'
- site = getattr(frappe.local, 'site', None)
- LOG_FILENAME = os.path.join('..', 'logs', logfile)
+ logfile = module + ".log"
+ log_filename = os.path.join("..", "logs", logfile)
- logger = logging.getLogger(module)
+ logger = logging.getLogger(logger_name)
logger.setLevel(frappe.log_level or default_log_level)
logger.propagate = False
- formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
- handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+ formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
+ handler = RotatingFileHandler(log_filename, maxBytes=max_size, backupCount=file_count)
+ handler.setFormatter(formatter)
logger.addHandler(handler)
-#
+
if site:
- SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
- site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
+ sitelog_filename = os.path.join(site, "logs", logfile)
+ site_handler = RotatingFileHandler(sitelog_filename, maxBytes=max_size, backupCount=file_count)
site_handler.setFormatter(formatter)
logger.addHandler(site_handler)
if with_more_info:
handler.addFilter(SiteContextFilter())
- handler.setFormatter(formatter)
+ if filter:
+ logger.addFilter(filter)
- frappe.loggers[module] = logger
+ frappe.loggers[logger_name] = logger
return logger
+
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):
- record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, getattr(frappe.local, 'form_dict', None))
+ 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)
return True
+
def set_log_level(level):
- '''Use this method to set log level to something other than the default DEBUG'''
- frappe.log_level = getattr(logging, (level or '').upper(), None) or default_log_level
+ """Use this method to set log level to something other than the default DEBUG"""
+ frappe.log_level = getattr(logging, (level or "").upper(), None) or default_log_level
frappe.loggers = {}
diff --git a/frappe/utils/password.py b/frappe/utils/password.py
index b939607b19..b1461ce7fe 100644
--- a/frappe/utils/password.py
+++ b/frappe/utils/password.py
@@ -10,6 +10,8 @@ from cryptography.fernet import Fernet, InvalidToken
from passlib.hash import pbkdf2_sha256, mysql41
from passlib.registry import register_crypt_handler
from passlib.context import CryptContext
+from pymysql.constants.ER import DATA_TOO_LONG
+from psycopg2.errorcodes import STRING_DATA_RIGHT_TRUNCATION
class LegacyPassword(pbkdf2_sha256):
name = "frappe_legacy"
@@ -49,11 +51,17 @@ def get_decrypted_password(doctype, name, fieldname='password', raise_exception=
frappe.throw(_('Password not found'), frappe.AuthenticationError)
def set_encrypted_password(doctype, name, pwd, fieldname='password'):
- frappe.db.sql("""insert into `__Auth` (doctype, name, fieldname, `password`, encrypted)
- values (%(doctype)s, %(name)s, %(fieldname)s, %(pwd)s, 1)
- {on_duplicate_update} `password`=%(pwd)s, encrypted=1""".format(
- on_duplicate_update=frappe.db.get_on_duplicate_update(['doctype', 'name', 'fieldname'])
- ), { 'doctype': doctype, 'name': name, 'fieldname': fieldname, 'pwd': encrypt(pwd) })
+ try:
+ frappe.db.sql("""insert into `__Auth` (doctype, name, fieldname, `password`, encrypted)
+ values (%(doctype)s, %(name)s, %(fieldname)s, %(pwd)s, 1)
+ {on_duplicate_update} `password`=%(pwd)s, encrypted=1""".format(
+ on_duplicate_update=frappe.db.get_on_duplicate_update(['doctype', 'name', 'fieldname'])
+ ), { 'doctype': doctype, 'name': name, 'fieldname': fieldname, 'pwd': encrypt(pwd) })
+ 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)
+ raise e
def check_password(user, pwd, doctype='User', fieldname='password'):
'''Checks if user and password are correct, else raises frappe.AuthenticationError'''
@@ -131,10 +139,6 @@ def create_auth_table():
frappe.db.create_auth_table()
def encrypt(pwd):
- if len(pwd) > 127:
- # encrypting > 127 chars will lead to truncation
- frappe.throw(_('Password cannot be more than 127 characters long'))
-
cipher_suite = Fernet(encode(get_encryption_key()))
cipher_text = cstr(cipher_suite.encrypt(encode(pwd)))
return cipher_text
diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
index 826aed6082..d97e770d88 100644
--- a/frappe/utils/safe_exec.py
+++ b/frappe/utils/safe_exec.py
@@ -70,6 +70,7 @@ def get_safe_globals():
render_template=frappe.render_template,
msgprint=frappe.msgprint,
throw=frappe.throw,
+ sendmail = frappe.sendmail,
user=user,
get_fullname=frappe.utils.get_fullname,
diff --git a/frappe/website/doctype/blog_category/blog_category.json b/frappe/website/doctype/blog_category/blog_category.json
index 5921cef2d5..b2180047cd 100644
--- a/frappe/website/doctype/blog_category/blog_category.json
+++ b/frappe/website/doctype/blog_category/blog_category.json
@@ -1,196 +1,82 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 1,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "field:category_name",
- "beta": 0,
- "creation": "2013-03-08 09:41:11",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 0,
+ "actions": [],
+ "allow_guest_to_view": 1,
+ "allow_import": 1,
+ "autoname": "field:category_name",
+ "creation": "2013-03-08 09:41:11",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+ "category_name",
+ "title",
+ "published",
+ "route"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "category_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Category Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "category_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Category Name",
+ "reqd": 1,
+ "unique": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Title",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "title",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Title",
+ "no_copy": 1,
+ "reqd": 1
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "published",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Published",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "published",
+ "fieldtype": "Check",
+ "in_list_view": 1,
+ "label": "Published"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "published",
- "fieldname": "route",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Route",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
+ "depends_on": "published",
+ "fieldname": "route",
+ "fieldtype": "Data",
+ "label": "Route",
"unique": 1
}
- ],
- "has_web_view": 1,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "fa fa-tag",
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_published_field": "published",
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2017-03-06 16:29:05.035486",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Blog Category",
- "owner": "Administrator",
+ ],
+ "has_web_view": 1,
+ "icon": "fa fa-tag",
+ "idx": 1,
+ "is_published_field": "published",
+ "links": [],
+ "modified": "2020-07-29 21:14:47.210446",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Blog Category",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Website Manager",
- "set_user_permissions": 1,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Website Manager",
+ "set_user_permissions": 1,
+ "share": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 0,
- "role": "Blogger",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Blogger"
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json
index 8821be1555..c3220788b7 100644
--- a/frappe/website/doctype/blog_post/blog_post.json
+++ b/frappe/website/doctype/blog_post/blog_post.json
@@ -189,10 +189,11 @@
"has_web_view": 1,
"icon": "fa fa-quote-left",
"idx": 1,
+ "index_web_pages_for_search": 1,
"is_published_field": "published",
"links": [],
"max_attachments": 5,
- "modified": "2020-06-01 13:37:57.465434",
+ "modified": "2020-07-21 16:25:17.154911",
"modified_by": "Administrator",
"module": "Website",
"name": "Blog Post",
diff --git a/frappe/website/doctype/help_article/help_article.json b/frappe/website/doctype/help_article/help_article.json
index ca659692c6..2c69de6ff2 100644
--- a/frappe/website/doctype/help_article/help_article.json
+++ b/frappe/website/doctype/help_article/help_article.json
@@ -4,6 +4,7 @@
"allow_import": 1,
"creation": "2014-10-30 14:25:53.780105",
"doctype": "DocType",
+ "engine": "InnoDB",
"field_order": [
"title",
"category",
@@ -15,11 +16,7 @@
"content",
"likes",
"route",
- "owner",
- "feedback",
- "helpful",
- "cb_00",
- "not_helpful"
+ "owner"
],
"fields": [
{
@@ -27,8 +24,7 @@
"fieldtype": "Data",
"in_global_search": 1,
"label": "Title",
- "reqd": 1,
- "search_index": 1
+ "reqd": 1
},
{
"fieldname": "category",
@@ -90,39 +86,14 @@
"fieldtype": "Link",
"label": "Owner",
"options": "User"
- },
- {
- "collapsible": 1,
- "fieldname": "feedback",
- "fieldtype": "Section Break",
- "label": "Feedback"
- },
- {
- "default": "0",
- "fieldname": "helpful",
- "fieldtype": "Int",
- "in_list_view": 1,
- "label": "Helpful",
- "read_only": 1
- },
- {
- "fieldname": "cb_00",
- "fieldtype": "Column Break"
- },
- {
- "default": "0",
- "fieldname": "not_helpful",
- "fieldtype": "Data",
- "in_list_view": 1,
- "label": "Not Helpful",
- "read_only": 1
}
],
"has_web_view": 1,
"icon": "icon-file-alt",
+ "index_web_pages_for_search": 1,
"is_published_field": "published",
"links": [],
- "modified": "2020-05-08 10:48:19.997789",
+ "modified": "2020-07-21 16:25:18.577325",
"modified_by": "Administrator",
"module": "Website",
"name": "Help Article",
diff --git a/frappe/website/doctype/portal_settings/portal_settings.json b/frappe/website/doctype/portal_settings/portal_settings.json
index 81b2a94c08..48321d0512 100644
--- a/frappe/website/doctype/portal_settings/portal_settings.json
+++ b/frappe/website/doctype/portal_settings/portal_settings.json
@@ -1,231 +1,79 @@
{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2016-03-30 01:40:20.001775",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 0,
+ "actions": [],
+ "creation": "2016-03-30 01:40:20.001775",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+ "default_role",
+ "default_portal_home",
+ "standard_menu_items",
+ "hide_standard_menu",
+ "menu",
+ "custom_sidebar_menu",
+ "custom_menu"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "default_role",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Default Role at Time of Signup",
- "length": 0,
- "no_copy": 0,
- "options": "Role",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "default_role",
+ "fieldtype": "Link",
+ "label": "Default Role at Time of Signup",
+ "options": "Role"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "standard_menu_items",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Standard Sidebar Menu",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "standard_menu_items",
+ "fieldtype": "Section Break",
+ "label": "Standard Sidebar Menu"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "hide_standard_menu",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Hide Standard Menu",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "default": "0",
+ "fieldname": "hide_standard_menu",
+ "fieldtype": "Check",
+ "label": "Hide Standard Menu"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "menu",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Portal Menu",
- "length": 0,
- "no_copy": 0,
- "options": "Portal Menu Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "menu",
+ "fieldtype": "Table",
+ "label": "Portal Menu",
+ "options": "Portal Menu Item"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "custom_sidebar_menu",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Custom Sidebar Menu",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "custom_sidebar_menu",
+ "fieldtype": "Section Break",
+ "label": "Custom Sidebar Menu"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "custom_menu",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Custom Menu Items",
- "length": 0,
- "no_copy": 0,
- "options": "Portal Menu Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
+ "fieldname": "custom_menu",
+ "fieldtype": "Table",
+ "label": "Custom Menu Items",
+ "options": "Portal Menu Item"
+ },
+ {
+ "description": "Example: \"/desk\"",
+ "fieldname": "default_portal_home",
+ "fieldtype": "Data",
+ "label": "Default Portal Home"
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 1,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-12-29 14:40:31.476181",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Portal Settings",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-08-06 15:43:36.387050",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Portal Settings",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 0,
- "role": "Website Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Website Manager",
+ "share": 1,
"write": 1
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/frappe/website/doctype/portal_settings/test_portal_settings.py b/frappe/website/doctype/portal_settings/test_portal_settings.py
new file mode 100644
index 0000000000..3dd4aa0c35
--- /dev/null
+++ b/frappe/website/doctype/portal_settings/test_portal_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestPortalSettings(unittest.TestCase):
+ pass
diff --git a/frappe/website/doctype/web_form/web_form.json b/frappe/website/doctype/web_form/web_form.json
index e6b7632e4d..77dbbb9734 100644
--- a/frappe/website/doctype/web_form/web_form.json
+++ b/frappe/website/doctype/web_form/web_form.json
@@ -16,6 +16,7 @@
"route_to_success_link",
"allow_edit",
"allow_multiple",
+ "apply_document_permissions",
"show_in_grid",
"allow_delete",
"allow_print",
@@ -202,6 +203,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "client_script",
"fieldname": "client_script_section",
"fieldtype": "Section Break",
"label": "Client Script"
@@ -343,17 +345,24 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "custom_css",
"fieldname": "custom_css_section",
"fieldtype": "Section Break",
"label": "Custom CSS"
+ },
+ {
+ "default": "0",
+ "fieldname": "apply_document_permissions",
+ "fieldtype": "Check",
+ "label": "Apply Document Permissions"
}
],
"has_web_view": 1,
"icon": "icon-edit",
"is_published_field": "published",
"links": [],
- "modified": "2019-12-24 14:15:43.497431",
- "modified_by": "faris@erpnext.com",
+ "modified": "2020-08-07 13:12:03.945686",
+ "modified_by": "Administrator",
"module": "Website",
"name": "Web Form",
"owner": "Administrator",
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index a3867f1396..ee2a31203a 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -130,7 +130,7 @@ def get_context(context):
if frappe.session.user == "Guest" and frappe.form_dict.name:
frappe.throw(_("You need to be logged in to access this {0}.").format(self.doc_type), frappe.PermissionError)
- if frappe.form_dict.name and not has_web_form_permission(self.doc_type, frappe.form_dict.name):
+ if frappe.form_dict.name and not self.has_web_form_permission(self.doc_type, frappe.form_dict.name):
frappe.throw(_("You don't have the permissions to access this document"), frappe.PermissionError)
self.reset_field_parent()
@@ -343,6 +343,29 @@ def get_context(context):
frappe.throw(_('Mandatory Information missing:') + '
'
+ '
'.join(['{0} ({1})'.format(d.label, d.fieldtype) for d in missing]))
+ def allow_website_search_indexing(self):
+ return False
+
+ def has_web_form_permission(self, doctype, name, ptype='read'):
+ if frappe.session.user=="Guest":
+ return False
+
+ if self.apply_document_permissions:
+ return frappe.get_doc(doctype, name).has_permission()
+
+ # owner matches
+ elif frappe.db.get_value(doctype, name, "owner")==frappe.session.user:
+ return True
+
+ elif frappe.has_website_permission(name, ptype=ptype, doctype=doctype):
+ return True
+
+ elif check_webform_perm(doctype, name):
+ return True
+
+ else:
+ return False
+
@frappe.whitelist(allow_guest=True)
def accept(web_form, data, docname=None, for_payment=False):
@@ -391,7 +414,7 @@ def accept(web_form, data, docname=None, for_payment=False):
doc.run_method('validate_payment')
if doc.name:
- if has_web_form_permission(doc.doctype, doc.name, "write"):
+ if web_form.has_web_form_permission(doc.doctype, doc.name, "write"):
doc.save(ignore_permissions=True)
else:
# only if permissions are present
@@ -478,24 +501,6 @@ def delete_multiple(web_form_name, docnames):
raise frappe.PermissionError("You do not have permisssion to delete " + ", ".join(restricted_docnames))
-def has_web_form_permission(doctype, name, ptype='read'):
- if frappe.session.user=="Guest":
- return False
-
- # owner matches
- elif frappe.db.get_value(doctype, name, "owner")==frappe.session.user:
- return True
-
- elif frappe.has_website_permission(name, ptype=ptype, doctype=doctype):
- return True
-
- elif check_webform_perm(doctype, name):
- return True
-
- else:
- return False
-
-
def check_webform_perm(doctype, name):
doc = frappe.get_doc(doctype, name)
if hasattr(doc, "has_webform_permission"):
@@ -532,7 +537,7 @@ def get_form_data(doctype, docname=None, web_form_name=None):
if docname:
doc = frappe.get_doc(doctype, docname)
- if has_web_form_permission(doctype, docname, ptype='read'):
+ if web_form.has_web_form_permission(doctype, docname, ptype='read'):
out.doc = doc
else:
frappe.throw(_("Not permitted"), frappe.PermissionError)
diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json
index 4766c24045..955b34f44e 100644
--- a/frappe/website/doctype/web_page/web_page.json
+++ b/frappe/website/doctype/web_page/web_page.json
@@ -137,6 +137,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "insert_code",
"fieldname": "custom_javascript",
"fieldtype": "Section Break",
"label": "Script"
@@ -157,6 +158,7 @@
},
{
"collapsible": 1,
+ "collapsible_depends_on": "insert_style",
"fieldname": "custom_css",
"fieldtype": "Section Break",
"label": "Style"
@@ -288,10 +290,11 @@
"has_web_view": 1,
"icon": "fa fa-file-alt",
"idx": 1,
+ "index_web_pages_for_search": 1,
"is_published_field": "published",
"links": [],
"max_attachments": 20,
- "modified": "2020-04-25 20:40:39.253548",
+ "modified": "2020-08-07 10:55:54.885448",
"modified_by": "Administrator",
"module": "Website",
"name": "Web Page",
diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json
index c91366c103..65a45c1796 100644
--- a/frappe/website/doctype/website_settings/website_settings.json
+++ b/frappe/website/doctype/website_settings/website_settings.json
@@ -1,5 +1,11 @@
{
- "actions": [],
+ "actions": [
+ {
+ "action": "frappe.sessions.clear",
+ "action_type": "Server Action",
+ "label": "Clear Cache"
+ }
+ ],
"creation": "2013-04-30 12:58:46",
"doctype": "DocType",
"document_type": "Other",
@@ -358,7 +364,7 @@
"issingle": 1,
"links": [],
"max_attachments": 10,
- "modified": "2020-05-15 14:12:32.907352",
+ "modified": "2020-08-07 13:34:19.181561",
"modified_by": "Administrator",
"module": "Website",
"name": "Website Settings",
diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js
index cd9609cfd3..113e04c5b7 100644
--- a/frappe/website/js/website.js
+++ b/frappe/website/js/website.js
@@ -380,9 +380,139 @@ $.extend(frappe, {
}
});
+frappe.setup_search = function (target, search_scope) {
+ if (typeof target === "string") {
+ target = $(target);
+ }
+
+ let $search_input = $(``);
+
+ target.empty();
+ $search_input.appendTo(target);
+
+ // let $dropdown = $search_input.find('.dropdown');
+ let $dropdown_menu = $search_input.find('.dropdown-menu');
+ let $input = $search_input.find('input');
+ let dropdownItems;
+ let offsetIndex = 0;
+
+ $(document).on('keypress', e => {
+ if (e.key === '/') {
+ e.preventDefault();
+ $input.focus();
+ }
+ });
+
+ $input.on('input', frappe.utils.debounce(() => {
+ if (!$input.val()) {
+ clear_dropdown();
+ return;
+ }
+
+ frappe.call({
+ method: 'frappe.search.web_search',
+ args: {
+ scope: search_scope || null,
+ query: $input.val(),
+ limit: 5
+ }
+ }).then(r => {
+ let results = r.message || [];
+ let dropdown_html;
+ if (results.length == 0) {
+ dropdown_html = `No results found
`;
+ } else {
+ dropdown_html = results.map(r => {
+ return `
+ ${r.title_highlights || r.title}
+ ${r.content_highlights}
+ `;
+ }).join('');
+ }
+ $dropdown_menu.html(dropdown_html);
+ $dropdown_menu.addClass('show');
+ dropdownItems = $dropdown_menu.find(".dropdown-item");
+ });
+ }, 500));
+
+ $input.on('focus', () => {
+ if (!$input.val()) {
+ clear_dropdown();
+ } else {
+ $input.trigger('input');
+ }
+ });
+
+ $input.keydown(function(e) {
+ // up: 38, down: 40
+ if (e.which == 40) {
+ navigate(0);
+ }
+ });
+
+ $dropdown_menu.keydown(function(e) {
+ // up: 38, down: 40
+ if (e.which == 38) {
+ navigate(-1);
+ } else if (e.which == 40) {
+ navigate(1);
+ } else if (e.which == 27) {
+ setTimeout(() => {
+ clear_dropdown();
+ }, 300);
+ }
+ });
+
+ // Clear dropdown when clicked
+ $(window).click(function() {
+ clear_dropdown();
+ });
+
+ $search_input.click(function(event) {
+ event.stopPropagation();
+ });
+
+ // Navigate the list
+ var navigate = function(diff) {
+ offsetIndex += diff;
+
+ if (offsetIndex >= dropdownItems.length)
+ offsetIndex = 0;
+ if (offsetIndex < 0)
+ offsetIndex = dropdownItems.length - 1;
+ $input.off('blur');
+ dropdownItems.eq(offsetIndex).focus();
+ };
+
+ function clear_dropdown() {
+ offsetIndex = 0;
+ $dropdown_menu.html('');
+ $dropdown_menu.removeClass('show');
+ dropdownItems = undefined;
+ }
+
+ // Remove focus state on hover
+ $dropdown_menu.mouseover(function() {
+ dropdownItems.blur();
+ });
+};
+
// Utility functions
-
window.valid_email = function(id) {
// eslint-disable-next-line
// copied regex from frappe/utils.js validate_type
diff --git a/frappe/website/utils.py b/frappe/website/utils.py
index dc981fe30a..239883f655 100644
--- a/frappe/website/utils.py
+++ b/frappe/website/utils.py
@@ -67,29 +67,28 @@ def get_comment_list(doctype, name):
def get_home_page():
- if frappe.local.flags.home_page:
+ if frappe.local.flags.home_page and not frappe.flags.in_test:
return frappe.local.flags.home_page
def _get_home_page():
home_page = None
- get_website_user_home_page = frappe.get_hooks('get_website_user_home_page')
- if get_website_user_home_page:
- home_page = frappe.get_attr(get_website_user_home_page[-1])(frappe.session.user)
+ # for user
+ if frappe.session.user != 'Guest':
+ # by role
+ for role in frappe.get_roles():
+ home_page = frappe.db.get_value('Role', role, 'home_page')
+ if home_page: break
+ # portal default
+ if not home_page:
+ home_page = frappe.db.get_value("Portal Settings", None, "default_portal_home")
+
+ # by hooks
if not home_page:
- role_home_page = frappe.get_hooks("role_home_page")
- if role_home_page:
- for role in frappe.get_roles():
- if role in role_home_page:
- home_page = role_home_page[role][-1]
- break
-
- if not home_page:
- home_page = frappe.get_hooks("home_page")
- if home_page:
- home_page = home_page[-1]
+ home_page = get_home_page_via_hooks()
+ # global
if not home_page:
home_page = frappe.db.get_value("Website Settings", None, "home_page") or "login"
@@ -99,6 +98,31 @@ def get_home_page():
return frappe.cache().hget("home_page", frappe.session.user, _get_home_page)
+def get_home_page_via_hooks():
+ home_page = None
+
+ home_page_method = frappe.get_hooks('get_website_user_home_page')
+ if home_page_method:
+ home_page = frappe.get_attr(home_page_method[-1])(frappe.session.user).strip('/')
+ elif frappe.get_hooks('website_user_home_page'):
+ home_page = frappe.get_hooks('website_user_home_page')[-1].strip('/')
+
+ if not home_page:
+ role_home_page = frappe.get_hooks("role_home_page")
+ if role_home_page:
+ for role in frappe.get_roles():
+ if role in role_home_page:
+ home_page = role_home_page[role][-1]
+ break
+
+ if not home_page:
+ home_page = frappe.get_hooks("home_page")
+ if home_page:
+ home_page = home_page[-1]
+
+ return home_page
+
+
def is_signup_enabled():
if getattr(frappe.local, "is_signup_enabled", None) is None:
frappe.local.is_signup_enabled = True
diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py
index 1a32ef9ffa..c406679e54 100644
--- a/frappe/website/website_generator.py
+++ b/frappe/website/website_generator.py
@@ -7,6 +7,7 @@ from frappe.model.document import Document
from frappe.website.utils import cleanup_page_name
from frappe.website.render import clear_cache
from frappe.modules import get_module_name
+from frappe.search.website_search import update_index_for_path, remove_document_from_index
class WebsiteGenerator(Document):
website = frappe._dict()
@@ -83,10 +84,19 @@ class WebsiteGenerator(Document):
def on_update(self):
self.send_indexing_request()
+ self.remove_old_route_from_index()
+
+ def on_change(self):
+ # Update the index on change
+ # On change is triggered last in the event lifecycle
+ self.update_website_search_index()
def on_trash(self):
self.clear_cache()
self.send_indexing_request('URL_DELETED')
+ # On deleting the doc, remove the page from the web_routes index
+ if self.allow_website_search_indexing():
+ remove_document_from_index(self.route)
def is_website_published(self):
"""Return true if published in website"""
@@ -129,4 +139,34 @@ class WebsiteGenerator(Document):
url = frappe.utils.get_url(self.route)
frappe.enqueue('frappe.website.doctype.website_settings.google_indexing.publish_site', \
- url=url, operation_type=operation_type)
\ No newline at end of file
+ url=url, operation_type=operation_type)
+
+ # Change the field value in doctype
+ # Override this method to disable indexing
+ def allow_website_search_indexing(self):
+ return self.meta.index_web_pages_for_search
+
+ def remove_old_route_from_index(self):
+ """Remove page from the website index if the route has changed."""
+ if self.allow_website_search_indexing() or frappe.flags.in_test:
+ return
+ old_doc = self.get_doc_before_save()
+ # Check if the route is changed
+ if old_doc and old_doc.route != self.route:
+ # Remove the route from index if the route has changed
+ remove_document_from_index("web_routes", old_doc.route)
+
+ def update_website_search_index(self):
+ """
+ Update the full test index executed on document change event.
+ - remove document from index if document is unpublished
+ - update index otherwise
+ """
+ if not self.allow_website_search_indexing() or frappe.flags.in_test:
+ return
+
+ if self.is_website_published():
+ frappe.enqueue(update_index_for_path, path=self.route)
+ elif self.route:
+ # If the website is not published
+ remove_document_from_index("web_routes", self.route)
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 9999df40cb..adcd98a85d 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -6,14 +6,23 @@ import frappe
import unittest
from frappe.utils import random_string
from frappe.model.workflow import apply_workflow, WorkflowTransitionError, WorkflowPermissionError, get_common_transition_actions
+from frappe.test_runner import make_test_records
+
class TestWorkflow(unittest.TestCase):
+ @classmethod
+ def setUpClass(cls):
+ make_test_records("User")
+
def setUp(self):
- frappe.db.sql('DELETE FROM `tabToDo`')
if not getattr(self, 'workflow', None):
self.workflow = create_todo_workflow()
frappe.set_user('Administrator')
+ def tearDown(self):
+ frappe.print_sql(False)
+ self.workflow.db_set('is_active', 0)
+
def test_default_condition(self):
'''test default condition is set'''
todo = create_new_todo()
@@ -25,6 +34,7 @@ class TestWorkflow(unittest.TestCase):
def test_approve(self, doc=None):
'''test simple workflow'''
+ frappe.print_sql(True)
todo = doc or self.test_default_condition()
apply_workflow(todo, 'Approve')
@@ -77,7 +87,7 @@ class TestWorkflow(unittest.TestCase):
frappe.set_user('test2@example.com')
doc = self.test_default_condition()
- workflow_actions = frappe.get_all('Workflow Action', fields=['status'])
+ workflow_actions = frappe.get_all('Workflow Action', fields=['status', 'reference_name'])
self.assertEqual(len(workflow_actions), 1)
# test if status of workflow actions are updated on approval
@@ -101,6 +111,9 @@ class TestWorkflow(unittest.TestCase):
todo.reload()
self.assertEqual(todo.docstatus, 1)
+ self.workflow.states[1].doc_status = 0
+ self.workflow.save()
+
def test_if_workflow_set_on_action(self):
self.workflow.states[1].doc_status = 1
self.workflow.save()
@@ -110,9 +123,14 @@ class TestWorkflow(unittest.TestCase):
self.assertEqual(todo.docstatus, 1)
self.assertEqual(todo.workflow_state, 'Approved')
+ self.workflow.states[1].doc_status = 0
+ self.workflow.save()
+
def create_todo_workflow():
if frappe.db.exists('Workflow', 'Test ToDo'):
- return frappe.get_doc('Workflow', 'Test ToDo').save(ignore_permissions=True)
+ workflow = frappe.get_doc('Workflow', 'Test ToDo').save(ignore_permissions=True)
+ workflow.db_set('is_active', 1)
+ return workflow
else:
frappe.get_doc(dict(doctype='Role',
role_name='Test Approver')).insert(ignore_if_duplicate=True)
@@ -133,17 +151,20 @@ def create_todo_workflow():
state = 'Rejected', allow_edit = 'Test Approver'
))
workflow.append('transitions', dict(
- state = 'Pending', action='Approve', next_state = 'Approved', allowed='Test Approver', allow_self_approval= 1
+ state = 'Pending', action='Approve', next_state = 'Approved',
+ allowed='Test Approver', allow_self_approval= 1
))
workflow.append('transitions', dict(
- state = 'Pending', action='Reject', next_state = 'Rejected', allowed='Test Approver', allow_self_approval= 1
+ state = 'Pending', action='Reject', next_state = 'Rejected',
+ allowed='Test Approver', allow_self_approval= 1
))
workflow.append('transitions', dict(
- state = 'Rejected', action='Review', next_state = 'Pending', allowed='All', allow_self_approval= 1
+ state = 'Rejected', action='Review', next_state = 'Pending',
+ allowed='All', allow_self_approval= 1
))
workflow.insert(ignore_permissions=True)
return workflow
def create_new_todo():
- return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()
\ No newline at end of file
+ return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()
diff --git a/frappe/www/login.py b/frappe/www/login.py
index 65952f0154..f2d9c9d768 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -12,6 +12,7 @@ from frappe.integrations.doctype.ldap_settings.ldap_settings import LDAPSettings
from frappe.utils.password import get_decrypted_password
from frappe.utils.html_utils import get_icon_html
from frappe.integrations.oauth2_logins import decoder_compat
+from frappe.website.utils import get_home_page
no_cache = True
@@ -20,7 +21,10 @@ def get_context(context):
if frappe.session.user != "Guest":
if not redirect_to:
- redirect_to = "/me" if frappe.session.data.user_type=="Website User" else "/desk"
+ if frappe.session.data.user_type=="Website User":
+ redirect_to = get_home_page()
+ else:
+ redirect_to = "/desk"
frappe.local.flags.redirect_location = redirect_to
raise frappe.Redirect
diff --git a/frappe/www/sitemap.py b/frappe/www/sitemap.py
index 8b93270ab5..f8f03c45f8 100644
--- a/frappe/www/sitemap.py
+++ b/frappe/www/sitemap.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe
from frappe.model.document import get_controller
-from frappe.utils import get_request_site_address, get_datetime, nowdate
+from frappe.utils import get_datetime, nowdate, get_url
from frappe.website.router import get_pages, get_all_page_context_from_doctypes
from six import iteritems
from six.moves.urllib.parse import quote, urljoin
@@ -25,13 +25,13 @@ def get_context(context):
for route, page in iteritems(get_pages()):
if page.sitemap:
links.append({
- "loc": urljoin(host, quote(page.name.encode("utf-8"))),
+ "loc": get_url(quote(page.name.encode("utf-8"))),
"lastmod": nowdate()
})
for route, data in iteritems(get_public_pages_from_doctypes()):
links.append({
- "loc": urljoin(host, quote((route or "").encode("utf-8"))),
+ "loc": get_url(quote((route or "").encode("utf-8"))),
"lastmod": get_datetime(data.get("modified")).strftime("%Y-%m-%d")
})
diff --git a/requirements.txt b/requirements.txt
index 33cd292bf6..a88d0e3c1d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -50,7 +50,7 @@ python-dateutil==2.8.1
pytz==2019.3
PyYAML==5.3.1
rauth==0.7.3
-redis==3.5.1
+redis==3.5.3
requests-oauthlib==1.3.0
requests==2.23.0
RestrictedPython==5.0
@@ -69,4 +69,6 @@ Whoosh==2.7.4
xlrd==1.2.0
zxcvbn-python==4.4.24
pycryptodome==3.9.8
-paytmchecksum==1.7.0
\ No newline at end of file
+paytmchecksum==1.7.0
+wrapt==1.10.11
+twilio==6.44.2
\ No newline at end of file