From 739d0cd20fc5171a830869d52ecbac8d4b1ac89c Mon Sep 17 00:00:00 2001 From: Naren Date: Thu, 12 Mar 2020 17:40:32 +0530 Subject: [PATCH 01/49] fix: sticky footer logic implemented --- frappe/public/css/website.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index eecb7005e4..dd317952d9 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -1,7 +1,19 @@ /* the element that this class is applied to, should have a max width for this to work*/ +html { + height: 100%; +} body { + min-height: 100%; + display: flex; + flex-direction: column; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } +body > div { + flex: 1 0 auto; +} +footer { + flex-shrink: 0; +} a { cursor: pointer; } From bdc9893820c5dbc0079d191010f1df52c8744f78 Mon Sep 17 00:00:00 2001 From: Naren Date: Fri, 13 Mar 2020 15:30:02 +0530 Subject: [PATCH 02/49] fix: logic moved from css to scss file --- frappe/public/css/website.css | 12 ------------ frappe/public/scss/website.scss | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index dd317952d9..eecb7005e4 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -1,19 +1,7 @@ /* the element that this class is applied to, should have a max width for this to work*/ -html { - height: 100%; -} body { - min-height: 100%; - display: flex; - flex-direction: column; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; } -body > div { - flex: 1 0 auto; -} -footer { - flex-shrink: 0; -} a { cursor: pointer; } diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index a297054ee2..9901eb7fbf 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -4,8 +4,23 @@ @import "multilevel-dropdown"; @import "website-image"; +html { + height: 100%; +} + body { + min-height: 100%; + display: flex; + flex-direction: column; font-size: 16px; + + > div { + flex: 1 0 auto; + } +} + +footer { + flex-shrink: 0; } .navbar.bg-dark { From 6624f3a1af1c6328279c1d74303d479fd4ae41ba Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 3 Apr 2020 18:12:32 +0530 Subject: [PATCH 03/49] enhancement: provision to scheduled server scripts execution --- .../scheduled_job_type.json | 9 +++++++- .../scheduled_job_type/scheduled_job_type.py | 7 +++++- .../doctype/server_script/server_script.json | 14 +++++++++--- .../doctype/server_script/server_script.py | 22 +++++++++++++++++++ .../server_script/server_script_utils.py | 3 ++- frappe/utils/safe_exec.py | 3 +++ 6 files changed, 52 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json index e2ec921679..48c98c0bc4 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -12,6 +12,7 @@ "engine": "InnoDB", "field_order": [ "stopped", + "execute_via_server_script", "method", "frequency", "cron_format", @@ -63,6 +64,12 @@ "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", "read_only": 1, "reqd": 1 + }, + { + "default": "0", + "fieldname": "execute_via_server_script", + "fieldtype": "Check", + "label": "Execute Via Server Script" } ], "in_create": 1, @@ -72,7 +79,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2019-12-09 11:10:21.259929", + "modified": "2020-04-03 17:14:13.899031", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Type", diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 3cd994ebfa..b1b867d527 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -70,7 +70,12 @@ class ScheduledJobType(Document): self.scheduler_log = None try: self.log_status('Start') - frappe.get_attr(self.method)() + if self.execute_via_server_script: + script_name = frappe.db.get_value("Server Script", {'api_method': self.method}) + if script_name: + frappe.get_doc('Server Script', script_name).execute_scheduled_method() + else: + frappe.get_attr(self.method)() frappe.db.commit() self.log_status('Complete') except Exception: diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index 36c297cc26..aeed982162 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -11,6 +11,7 @@ "column_break_3", "reference_doctype", "doctype_event", + "scheduler_event", "api_method", "allow_guest", "section_break_8", @@ -22,7 +23,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Script Type", - "options": "DocType Event\nAPI", + "options": "DocType Event\nScheduler Event\nAPI", "reqd": 1 }, { @@ -47,7 +48,7 @@ "options": "Before Insert\nBefore Save\nAfter Save\nBefore Submit\nAfter Submit\nBefore Cancel\nAfter Cancel\nBefore Delete\nAfter Delete\nBefore Save (Submitted Document)\nAfter Save (Submitted Document)" }, { - "depends_on": "eval:doc.script_type==='API'", + "depends_on": "eval:doc.script_type==='API' || doc.script_type==='Scheduler Event'", "fieldname": "api_method", "fieldtype": "Data", "label": "API Method" @@ -72,10 +73,17 @@ { "fieldname": "section_break_8", "fieldtype": "Section Break" + }, + { + "depends_on": "eval:doc.script_type==='Scheduler Event'", + "fieldname": "scheduler_event", + "fieldtype": "Select", + "label": "Scheduler Event", + "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual" } ], "links": [], - "modified": "2019-12-17 12:55:07.389775", + "modified": "2020-04-03 16:33:08.765621", "modified_by": "Administrator", "module": "Core", "name": "Server Script", diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index e2c6d3b7b0..c651da2269 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -8,6 +8,7 @@ import frappe from frappe.model.document import Document from frappe.utils.safe_exec import safe_exec + class ServerScript(Document): @staticmethod def validate(): @@ -15,6 +16,7 @@ class ServerScript(Document): @staticmethod def on_update(): + setup_scheduler_events() frappe.cache().delete_value('server_script_map') def execute_method(self): @@ -31,3 +33,23 @@ class ServerScript(Document): # execute event safe_exec(self.script, None, dict(doc = doc)) + def execute_scheduled_method(self): + if self.script_type == 'Scheduler Event': + safe_exec(self.script) + else: + # wrong report type! + raise frappe.DoesNotExistError + +def setup_scheduler_events(): + enabled_server_scripts = frappe.get_all('Server Script', + fields=('name', 'doctype_event','api_method', 'scheduler_event'), + filters={'disabled': 0, 'script_type': 'Scheduler Event'}) + + for script in enabled_server_scripts: + if not frappe.db.exists('Scheduled Job Type', dict(method=script.api_method)): + frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = script.api_method, + frequency = script.scheduler_event, + has_server_script=1 + )).insert() \ No newline at end of file diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py index 2e1a5ae8bb..e03504f30b 100644 --- a/frappe/core/doctype/server_script/server_script_utils.py +++ b/frappe/core/doctype/server_script/server_script_utils.py @@ -66,6 +66,7 @@ def get_server_script_map(): script_map.setdefault(script.reference_doctype, {}).setdefault(script.doctype_event, []).append(script.name) else: script_map.setdefault('_api', {})[script.api_method] = script.name + frappe.cache().set_value('server_script_map', script_map) - return script_map + return script_map \ No newline at end of file diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 62d0286e03..ed949d8a01 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -11,6 +11,7 @@ from frappe.website.utils import (get_shade, get_toc, get_next_link) from frappe.modules import scrub from frappe.www.printview import get_visible_columns import frappe.exceptions +import frappe.integrations.utils class ServerScriptNotEnabled(frappe.PermissionError): pass @@ -79,6 +80,8 @@ def get_safe_globals(): user=user, csrf_token=frappe.local.session.data.csrf_token if getattr(frappe.local, "session", None) else '' ), + make_get_request = frappe.integrations.utils.make_get_request, + make_post_request = frappe.integrations.utils.make_post_request, socketio_port=frappe.conf.socketio_port, get_hooks=frappe.get_hooks, ), From 30e7d9e1512c2d9d774844c15dd30b41beee5797 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 6 Apr 2020 12:05:48 +0530 Subject: [PATCH 04/49] feat: link server scripts in scheduler --- .../scheduled_job_type.json | 14 ++++--- .../scheduled_job_type/scheduled_job_type.py | 4 +- .../doctype/server_script/server_script.js | 42 ++++++++++++++++++- .../doctype/server_script/server_script.json | 12 +----- .../doctype/server_script/server_script.py | 42 +++++++++++++------ 5 files changed, 81 insertions(+), 33 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json index 48c98c0bc4..2a9c1a4573 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -12,8 +12,8 @@ "engine": "InnoDB", "field_order": [ "stopped", - "execute_via_server_script", "method", + "server_script", "frequency", "cron_format", "last_execution", @@ -66,10 +66,12 @@ "reqd": 1 }, { - "default": "0", - "fieldname": "execute_via_server_script", - "fieldtype": "Check", - "label": "Execute Via Server Script" + "fieldname": "server_script", + "fieldtype": "Link", + "label": "Server Script", + "options": "Server Script", + "read_only": 1, + "search_index": 1 } ], "in_create": 1, @@ -79,7 +81,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2020-04-03 17:14:13.899031", + "modified": "2020-04-05 17:27:33.480562", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Type", diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index b1b867d527..c179054550 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -70,8 +70,8 @@ class ScheduledJobType(Document): self.scheduler_log = None try: self.log_status('Start') - if self.execute_via_server_script: - script_name = frappe.db.get_value("Server Script", {'api_method': self.method}) + if self.server_script: + script_name = frappe.db.get_value("Server Script", self.server_script) if script_name: frappe.get_doc('Server Script', script_name).execute_scheduled_method() else: diff --git a/frappe/core/doctype/server_script/server_script.js b/frappe/core/doctype/server_script/server_script.js index eea8558456..d7f4c3e536 100644 --- a/frappe/core/doctype/server_script/server_script.js +++ b/frappe/core/doctype/server_script/server_script.js @@ -2,7 +2,45 @@ // For license information, please see license.txt frappe.ui.form.on('Server Script', { - // refresh: function(frm) { + refresh: function(frm) { + if(frm.doc.script_type === 'Scheduler Event' && !frm.doc.disabled){ + frm.add_custom_button('Schedule Script', function() { + var d = new frappe.ui.Dialog({ + title: "Schedule Script Execution", + fields: [ + { + fieldname: "event_type", + label: __('Select Event Type'), + fieldtype: "Select", + options: "All\nHourly\nDaily\nWeekly\nMonthly\nYearly\nHourly Long\nDaily Long\nWeekly Long\nMonthly Long" + }, + ], + primary_action_label: __('Schedule Script'), + primary_action: () => { + d.get_primary_btn().attr('disabled', true); + var data = d.get_values(); + d.hide(); + if(data) { + frm.events.schedule_script(frm, data); + } + + } + }); + + d.show(); + + }); + } + }, + + schedule_script(frm, data){ + frm.call({ + method: "frappe.core.doctype.server_script.server_script.setup_scheduler_events", + args: { + 'script_name': frm.doc.name, + 'frequency': data.event_type + } + }) + } - // } }); diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index aeed982162..bef3dfc60c 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -11,7 +11,6 @@ "column_break_3", "reference_doctype", "doctype_event", - "scheduler_event", "api_method", "allow_guest", "section_break_8", @@ -48,7 +47,7 @@ "options": "Before Insert\nBefore Save\nAfter Save\nBefore Submit\nAfter Submit\nBefore Cancel\nAfter Cancel\nBefore Delete\nAfter Delete\nBefore Save (Submitted Document)\nAfter Save (Submitted Document)" }, { - "depends_on": "eval:doc.script_type==='API' || doc.script_type==='Scheduler Event'", + "depends_on": "eval:doc.script_type==='API'", "fieldname": "api_method", "fieldtype": "Data", "label": "API Method" @@ -73,17 +72,10 @@ { "fieldname": "section_break_8", "fieldtype": "Section Break" - }, - { - "depends_on": "eval:doc.script_type==='Scheduler Event'", - "fieldname": "scheduler_event", - "fieldtype": "Select", - "label": "Scheduler Event", - "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual" } ], "links": [], - "modified": "2020-04-03 16:33:08.765621", + "modified": "2020-04-06 11:24:38.161555", "modified_by": "Administrator", "module": "Core", "name": "Server Script", diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index c651da2269..9522b77b4b 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -7,6 +7,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe.utils.safe_exec import safe_exec +from frappe import _ class ServerScript(Document): @@ -16,7 +17,6 @@ class ServerScript(Document): @staticmethod def on_update(): - setup_scheduler_events() frappe.cache().delete_value('server_script_map') def execute_method(self): @@ -40,16 +40,32 @@ class ServerScript(Document): # wrong report type! raise frappe.DoesNotExistError -def setup_scheduler_events(): - enabled_server_scripts = frappe.get_all('Server Script', - fields=('name', 'doctype_event','api_method', 'scheduler_event'), - filters={'disabled': 0, 'script_type': 'Scheduler Event'}) +@frappe.whitelist() +def setup_scheduler_events(script_name, frequency): + method = frappe.scrub(script_name) + '_' + frequency.lower() + scheduled_script = frappe.db.get_value('Scheduled Job Type', + dict(method=method)) - for script in enabled_server_scripts: - if not frappe.db.exists('Scheduled Job Type', dict(method=script.api_method)): - frappe.get_doc(dict( - doctype = 'Scheduled Job Type', - method = script.api_method, - frequency = script.scheduler_event, - has_server_script=1 - )).insert() \ No newline at end of file + if not scheduled_script: + doc = frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = method, + frequency = frequency, + server_script = script_name + )) + + doc.insert() + + frappe.msgprint(_('Enabled scheduled execution for script {0}').format(script_name)) + + else: + doc = frappe.get_doc('Scheduled Job Type', scheduled_script) + doc.update(dict( + doctype = 'Scheduled Job Type', + method = method, + frequency = frequency, + server_script = script_name + )) + doc.save() + + frappe.msgprint(_('Scheduled execution for script {0} has updated').format(script_name)) From 24a8b036393c6aa71db16cb0fccf17064505c403 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Wed, 8 Apr 2020 20:27:38 +0530 Subject: [PATCH 05/49] chore: improve error message on delete --- frappe/model/delete_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index d77898020d..b6db154bd4 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -210,7 +210,7 @@ def check_permission_and_not_submitted(doc): # check if submitted if doc.docstatus == 1: - frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted.").format(_(doc.doctype), doc.name), + frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted. You must Cancel it first.").format(_(doc.doctype), doc.name), raise_exception=True) def check_if_doc_is_linked(doc, method="Delete"): From 5cc11910adced726619a81a4b3824aa298a8beb3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 10 Apr 2020 13:34:38 +0530 Subject: [PATCH 06/49] fix: return Job object on frappe.enqueue_doc --- frappe/utils/background_jobs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index 03f063e058..4b37e850f0 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -73,7 +73,7 @@ def enqueue(method, queue='default', timeout=None, event=None, def enqueue_doc(doctype, name=None, method=None, queue='default', timeout=300, now=False, **kwargs): '''Enqueue a method to be run on a document''' - enqueue('frappe.utils.background_jobs.run_doc_method', doctype=doctype, name=name, + return enqueue('frappe.utils.background_jobs.run_doc_method', doctype=doctype, name=name, doc_method=method, queue=queue, timeout=timeout, now=now, **kwargs) def run_doc_method(doctype, name, doc_method, **kwargs): From 0a0045e9cc7cddcc77da1f8b7a42b4dd5d0c3e4e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 10 Apr 2020 13:38:28 +0530 Subject: [PATCH 07/49] chore: raise exception via frappe.msgprint --- frappe/core/doctype/file/file.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 6633884bb3..485885ec24 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -608,8 +608,7 @@ def get_local_image(file_url): try: image = Image.open(file_path) except IOError: - frappe.msgprint(_("Unable to read file format for {0}").format(file_url)) - raise + frappe.msgprint(_("Unable to read file format for {0}").format(file_url), raise_exception=True) content = None From 275a678bd658b75bd3a5f7e3b68722d58bce0533 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 13 Apr 2020 11:42:02 +0530 Subject: [PATCH 08/49] fix: site cleanup in case of errors on new-site Added _new_site_cleanup to handle exceptions raised in case of interuppted install of Frappe site. Deletes folders after calling _drop_site --- frappe/commands/site.py | 61 +++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index fd43cc8cf3..055d4317a5 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -1,13 +1,25 @@ -from __future__ import unicode_literals, absolute_import, print_function +# imports - standard imports +import atexit +import compileall +import hashlib +import os +import re +import shutil +import sys + +# imports - third party imports import click -import hashlib, os, sys, compileall, re +from pymysql.err import OperationalError +from six import text_type + +# imports - module imports import frappe from frappe import _ -from frappe.commands import pass_context, get_site +from frappe.commands import get_site, pass_context from frappe.commands.scheduler import _is_scheduler_enabled from frappe.installer import update_site_config -from frappe.utils import touch_file, get_site_path -from six import text_type +from frappe.utils import get_site_path, touch_file + @click.command('new-site') @click.argument('site') @@ -68,32 +80,33 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N make_site_dirs() - installing = None - try: - installing = touch_file(get_site_path('locks', 'installing.lock')) + installing = touch_file(get_site_path('locks', 'installing.lock')) + atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password) - install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, - db_name=db_name, admin_password=admin_password, verbose=verbose, - source_sql=source_sql, force=force, reinstall=reinstall, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) + install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, + db_name=db_name, admin_password=admin_password, verbose=verbose, + source_sql=source_sql, force=force, reinstall=reinstall, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) + apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) + for app in apps_to_install: + _install_app(app, verbose=verbose, set_as_patched=not source_sql) - apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) - for app in apps_to_install: - _install_app(app, verbose=verbose, set_as_patched=not source_sql) + os.remove(installing) - frappe.utils.scheduler.toggle_scheduler(enable_scheduler) - frappe.db.commit() + frappe.utils.scheduler.toggle_scheduler(enable_scheduler) + frappe.db.commit() - scheduler_status = "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled" - print("*** Scheduler is", scheduler_status, "***") + scheduler_status = "disabled" if frappe.utils.scheduler.is_scheduler_disabled() else "enabled" + print("*** Scheduler is", scheduler_status, "***") - except frappe.exceptions.ImproperDBConfigurationError: - _drop_site(site, mariadb_root_username, mariadb_root_password, force=True) +def _new_site_cleanup(site, mariadb_root_username, mariadb_root_password): + installing = get_site_path('locks', 'installing.lock') - finally: - if installing and os.path.exists(installing): - os.remove(installing) + if installing and os.path.exists(installing): + if mariadb_root_password: + _drop_site(site, mariadb_root_username, mariadb_root_password, force=True) + shutil.rmtree(site) - frappe.destroy() + frappe.destroy() @click.command('restore') @click.argument('sql-file-path') From 41c6c09fb9e157df5b867a42d3f5926f9437e736 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 13 Apr 2020 12:05:46 +0530 Subject: [PATCH 09/49] feat: handle failed cases in publish_realtime --- frappe/public/js/frappe/form/dashboard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index c4c739dbcc..3b6ccd9a5c 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -125,8 +125,9 @@ frappe.ui.form.Dashboard = Class.extend({ }, format_percent: function(title, percent) { - var width = cint(percent) < 1 ? 1 : cint(percent); - var progress_class = "progress-bar-success"; + const percentage = cint(percent); + const width = percentage < 0 ? 100 : percentage; + const progress_class = percentage < 0 ? "progress-bar-danger" : "progress-bar-success"; return [{ title: title, From 30e0fa7561b9d21caff689fedbd943e7dd8f33c6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 13 Apr 2020 12:21:31 +0530 Subject: [PATCH 10/49] style: remove unused imports --- frappe/commands/site.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 055d4317a5..540f250918 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -9,8 +9,6 @@ import sys # imports - third party imports import click -from pymysql.err import OperationalError -from six import text_type # imports - module imports import frappe From b0e236badd319bd247c1e215cdee53d38aafb5cb Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 13 Apr 2020 18:07:08 +0530 Subject: [PATCH 11/49] workflow for github actions to check translation formats --- .../workflows/check_translation_format.yml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/check_translation_format.yml diff --git a/.github/workflows/check_translation_format.yml b/.github/workflows/check_translation_format.yml new file mode 100644 index 0000000000..e5d2031182 --- /dev/null +++ b/.github/workflows/check_translation_format.yml @@ -0,0 +1,42 @@ +name: Check format +on: + pull_request: + branches: + - master + - develop +jobs: + check_translation: + name: Check format + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v2 + - name: Setup python3 + uses: actions/setup-python@v1 + with: + python-version: 3.6 + - name: Run check_translation for pull_request + run: | + import os + import subprocess + import re + errors_encounter = 0 + pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") + temp = re.compile(r"_\(([\"']{,3})") + subprocess.run('git fetch origin '+os.environ['GITHUB_BASE_REF']+ ' :' +os.environ['GITHUB_BASE_REF']+ ' -q', shell=True) + files = subprocess.check_output('git diff --name-only '+os.environ['GITHUB_BASE_REF'], shell=True) + files = files.decode('utf-8') + files = files.split() + for file in files: + with open(file, 'r') as f: + for num, line in enumerate(f, 1): + all_matches = temp.finditer(line) + if all_matches: + for match in all_matches: + verify = pattern.search(line) + if not verify: + errors_encounter += 1 + print(num) + print(line) + if errors_encounter > 0 : + assert 1+1 == 3 + shell: python \ No newline at end of file From e6ff382d14af27140e13ea5014bb60e4cca5f65d Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 13 Apr 2020 18:39:14 +0530 Subject: [PATCH 12/49] printing proper error message --- .github/workflows/check_translation_format.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check_translation_format.yml b/.github/workflows/check_translation_format.yml index e5d2031182..6b8ba91e99 100644 --- a/.github/workflows/check_translation_format.yml +++ b/.github/workflows/check_translation_format.yml @@ -1,4 +1,4 @@ -name: Check format +name: frappe_linter on: pull_request: branches: @@ -35,8 +35,9 @@ jobs: verify = pattern.search(line) if not verify: errors_encounter += 1 - print(num) - print(line) + print('A syntax error has been discovered at line number: ' + num) + print('Syntax error occured with: ' + line) if errors_encounter > 0 : + print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') assert 1+1 == 3 shell: python \ No newline at end of file From fe1dd4d88c9c2e538dd95b3fa16d416ac3890390 Mon Sep 17 00:00:00 2001 From: Afshan Date: Mon, 13 Apr 2020 18:40:44 +0530 Subject: [PATCH 13/49] renamed .yml file --- .../{check_translation_format.yml => translation_linter.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{check_translation_format.yml => translation_linter.yml} (100%) diff --git a/.github/workflows/check_translation_format.yml b/.github/workflows/translation_linter.yml similarity index 100% rename from .github/workflows/check_translation_format.yml rename to .github/workflows/translation_linter.yml From 821934db3d715d5f7415e97b38b8fa9247c36382 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 14 Apr 2020 12:27:26 +0530 Subject: [PATCH 14/49] feat: enable customizations for hidden sections --- frappe/public/js/frappe/views/desktop/desktop.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/desktop/desktop.js b/frappe/public/js/frappe/views/desktop/desktop.js index 12d33affa7..9f0df6e172 100644 --- a/frappe/public/js/frappe/views/desktop/desktop.js +++ b/frappe/public/js/frappe/views/desktop/desktop.js @@ -203,8 +203,8 @@ class DesktopPage { this.allow_customization && this.make_customization_link(); let create_shortcuts_and_cards = () => { - this.data.shortcuts.items.length && this.make_shortcuts(); - this.data.cards.items.length && this.make_cards(); + this.make_shortcuts(); + this.make_cards(); if (this.allow_customization) { // Move the widget group up to align with labels if customization is allowed @@ -212,7 +212,7 @@ class DesktopPage { } }; - if (!this.sections["onboarding"] && this.data.charts.items.length) { + if (!this.sections["onboarding"]) { this.make_charts().then(() => { create_shortcuts_and_cards(); }); From a9a7474bec32542a4f68a2a187e61dd61a1bdfc5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 10 Apr 2020 18:46:57 +0530 Subject: [PATCH 15/49] fix: allow allow_on_submit to be set in customize form if docfield value is set (cherry picked from commit 57a3463cde4ee29dcdfac8daa664025fe3dd3662) --- frappe/custom/doctype/customize_form/customize_form.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 68848d26f6..ab005bd428 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -208,9 +208,11 @@ class CustomizeForm(Document): self.validate_fieldtype_change(df, meta_df[0].get(property), df.get(property)) elif property == "allow_on_submit" and df.get(property): - frappe.msgprint(_("Row {0}: Not allowed to enable Allow on Submit for standard fields")\ - .format(df.idx)) - continue + if not frappe.db.get_value("DocField", + {"parent": self.doc_type, "fieldname": df.fieldname}, "allow_on_submit"): + frappe.msgprint(_("Row {0}: Not allowed to enable Allow on Submit for standard fields")\ + .format(df.idx)) + continue elif property == "reqd" and \ ((frappe.db.get_value("DocField", From 724983704679ee1a3cee762de1b8fde78e6c7cfb Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 15 Apr 2020 13:23:36 +0530 Subject: [PATCH 16/49] fix: ignore fieldtype check validation if new field type has unspecified maxlength --- frappe/custom/doctype/customize_form/customize_form.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 68848d26f6..2524650d94 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -369,7 +369,12 @@ class CustomizeForm(Document): for allowed_changes in allowed_fieldtype_change: if (old_value in allowed_changes and new_value in allowed_changes): allowed = True - if frappe.db.type_map.get(old_value)[1] > frappe.db.type_map.get(new_value)[1]: + old_value_length = cint(frappe.db.type_map.get(old_value)[1]) + new_value_length = cint(frappe.db.type_map.get(new_value)[1]) + + # Ignore fieldtype check validation if new field type has unspecified maxlength + # Changes like DATA to TEXT, where new_value_lenth equals 0 will not be validated + if new_value_length and (old_value_length > new_value_length): self.check_length_for_fieldtypes.append({'df': df, 'old_value': old_value}) self.validate_fieldtype_length() else: @@ -381,7 +386,7 @@ class CustomizeForm(Document): def validate_fieldtype_length(self): for field in self.check_length_for_fieldtypes: df = field.get('df') - max_length = frappe.db.type_map.get(df.fieldtype)[1] + max_length = cint(frappe.db.type_map.get(df.fieldtype)[1]) fieldname = df.fieldname docs = frappe.db.sql(''' SELECT name, {fieldname}, LENGTH({fieldname}) AS len From 7696f11e3ce03e3442a1a54dc5046ff9d283998b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 15 Apr 2020 13:24:01 +0530 Subject: [PATCH 17/49] feat: update test to check DATA to Text change --- frappe/tests/test_db_update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_db_update.py b/frappe/tests/test_db_update.py index 34378de3af..f243aa268f 100644 --- a/frappe/tests/test_db_update.py +++ b/frappe/tests/test_db_update.py @@ -11,6 +11,7 @@ class TestDBUpdate(unittest.TestCase): frappe.reload_doctype('User', force=True) frappe.model.meta.trim_tables('User') make_property_setter(doctype, 'bio', 'fieldtype', 'Text', 'Data') + make_property_setter(doctype, 'middle_name', 'fieldtype', 'Data', 'Text') make_property_setter(doctype, 'enabled', 'default', '1', 'Int') frappe.db.updatedb(doctype) From 9b9bbd8cef77204f45bcab1a5e60318dd9350948 Mon Sep 17 00:00:00 2001 From: Rohan Date: Wed, 15 Apr 2020 14:08:52 +0530 Subject: [PATCH 18/49] format: fix whitespace Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/scss/website.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index 9901eb7fbf..6f82e25ee0 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -10,8 +10,8 @@ html { body { min-height: 100%; - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; font-size: 16px; > div { From a5daf8ffa146d72a65082a1863f43d4abc99237d Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 15 Apr 2020 19:34:12 +0530 Subject: [PATCH 19/49] fix: check if field is a default field before getting df (#9953) --- frappe/model/base_document.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 13b2b61bef..9ab1ef7799 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -506,9 +506,13 @@ class BaseDocument(object): fetch_from_fieldname = _df.fetch_from.split('.')[-1] value = values[fetch_from_fieldname] if _df.fieldtype == 'Small Text' or _df.fieldtype == 'Text' or _df.fieldtype == 'Data': - fetch_from_df = frappe.get_meta(doctype).get_field(fetch_from_fieldname) - fetch_from_ft = fetch_from_df.get('fieldtype') + if fetch_from_fieldname in default_fields: + from frappe.model.meta import get_default_df + fetch_from_df = get_default_df(fetch_from_fieldname) + else: + fetch_from_df = frappe.get_meta(doctype).get_field(fetch_from_fieldname) + fetch_from_ft = fetch_from_df.get('fieldtype') if fetch_from_ft == 'Text Editor' and value: value = unescape_html(strip_html(value)) setattr(self, _df.fieldname, value) From e323441c1538b5e9bcfa964acefbd5d14524c462 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 17 Mar 2020 17:12:10 +0530 Subject: [PATCH 20/49] feat: Add Web View to compose webpages with components --- frappe/core/doctype/doctype/doctype.py | 4 +- frappe/utils/jinja.py | 15 +- frappe/website/doctype/css_class/__init__.py | 0 frappe/website/doctype/css_class/css_class.js | 8 + .../website/doctype/css_class/css_class.json | 60 ++++++ frappe/website/doctype/css_class/css_class.py | 10 + .../doctype/css_class/test_css_class.py | 10 + frappe/website/doctype/web_view/__init__.py | 0 .../doctype/web_view/templates/web_view.html | 65 +++++++ .../web_view/templates/web_view_row.html | 4 + .../website/doctype/web_view/test_web_view.py | 10 + frappe/website/doctype/web_view/web_view.js | 8 + frappe/website/doctype/web_view/web_view.json | 89 +++++++++ frappe/website/doctype/web_view/web_view.py | 59 ++++++ .../website/doctype/web_view_item/__init__.py | 0 .../doctype/web_view_item/web_view_item.json | 115 +++++++++++ .../doctype/web_view_item/web_view_item.py | 10 + .../doctype/website_theme/website_theme.js | 178 ------------------ .../doctype/website_theme/website_theme.json | 72 ++++++- .../doctype/website_theme/website_theme.py | 19 +- .../website_theme/website_theme_template.scss | 23 +++ 21 files changed, 568 insertions(+), 191 deletions(-) create mode 100644 frappe/website/doctype/css_class/__init__.py create mode 100644 frappe/website/doctype/css_class/css_class.js create mode 100644 frappe/website/doctype/css_class/css_class.json create mode 100644 frappe/website/doctype/css_class/css_class.py create mode 100644 frappe/website/doctype/css_class/test_css_class.py create mode 100644 frappe/website/doctype/web_view/__init__.py create mode 100644 frappe/website/doctype/web_view/templates/web_view.html create mode 100644 frappe/website/doctype/web_view/templates/web_view_row.html create mode 100644 frappe/website/doctype/web_view/test_web_view.py create mode 100644 frappe/website/doctype/web_view/web_view.js create mode 100644 frappe/website/doctype/web_view/web_view.json create mode 100644 frappe/website/doctype/web_view/web_view.py create mode 100644 frappe/website/doctype/web_view_item/__init__.py create mode 100644 frappe/website/doctype/web_view_item/web_view_item.json create mode 100644 frappe/website/doctype/web_view_item/web_view_item.py create mode 100644 frappe/website/doctype/website_theme/website_theme_template.scss diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index f970f51419..f7c9cbe28a 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -206,7 +206,7 @@ class DocType(Document): if d.fieldtype: if (not getattr(d, "fieldname", None)): if d.label: - d.fieldname = d.label.strip().lower().replace(' ','_') + d.fieldname = d.label.strip().lower().replace(' ','_').strip('?') if d.fieldname in restricted: d.fieldname = d.fieldname + '1' if d.fieldtype=='Section Break': @@ -914,7 +914,7 @@ def validate_fields(meta): if not d.permlevel: d.permlevel = 0 if d.fieldtype not in table_fields: d.allow_bulk_edit = 0 if not d.fieldname: - d.fieldname = d.fieldname.lower() + d.fieldname = d.fieldname.lower().strip('?') check_illegal_characters(d.fieldname) check_invalid_fieldnames(meta.get("name"), d.fieldname) diff --git a/frappe/utils/jinja.py b/frappe/utils/jinja.py index 7c3b9b0482..bc26490422 100644 --- a/frappe/utils/jinja.py +++ b/frappe/utils/jinja.py @@ -68,10 +68,7 @@ def render_template(template, context, is_path=None, safe_render=True): if not template: return "" - # if it ends with .html then its a freaking path, not html - if (is_path - or template.startswith("templates/") - or (template.endswith('.html') and '\n' not in template)): + if (is_path or guess_is_path(template)): return get_jenv().get_template(template).render(context) else: if safe_render and ".__" in template: @@ -81,6 +78,16 @@ def render_template(template, context, is_path=None, safe_render=True): except TemplateError: throw(title="Jinja Template Error", msg="
{template}
{tb}
".format(template=template, tb=get_traceback())) +def guess_is_path(template): + # template can be passed as a path or content + # if its single line and ends with a html, then its probably a path + if not '\n' in template and '.' in template: + extn = template.rsplit('.')[-1] + if extn in ('html', 'css', 'scss', 'py'): + return True + + return False + def get_jloader(): import frappe diff --git a/frappe/website/doctype/css_class/__init__.py b/frappe/website/doctype/css_class/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/css_class/css_class.js b/frappe/website/doctype/css_class/css_class.js new file mode 100644 index 0000000000..4544e249bf --- /dev/null +++ b/frappe/website/doctype/css_class/css_class.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('CSS Class', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/website/doctype/css_class/css_class.json b/frappe/website/doctype/css_class/css_class.json new file mode 100644 index 0000000000..2a7e1e010e --- /dev/null +++ b/frappe/website/doctype/css_class/css_class.json @@ -0,0 +1,60 @@ +{ + "actions": [], + "allow_import": 1, + "allow_rename": 1, + "autoname": "Prompt", + "creation": "2020-03-17 15:03:31.431344", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "is_global", + "is_dynamic", + "css" + ], + "fields": [ + { + "default": "0", + "fieldname": "is_global", + "fieldtype": "Check", + "label": "Is Global?" + }, + { + "fieldname": "css", + "fieldtype": "Code", + "in_list_view": 1, + "label": "CSS", + "reqd": 1 + }, + { + "default": "0", + "description": "Website Theme elements are accessible as Jinja variables. Example: \"{{ primary_color }}\"", + "fieldname": "is_dynamic", + "fieldtype": "Check", + "label": "Is Dynamic?" + } + ], + "links": [], + "modified": "2020-03-17 17:01:14.874631", + "modified_by": "Administrator", + "module": "Website", + "name": "CSS Class", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Website Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/css_class/css_class.py b/frappe/website/doctype/css_class/css_class.py new file mode 100644 index 0000000000..cb9e7483d4 --- /dev/null +++ b/frappe/website/doctype/css_class/css_class.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class CSSClass(Document): + pass diff --git a/frappe/website/doctype/css_class/test_css_class.py b/frappe/website/doctype/css_class/test_css_class.py new file mode 100644 index 0000000000..551b44e3f2 --- /dev/null +++ b/frappe/website/doctype/css_class/test_css_class.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 TestCSSClass(unittest.TestCase): + pass diff --git a/frappe/website/doctype/web_view/__init__.py b/frappe/website/doctype/web_view/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_view/templates/web_view.html b/frappe/website/doctype/web_view/templates/web_view.html new file mode 100644 index 0000000000..8515432f5b --- /dev/null +++ b/frappe/website/doctype/web_view/templates/web_view.html @@ -0,0 +1,65 @@ +{% extends "templates/web.html" %} + +{% block page_content %} + +{% if css_rules or css %} + +{% endif %} + +{% macro render_element(element) %} + {% if element.element_type=='Content' %} + {{ element.web_content_html }} + {% elif element.element_type=='Image' %} + + {% endif %} +{% endmacro %} + + +{% for section in sections %} +
+
+ {% if section.section_intro %} +
{{ section.section_intro }}
+ {% endif %} + {% if section.section_type == 'List' %} + {% for element in section.elements %} + {{ render_element(element) }} + {% endfor %} + {% elif section.section_type == 'Grid' %} +
+ {% for element in section.elements %} +
+ {{ render_element(element) }} +
+ {% endfor %} +
+ {% elif section.section_type == 'Tabbed' %} + +
+ {% for element in section.elements %} +
+ {{ render_element(element) }} +
+ {% endfor %} +
+ + {% endif %} +
+
+{% endfor %} +{% endblock %} + + \ No newline at end of file diff --git a/frappe/website/doctype/web_view/templates/web_view_row.html b/frappe/website/doctype/web_view/templates/web_view_row.html new file mode 100644 index 0000000000..2b999819cb --- /dev/null +++ b/frappe/website/doctype/web_view/templates/web_view_row.html @@ -0,0 +1,4 @@ + + \ No newline at end of file diff --git a/frappe/website/doctype/web_view/test_web_view.py b/frappe/website/doctype/web_view/test_web_view.py new file mode 100644 index 0000000000..70dc1ca906 --- /dev/null +++ b/frappe/website/doctype/web_view/test_web_view.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 TestWebView(unittest.TestCase): + pass diff --git a/frappe/website/doctype/web_view/web_view.js b/frappe/website/doctype/web_view/web_view.js new file mode 100644 index 0000000000..449c0949b6 --- /dev/null +++ b/frappe/website/doctype/web_view/web_view.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Web View', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json new file mode 100644 index 0000000000..964cc1fbae --- /dev/null +++ b/frappe/website/doctype/web_view/web_view.json @@ -0,0 +1,89 @@ +{ + "actions": [], + "allow_guest_to_view": 1, + "allow_import": 1, + "allow_rename": 1, + "autoname": "field:title", + "creation": "2020-03-16 15:28:03.828741", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "route", + "published", + "items", + "css" + ], + "fields": [ + { + "fieldname": "items", + "fieldtype": "Table", + "label": "Items", + "options": "Web View Item", + "reqd": 1 + }, + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "reqd": 1, + "unique": 1 + }, + { + "fieldname": "route", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Route", + "reqd": 1 + }, + { + "default": "0", + "fieldname": "published", + "fieldtype": "Check", + "label": "Published" + }, + { + "fieldname": "css", + "fieldtype": "Code", + "label": "CSS" + } + ], + "has_web_view": 1, + "links": [], + "modified": "2020-03-16 18:06:47.024221", + "modified_by": "Administrator", + "module": "Website", + "name": "Web View", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Website Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "creation", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py new file mode 100644 index 0000000000..7c8c9d76eb --- /dev/null +++ b/frappe/website/doctype/web_view/web_view.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.website.website_generator import WebsiteGenerator +from frappe.utils import markdown +import frappe + +class WebView(WebsiteGenerator): + def get_context(self, context): + # group items into sections + context.sections = [] + context.css_rules = [] + for item in self.items: + if not context.sections and item.element_type!='Section': + self.add_default_section(context) + + if item.element_type=='Section': + item.elements = [] + context.sections.append(item) + + if item.section_intro: + item.section_intro = markdown(item.section_intro) + + else: + if item.hide: + continue + + if item.web_content_type == 'Markdown': + item.web_content_html = markdown(item.web_content_markdown) + + if item.title: + item.element_id = frappe.scrub(item.title) + + context.sections[-1].elements.append(item) + + if item.element_class: + css, is_dynamic = frappe.db.get_value('CSS Class', item.element_class, ['css', 'is_dynamic']) + if is_dynamic: + css = frappe.render_template(css, self.get_theme()) + context.css_rules.append(css) + + def get_theme(self): + # get theme properties + if not hasattr(self, '_theme'): + default_theme = frappe.db.get_value("Website Settings", "Website Settings", "website_theme") + self._theme = frappe.get_value('Website Theme', default_theme, '*') + return self._theme + + def add_default_section(self, context): + # add a default section if not added + context.section.append(dict( + element_type='Section', + section_type='List', + title='Default Section', + elements=[] + )) diff --git a/frappe/website/doctype/web_view_item/__init__.py b/frappe/website/doctype/web_view_item/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_view_item/web_view_item.json b/frappe/website/doctype/web_view_item/web_view_item.json new file mode 100644 index 0000000000..7be1c35415 --- /dev/null +++ b/frappe/website/doctype/web_view_item/web_view_item.json @@ -0,0 +1,115 @@ +{ + "actions": [], + "creation": "2020-03-16 15:25:17.530296", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "element_type", + "title", + "hide", + "column_break_3", + "columns", + "element_class", + "section_break_5", + "section_type", + "web_content_type", + "web_content_html", + "web_content_markdown", + "image_url", + "section_intro" + ], + "fields": [ + { + "fieldname": "element_type", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Element Type", + "options": "Section\nContent\nHero\nParagraph\nImage\nQuote", + "reqd": 1 + }, + { + "depends_on": "eval:doc.element_type==='Section'", + "fieldname": "section_type", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Section Type", + "options": "\nList\nTabbed\nGrid" + }, + { + "depends_on": "eval:doc.element_type==='Content'", + "fieldname": "web_content_type", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Web Content Type", + "options": "\nHTML\nMarkdown" + }, + { + "depends_on": "eval:doc.web_content_type==='HTML'", + "fieldname": "web_content_html", + "fieldtype": "HTML Editor", + "label": "Web Content HTML" + }, + { + "depends_on": "eval:doc.web_content_type==='Markdown'", + "fieldname": "web_content_markdown", + "fieldtype": "Markdown Editor", + "label": "Web Content Markdown" + }, + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title" + }, + { + "fieldname": "columns", + "fieldtype": "Int", + "label": "Columns" + }, + { + "fieldname": "element_class", + "fieldtype": "Link", + "label": "Element Class", + "options": "CSS Class" + }, + { + "fieldname": "section_break_5", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, + { + "depends_on": "eval:doc.element_type==='Image'", + "fieldname": "image_url", + "fieldtype": "Small Text", + "label": "Image URL" + }, + { + "depends_on": "eval:doc.element_type==='Section'", + "fieldname": "section_intro", + "fieldtype": "Markdown Editor", + "label": "Section Intro" + }, + { + "default": "0", + "fieldname": "hide", + "fieldtype": "Check", + "label": "Hide" + } + ], + "istable": 1, + "links": [], + "modified": "2020-03-17 17:06:37.157763", + "modified_by": "Administrator", + "module": "Website", + "name": "Web View Item", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_view_item/web_view_item.py b/frappe/website/doctype/web_view_item/web_view_item.py new file mode 100644 index 0000000000..cc440305c0 --- /dev/null +++ b/frappe/website/doctype/web_view_item/web_view_item.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class WebViewItem(Document): + pass diff --git a/frappe/website/doctype/website_theme/website_theme.js b/frappe/website/doctype/website_theme/website_theme.js index b39bd5defe..75ecbe15e3 100644 --- a/frappe/website/doctype/website_theme/website_theme.js +++ b/frappe/website/doctype/website_theme/website_theme.js @@ -6,7 +6,6 @@ frappe.ui.form.on('Website Theme', { frm.clear_custom_buttons(); frm.toggle_display(["module", "custom"], !frappe.boot.developer_mode); - frm.trigger('setup_configure_theme'); frm.trigger('set_default_theme_button_and_indicator'); if (!frm.doc.custom && !frappe.boot.developer_mode) { @@ -17,96 +16,6 @@ frappe.ui.form.on('Website Theme', { } }, - setup_configure_theme(frm) { - frm.add_custom_button(__('Configure Theme'), () => { - const d = new frappe.ui.Dialog({ - title: __('Configure Theme'), - fields: [ - { - label: __('Font Styles'), - fieldtype: 'Section Break' - }, - { - label: __('Google Font'), - fieldtype: 'Data', - fieldname: 'google_font', - description: __('Add the name of a "Google Web Font" e.g. "Open Sans"') - }, - { - label: __('Font Size (px)'), - fieldtype: 'Int', - fieldname: 'font_size', - default: 16 - }, - { - label: __('Theme Colors'), - fieldtype: 'Section Break', - }, - { - label: __('Primary Color'), - fieldtype: 'Color', - fieldname: 'primary_color' - }, - { - label: __('Dark Color'), - fieldtype: 'Color', - fieldname: 'dark_color' - }, - { - label: __('Text Color'), - fieldtype: 'Color', - fieldname: 'text_color' - }, - { - label: __('Background Color'), - fieldtype: 'Color', - fieldname: 'background_color' - }, - { - label: __('Misc'), - fieldtype: 'Section Break', - }, - { - label: __('Navbar Style'), - fieldtype: 'Select', - fieldname: 'navbar_style', - options: [ - 'Light', - 'Dark' - ], - default: 'Light' - }, - { - label: __('Enable Shadows'), - fieldtype: 'Check', - fieldname: 'enable_shadows' - }, - { - label: __('Enable Gradients'), - fieldtype: 'Check', - fieldname: 'enable_gradients' - }, - { - label: __('Rounded Corners'), - fieldtype: 'Check', - fieldname: 'enable_rounded', - default: 1 - }, - ], - primary_action: (values) => { - frm.set_value('theme_json', JSON.stringify(values)); - frm.events.set_theme_from_config(frm, values); - d.hide(); - } - }); - - if (frm.doc.theme_json) { - d.set_values(JSON.parse(frm.doc.theme_json)); - } - d.show(); - }); - }, - set_default_theme_button_and_indicator(frm) { frappe.db.get_single_value('Website Settings', 'website_theme') .then(value => { @@ -122,92 +31,5 @@ frappe.ui.form.on('Website Theme', { } } }); - }, - - set_theme_from_config(frm, config) { - const { - google_font, - font_size, - primary_color, - dark_color, - text_color, - background_color, - navbar_style, - enable_shadows, - enable_gradients, - enable_rounded - } = config; - - let scss_lines = []; - let js_lines = []; - if (google_font) { - const google_font_slug = google_font.split(' ').join('+'); - const font_family_default = `'-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif'`; - scss_lines.push( - `@import url('https://fonts.googleapis.com/css?family=${google_font_slug}:400,300,400italic,700&subset=latin,latin-ext');`, - `$font-family-sans-serif: "${google_font}", ${font_family_default};` - ); - } - if (primary_color) { - scss_lines.push( - `$primary: ${primary_color};` - ); - } - if (dark_color) { - scss_lines.push( - `$dark: ${dark_color};` - ); - } - if (text_color) { - scss_lines.push( - `$body-color: ${text_color};` - ); - } - if (background_color) { - scss_lines.push( - `$body-bg: ${background_color};` - ); - } - - scss_lines.push( - `$enable-shadows: ${Boolean(enable_shadows)};` - ); - - scss_lines.push( - `$enable-gradients: ${Boolean(enable_gradients)};` - ); - - scss_lines.push( - `$enable-rounded: ${Boolean(enable_rounded)};` - ); - - if (font_size) { - scss_lines.push( - '\n', - `body {\n\tfont-size: ${font_size}px;\n}` - ); - } - - if (navbar_style === 'Dark') { - if (!(frm.doc.js || '').includes(`.addClass('navbar-dark bg-dark')`)) { - js_lines.push( - `frappe.ready(() => {`, - `\t$('.navbar').removeClass('navbar-light bg-white').addClass('navbar-dark bg-dark')`, - `})` - ); - } - } - - scss_lines.push( - `@import "frappe/public/scss/website";`, - '\n' - ); - - // set scss - frm.set_value('theme_scss', scss_lines.join('\n')); - - // set js - const js = frm.doc.js || ''; - frm.set_value('js', js_lines.join('\n') + js); } }); diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index 0d59384f3c..63e70f9668 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_import": 1, "autoname": "field:theme", "creation": "2015-02-18 12:46:38.168929", @@ -9,7 +10,18 @@ "theme", "module", "custom", + "configuration_section", + "google_font", + "font_size", + "column_break_7", + "primary_color", + "text_color", + "light_color", + "dark_color", + "background_color", + "stylesheet_section", "theme_scss", + "custom_scss", "theme_json", "theme_url", "custom_js_section", @@ -43,7 +55,8 @@ "fieldname": "theme_scss", "fieldtype": "Code", "label": "Theme", - "options": "SCSS" + "options": "SCSS", + "read_only": 1 }, { "fieldname": "theme_url", @@ -68,9 +81,64 @@ "hidden": 1, "label": "Theme JSON", "options": "JSON" + }, + { + "fieldname": "configuration_section", + "fieldtype": "Section Break", + "label": "Configuration" + }, + { + "fieldname": "google_font", + "fieldtype": "Data", + "label": "Google Font" + }, + { + "fieldname": "font_size", + "fieldtype": "Data", + "label": "Font Size" + }, + { + "fieldname": "column_break_7", + "fieldtype": "Column Break" + }, + { + "fieldname": "primary_color", + "fieldtype": "Color", + "label": "Primary Color" + }, + { + "fieldname": "text_color", + "fieldtype": "Color", + "label": "Text Color" + }, + { + "fieldname": "dark_color", + "fieldtype": "Color", + "label": "Dark Color" + }, + { + "fieldname": "background_color", + "fieldtype": "Color", + "label": "Background Color" + }, + { + "fieldname": "stylesheet_section", + "fieldtype": "Section Break", + "label": "Stylesheet" + }, + { + "fieldname": "custom_scss", + "fieldtype": "Code", + "label": "Custom SCSS" + }, + { + "fieldname": "light_color", + "fieldtype": "Color", + "label": "Light Color" } ], - "modified": "2019-06-14 18:36:21.283390", + "links": [], + "modified": "2020-03-17 16:52:18.541152", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index f16fc90d79..9a20bab5f7 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -10,6 +10,7 @@ from os.path import join as join_path, exists as path_exists class WebsiteTheme(Document): def validate(self): self.validate_if_customizable() + self.render_theme() self.validate_theme() def on_update(self): @@ -35,12 +36,16 @@ class WebsiteTheme(Document): if self.is_standard_and_not_valid_user(): frappe.throw(_("Please Duplicate this Website Theme to customize.")) + def render_theme(self): + if self.google_font: + self.google_font = self.google_font.replace(' ', '+') + self.theme_scss = frappe.render_template('frappe/website/doctype/website_theme/website_theme_template.scss', self.as_dict()) + def validate_theme(self): '''Generate theme css if theme_scss has changed''' - if self.theme_scss: - doc_before_save = self.get_doc_before_save() - if doc_before_save is None or self.theme_scss != doc_before_save.theme_scss: - self.generate_bootstrap_theme() + doc_before_save = self.get_doc_before_save() + if doc_before_save is None or get_scss(self) != get_scss(doc_before_save): + self.generate_bootstrap_theme() def export_doc(self): """Export to standard folder `[module]/website_theme/[name]/[name].json`.""" @@ -59,7 +64,7 @@ class WebsiteTheme(Document): file_name = frappe.scrub(self.name) + '_' + frappe.generate_hash('Website Theme', 8) + '.css' output_path = join_path(frappe.utils.get_bench_path(), 'sites', 'assets', 'css', file_name) - content = self.theme_scss + content = get_scss(self) content = content.replace('\n', '\\n') command = ['node', 'generate_bootstrap_theme.js', output_path, content] @@ -116,3 +121,7 @@ def generate_theme_files_if_not_exist(): doc.save() except Exception: frappe.log_error(frappe.get_traceback(), "Theme File Generation Failed") + +def get_scss(doc): + return doc.theme_scss + '\n' + doc.custom_scss + diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss new file mode 100644 index 0000000000..6267eb531d --- /dev/null +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -0,0 +1,23 @@ +{% if google_font %} +@import url('https://fonts.googleapis.com/css?family={{ google_font }}:400,400italic,600&subset=latin,latin-ext'); +$font-family-sans-serif: "{{ google_font }}", '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif'; +{% endif %} + +{% if primary_color %}$primary: {{ primary_color }};{% endif %} +{% if dark_color %}$dark: {{ dark_color }};{% endif %} +{% if text_color %}$body-color: {{ text_color }};{% endif %} +{% if background_color %}$body-bg: {{ background_color }};{% endif %} + +$enable-shadows: {{ enable_shadows and "true" or "false" }}; +$enable-gradients: {{ enable_gradients and "true" or "false" }}; +$enable-rounded: {{ enable_rounded and "true" or "false" }}; + +@import "frappe/public/scss/website"; + +body { + {% if font_size %} + font-size: {{ font_size }}; + {% endif %} + font-smoothing: antialiased; + -webkit-font-smoothing: antialiased; +} From 0322ab198d3f1fbf63ee8427a30615ce50eaec0d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 18 Mar 2020 18:51:03 +0530 Subject: [PATCH 21/49] feat: make Web View embeddable and allow navbar and footer as Web Views --- frappe/templates/base.html | 12 +++- .../doctype/web_view/templates/web_view.html | 60 +----------------- .../web_view/templates/web_view_content.html | 62 +++++++++++++++++++ frappe/website/doctype/web_view/web_view.py | 51 +++++++++------ .../website_settings/test_website_settings.py | 10 +++ .../website_settings/website_settings.json | 38 ++++++++++++ .../website_settings/website_settings.py | 12 ++++ .../doctype/website_theme/website_theme.json | 9 ++- .../website_theme/website_theme_template.scss | 4 +- 9 files changed, 176 insertions(+), 82 deletions(-) create mode 100644 frappe/website/doctype/web_view/templates/web_view_content.html create mode 100644 frappe/website/doctype/website_settings/test_website_settings.py diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 1c5f286442..2a241c4843 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -62,7 +62,11 @@ {%- endblock -%} {%- block navbar -%} - {% include "templates/includes/navbar/navbar.html" %} + {%- if navbar_content -%} + {{ navbar_content }} + {%- else -%} + {% include "templates/includes/navbar/navbar.html" %} + {%- endif -%} {%- endblock -%} {% block content %} @@ -70,7 +74,11 @@ {% endblock %} {%- block footer -%} - {% include "templates/includes/footer/footer.html" %} + {%- if footer_content -%} + {{ footer_content }} + {%- else -%} + {% include "templates/includes/footer/footer.html" %} + {%- endif -%} {%- endblock -%} {% block base_scripts %} diff --git a/frappe/website/doctype/web_view/templates/web_view.html b/frappe/website/doctype/web_view/templates/web_view.html index 8515432f5b..bf993c05fb 100644 --- a/frappe/website/doctype/web_view/templates/web_view.html +++ b/frappe/website/doctype/web_view/templates/web_view.html @@ -1,65 +1,7 @@ {% extends "templates/web.html" %} {% block page_content %} - -{% if css_rules or css %} - -{% endif %} - -{% macro render_element(element) %} - {% if element.element_type=='Content' %} - {{ element.web_content_html }} - {% elif element.element_type=='Image' %} - - {% endif %} -{% endmacro %} - - -{% for section in sections %} -
-
- {% if section.section_intro %} -
{{ section.section_intro }}
- {% endif %} - {% if section.section_type == 'List' %} - {% for element in section.elements %} - {{ render_element(element) }} - {% endfor %} - {% elif section.section_type == 'Grid' %} -
- {% for element in section.elements %} -
- {{ render_element(element) }} -
- {% endfor %} -
- {% elif section.section_type == 'Tabbed' %} - -
- {% for element in section.elements %} -
- {{ render_element(element) }} -
- {% endfor %} -
- - {% endif %} -
-
-{% endfor %} + {% include "frappe/website/doctype/web_view/templates/web_view_content.html" %} {% endblock %} \ No newline at end of file diff --git a/frappe/website/doctype/web_view/templates/web_view_content.html b/frappe/website/doctype/web_view/templates/web_view_content.html new file mode 100644 index 0000000000..dd14e80d39 --- /dev/null +++ b/frappe/website/doctype/web_view/templates/web_view_content.html @@ -0,0 +1,62 @@ +{%- if css_rules or css -%} + + +{%- endif -%} + +{%- macro render_element(element) -%} + {%- if element.element_type=='Content' -%} + {{ element.web_content_html }} + {%- elif element.element_type=='Image' -%} + + {%- endif -%} +{%- endmacro -%} + +{%- for section in sections -%} +
+
+ {%- if section.section_intro -%} + +
{{ section.section_intro }}
+ {%- endif -%} + + {%- if section.section_type == 'List' -%} + {%- for element in section.elements -%} + {{ render_element(element) }} + {%- endfor -%} + + {%- elif section.section_type == 'Grid' -%} +
+ {%- for element in section.elements -%} +
+ {{ render_element(element) }} +
+ {%- endfor -%} +
+ + {%- elif section.section_type == 'Tabbed' -%} + +
+ {%- for element in section.elements -%} +
+ {{ render_element(element) }} +
+ {%- endfor -%} +
+ + {%- endif -%} +
+
+{%- endfor -%} \ No newline at end of file diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py index 7c8c9d76eb..92f564553c 100644 --- a/frappe/website/doctype/web_view/web_view.py +++ b/frappe/website/doctype/web_view/web_view.py @@ -18,29 +18,44 @@ class WebView(WebsiteGenerator): self.add_default_section(context) if item.element_type=='Section': - item.elements = [] - context.sections.append(item) - - if item.section_intro: - item.section_intro = markdown(item.section_intro) - + self.add_section(context, item) else: - if item.hide: - continue + self.add_item(context, item) - if item.web_content_type == 'Markdown': - item.web_content_html = markdown(item.web_content_markdown) + self.add_css_class(context, item) - if item.title: - item.element_id = frappe.scrub(item.title) + return context - context.sections[-1].elements.append(item) + def add_section(self, context, item): + item.elements = [] + context.sections.append(item) - if item.element_class: - css, is_dynamic = frappe.db.get_value('CSS Class', item.element_class, ['css', 'is_dynamic']) - if is_dynamic: - css = frappe.render_template(css, self.get_theme()) - context.css_rules.append(css) + if item.section_intro: + item.section_intro = markdown(item.section_intro) + + def add_item(self, context, item): + if item.hide: + return + + if item.web_content_type == 'Markdown': + item.web_content_html = markdown(item.web_content_markdown) + + if item.title: + item.element_id = frappe.scrub(item.title) + + context.sections[-1].elements.append(item) + + def add_css_class(self, context, item): + # add css class definitions selected by the user + if item.element_class and not item.hide: + css, is_dynamic = frappe.db.get_value('CSS Class', item.element_class, ['css', 'is_dynamic']) + if is_dynamic: + css = frappe.render_template(css, self.get_theme()) + context.css_rules.append(css) + + def render_content(self): + # webview can be rendered as an object (see footer) + return frappe.render_template("frappe/website/doctype/web_view/templates/web_view_content.html", self.get_context(self.as_dict())) def get_theme(self): # get theme properties diff --git a/frappe/website/doctype/website_settings/test_website_settings.py b/frappe/website/doctype/website_settings/test_website_settings.py new file mode 100644 index 0000000000..9eca957713 --- /dev/null +++ b/frappe/website/doctype/website_settings/test_website_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 TestWebsiteSettings(unittest.TestCase): + pass diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json index 39ffa2329f..a730f4746f 100644 --- a/frappe/website/doctype/website_settings/website_settings.json +++ b/frappe/website/doctype/website_settings/website_settings.json @@ -19,11 +19,15 @@ "set_banner_from_image", "favicon", "top_bar", + "top_bar_type", + "top_bar_web_view", "navbar_search", "top_bar_items", "banner", "banner_html", "footer", + "footer_type", + "footer_web_view", "copyright", "address", "footer_items", @@ -130,11 +134,13 @@ }, { "default": "0", + "depends_on": "eval:doc.top_bar_type==='Standard'", "fieldname": "navbar_search", "fieldtype": "Check", "label": "Include Search in Top Bar" }, { + "depends_on": "eval:doc.top_bar_type==='Standard'", "fieldname": "top_bar_items", "fieldtype": "Table", "label": "Top Bar Items", @@ -160,17 +166,20 @@ "label": "Footer" }, { + "depends_on": "eval:doc.footer_type==='Standard'", "fieldname": "copyright", "fieldtype": "Data", "label": "Copyright" }, { + "depends_on": "eval:doc.footer_type==='Standard'", "description": "Address and other legal information you may want to put in the footer.", "fieldname": "address", "fieldtype": "Text Editor", "label": "Address" }, { + "depends_on": "eval:doc.footer_type==='Standard'", "fieldname": "footer_items", "fieldtype": "Table", "label": "Footer Items", @@ -178,6 +187,7 @@ }, { "default": "0", + "depends_on": "eval:doc.footer_type==='Standard'", "fieldname": "hide_footer_signup", "fieldtype": "Check", "label": "Hide Footer Signup" @@ -319,6 +329,34 @@ "fieldname": "authorize_api_indexing_access", "fieldtype": "Button", "label": "Authorize API Indexing Access" + }, + { + "default": "Standard", + "fieldname": "footer_type", + "fieldtype": "Select", + "label": "Footer Type", + "options": "Standard\nWeb View" + }, + { + "depends_on": "eval:doc.footer_type==='Web View'", + "fieldname": "footer_web_view", + "fieldtype": "Link", + "label": "Footer Web View", + "options": "Web View" + }, + { + "default": "Standard", + "fieldname": "top_bar_type", + "fieldtype": "Select", + "label": "Top Bar Type", + "options": "Standard\nWeb View" + }, + { + "depends_on": "eval:doc.top_bar_type==='Web View'", + "fieldname": "top_bar_web_view", + "fieldtype": "Link", + "label": "Top Bar Web View", + "options": "Web View" } ], "icon": "fa fa-cog", diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index 4356b1aa82..49b93fae1d 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -149,6 +149,7 @@ def get_website_settings(): context[key] = context[key][-1] add_website_theme(context) + add_webviews(context, settings) if not context.get("favicon"): context["favicon"] = "/assets/frappe/images/favicon.png" @@ -158,6 +159,17 @@ def get_website_settings(): return context +def add_webviews(context, settings): + # render footer as webview, not standard view + # see base.html for how this is handled + if settings.footer_type=='Web View' and settings.footer_web_view: + context.footer_content = frappe.get_doc('Web View', + settings.footer_web_view).render_content() + + if settings.top_bar_type=='Web View' and settings.top_bar_web_view: + context.navbar_content = frappe.get_doc('Web View', + settings.top_bar_web_view).render_content() + def get_items(parentfield): all_top_items = frappe.db.sql("""\ select * from `tabTop Bar Item` diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index 63e70f9668..5704b97e0b 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -13,6 +13,7 @@ "configuration_section", "google_font", "font_size", + "font_properties", "column_break_7", "primary_color", "text_color", @@ -135,10 +136,16 @@ "fieldname": "light_color", "fieldtype": "Color", "label": "Light Color" + }, + { + "default": "300,600", + "fieldname": "font_properties", + "fieldtype": "Data", + "label": "Font Properties" } ], "links": [], - "modified": "2020-03-17 16:52:18.541152", + "modified": "2020-03-18 18:24:57.469492", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss index 6267eb531d..ea6775a73d 100644 --- a/frappe/website/doctype/website_theme/website_theme_template.scss +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -1,6 +1,6 @@ {% if google_font %} -@import url('https://fonts.googleapis.com/css?family={{ google_font }}:400,400italic,600&subset=latin,latin-ext'); -$font-family-sans-serif: "{{ google_font }}", '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif'; +@import url('https://fonts.googleapis.com/css?family={{ google_font }}:{{ font_properties }}&display=swap'); +$font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; {% endif %} {% if primary_color %}$primary: {{ primary_color }};{% endif %} From 6b5a47c5997b64cd09e520ee7a62134d8ddfa451 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 27 Mar 2020 11:29:50 +0530 Subject: [PATCH 22/49] fix: minor bug fixes --- frappe/templates/web.html | 2 +- .../web_view/templates/web_view_content.html | 21 ++++++++++++++++--- .../doctype/web_view_item/web_view_item.json | 8 ++++++- .../doctype/website_theme/website_theme.json | 9 +++++++- .../doctype/website_theme/website_theme.py | 2 -- .../website_theme/website_theme_template.scss | 4 +--- 6 files changed, 35 insertions(+), 11 deletions(-) diff --git a/frappe/templates/web.html b/frappe/templates/web.html index e61672124a..d2d38a6320 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -13,7 +13,7 @@ {% block page_container %} -
+
{% block header %}{% endblock %} diff --git a/frappe/website/doctype/web_view/templates/web_view_content.html b/frappe/website/doctype/web_view/templates/web_view_content.html index dd14e80d39..f2e750a472 100644 --- a/frappe/website/doctype/web_view/templates/web_view_content.html +++ b/frappe/website/doctype/web_view/templates/web_view_content.html @@ -10,12 +10,27 @@ {%- macro render_element(element) -%} {%- if element.element_type=='Content' -%} +
{{ element.web_content_html }} +
{%- elif element.element_type=='Image' -%} - + {%- endif -%} {%- endmacro -%} +{%- macro element_class(element) -%} + {{ element.element_class or "" }} +{%- endmacro -%} + +{%- macro element_style(element) -%} + {%- if element.element_style -%} + style = "{{ element.element_style }}" + {%- endif -%} +{%- endmacro -%} + + {%- for section in sections -%}
@@ -32,7 +47,7 @@ {%- elif section.section_type == 'Grid' -%}
{%- for element in section.elements -%} -
+
{{ render_element(element) }}
{%- endfor -%} @@ -50,7 +65,7 @@
{%- for element in section.elements -%} -
+
{{ render_element(element) }}
{%- endfor -%} diff --git a/frappe/website/doctype/web_view_item/web_view_item.json b/frappe/website/doctype/web_view_item/web_view_item.json index 7be1c35415..df2c13548a 100644 --- a/frappe/website/doctype/web_view_item/web_view_item.json +++ b/frappe/website/doctype/web_view_item/web_view_item.json @@ -11,6 +11,7 @@ "column_break_3", "columns", "element_class", + "element_style", "section_break_5", "section_type", "web_content_type", @@ -98,11 +99,16 @@ "fieldname": "hide", "fieldtype": "Check", "label": "Hide" + }, + { + "fieldname": "element_style", + "fieldtype": "Small Text", + "label": "Element Style" } ], "istable": 1, "links": [], - "modified": "2020-03-17 17:06:37.157763", + "modified": "2020-03-18 23:14:24.020488", "modified_by": "Administrator", "module": "Website", "name": "Web View Item", diff --git a/frappe/website/doctype/website_theme/website_theme.json b/frappe/website/doctype/website_theme/website_theme.json index 5704b97e0b..f7c6a9a1f2 100644 --- a/frappe/website/doctype/website_theme/website_theme.json +++ b/frappe/website/doctype/website_theme/website_theme.json @@ -14,6 +14,7 @@ "google_font", "font_size", "font_properties", + "use_full_width", "column_break_7", "primary_color", "text_color", @@ -142,10 +143,16 @@ "fieldname": "font_properties", "fieldtype": "Data", "label": "Font Properties" + }, + { + "description": "Content will not be inside a \"container\" class, you will have to add your own containers for different sections.", + "fieldname": "use_full_width", + "fieldtype": "Data", + "label": "Use Full Width" } ], "links": [], - "modified": "2020-03-18 18:24:57.469492", + "modified": "2020-03-19 09:46:48.750150", "modified_by": "Administrator", "module": "Website", "name": "Website Theme", diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 9a20bab5f7..94d1ff9fe9 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -37,8 +37,6 @@ class WebsiteTheme(Document): frappe.throw(_("Please Duplicate this Website Theme to customize.")) def render_theme(self): - if self.google_font: - self.google_font = self.google_font.replace(' ', '+') self.theme_scss = frappe.render_template('frappe/website/doctype/website_theme/website_theme_template.scss', self.as_dict()) def validate_theme(self): diff --git a/frappe/website/doctype/website_theme/website_theme_template.scss b/frappe/website/doctype/website_theme/website_theme_template.scss index ea6775a73d..e1728eee36 100644 --- a/frappe/website/doctype/website_theme/website_theme_template.scss +++ b/frappe/website/doctype/website_theme/website_theme_template.scss @@ -1,5 +1,5 @@ {% if google_font %} -@import url('https://fonts.googleapis.com/css?family={{ google_font }}:{{ font_properties }}&display=swap'); +@import url('https://fonts.googleapis.com/css?family={{ google_font.replace(' ', '+') }}:{{ font_properties }}&display=swap'); $font-family-sans-serif: "{{ google_font }}", -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; {% endif %} @@ -18,6 +18,4 @@ body { {% if font_size %} font-size: {{ font_size }}; {% endif %} - font-smoothing: antialiased; - -webkit-font-smoothing: antialiased; } From ac6391f429ad18b314433f891ff2ca1e3264a6dd Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 1 Apr 2020 11:27:37 +0530 Subject: [PATCH 23/49] feat(Web List): wip --- .../public/js/frappe/ui/group_by/group_by.js | 1 - .../js/frappe/web_form/webform_script.js | 6 +- frappe/website/doctype/web_form/web_form.py | 3 + frappe/website/doctype/web_list/__init__.py | 0 .../doctype/web_list/templates/web_list.html | 6 + .../templates/web_list_component.html | 17 +++ .../web_list/templates/web_list_row.html | 4 + .../website/doctype/web_list/test_web_list.py | 10 ++ frappe/website/doctype/web_list/web_list.js | 30 ++++ frappe/website/doctype/web_list/web_list.json | 138 ++++++++++++++++++ frappe/website/doctype/web_list/web_list.py | 15 ++ .../doctype/web_list_column/__init__.py | 0 .../web_list_column/web_list_column.json | 46 ++++++ .../web_list_column/web_list_column.py | 10 ++ .../doctype/web_list_filter/__init__.py | 0 .../web_list_filter/web_list_filter.json | 39 +++++ .../web_list_filter/web_list_filter.py | 10 ++ .../doctype/web_view_item/web_view_item.json | 4 +- 18 files changed, 333 insertions(+), 6 deletions(-) create mode 100644 frappe/website/doctype/web_list/__init__.py create mode 100644 frappe/website/doctype/web_list/templates/web_list.html create mode 100644 frappe/website/doctype/web_list/templates/web_list_component.html create mode 100644 frappe/website/doctype/web_list/templates/web_list_row.html create mode 100644 frappe/website/doctype/web_list/test_web_list.py create mode 100644 frappe/website/doctype/web_list/web_list.js create mode 100644 frappe/website/doctype/web_list/web_list.json create mode 100644 frappe/website/doctype/web_list/web_list.py create mode 100644 frappe/website/doctype/web_list_column/__init__.py create mode 100644 frappe/website/doctype/web_list_column/web_list_column.json create mode 100644 frappe/website/doctype/web_list_column/web_list_column.py create mode 100644 frappe/website/doctype/web_list_filter/__init__.py create mode 100644 frappe/website/doctype/web_list_filter/web_list_filter.json create mode 100644 frappe/website/doctype/web_list_filter/web_list_filter.py diff --git a/frappe/public/js/frappe/ui/group_by/group_by.js b/frappe/public/js/frappe/ui/group_by/group_by.js index 6936f25c18..dc81bbdf20 100644 --- a/frappe/public/js/frappe/ui/group_by/group_by.js +++ b/frappe/public/js/frappe/ui/group_by/group_by.js @@ -92,7 +92,6 @@ frappe.ui.GroupBy = class { } apply_settings(settings) { - if (!settings.group_by.startsWith('`tab')) { settings.group_by = '`tab' + this.doctype + '`.`' + settings.group_by + '`'; } diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js index 7bf7162101..688c0938c4 100644 --- a/frappe/public/js/frappe/web_form/webform_script.js +++ b/frappe/public/js/frappe/web_form/webform_script.js @@ -2,13 +2,13 @@ import WebFormList from './web_form_list' import WebForm from './web_form' frappe.ready(function() { + let query_params = frappe.utils.get_query_params(); let wrapper = $(".web-form-wrapper"); - let is_list = parseInt(wrapper.data('is-list')); + let is_list = parseInt(wrapper.data('is-list')) || query_params.is_list; let webform_doctype = wrapper.data('web-form-doctype'); let webform_name = wrapper.data('web-form'); let login_required = parseInt(wrapper.data('login-required')); let allow_delete = parseInt(wrapper.data('allow-delete')); - let query_params = frappe.utils.get_query_params(); let doc_name = query_params.name || ''; let is_new = query_params.new; @@ -38,7 +38,7 @@ frappe.ready(function() { settings: { allow_delete } - }) + }); } function show_form() { diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index a188503ea3..4fc3c99037 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -156,6 +156,9 @@ def get_context(context): # only a single doc allowed and no existing doc, hence new frappe.form_dict.new = 1 + if frappe.form_dict.is_list: + context.is_list = True + # always render new form if login is not required or doesn't allow editing existing ones if not self.login_required or not self.allow_edit: frappe.form_dict.new = 1 diff --git a/frappe/website/doctype/web_list/__init__.py b/frappe/website/doctype/web_list/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_list/templates/web_list.html b/frappe/website/doctype/web_list/templates/web_list.html new file mode 100644 index 0000000000..6d59f8cfbd --- /dev/null +++ b/frappe/website/doctype/web_list/templates/web_list.html @@ -0,0 +1,6 @@ +{% extends "templates/web.html" %} + +{% block page_content %} + {% include "frappe/website/doctype/web_list/templates/web_list_component.html" %} +{% endblock %} + \ No newline at end of file diff --git a/frappe/website/doctype/web_list/templates/web_list_component.html b/frappe/website/doctype/web_list/templates/web_list_component.html new file mode 100644 index 0000000000..01e151c57c --- /dev/null +++ b/frappe/website/doctype/web_list/templates/web_list_component.html @@ -0,0 +1,17 @@ +{% if list_style=="Blog" %} + {% for row in data %} +
+

{{ row[0] }}

+ {% if row|len > 1 %} +

{{ row[1] }}

+ {% endif %} + {% if row|len > 2 %} +

+ {% for i in range(2, row|len) %} + {{ row[i] }} + {% endfor %} +

+ {% endif %} +
+ {% endfor %} +{% endif %} \ No newline at end of file diff --git a/frappe/website/doctype/web_list/templates/web_list_row.html b/frappe/website/doctype/web_list/templates/web_list_row.html new file mode 100644 index 0000000000..d7014b453a --- /dev/null +++ b/frappe/website/doctype/web_list/templates/web_list_row.html @@ -0,0 +1,4 @@ + + diff --git a/frappe/website/doctype/web_list/test_web_list.py b/frappe/website/doctype/web_list/test_web_list.py new file mode 100644 index 0000000000..23be467025 --- /dev/null +++ b/frappe/website/doctype/web_list/test_web_list.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 TestWebList(unittest.TestCase): + pass diff --git a/frappe/website/doctype/web_list/web_list.js b/frappe/website/doctype/web_list/web_list.js new file mode 100644 index 0000000000..ea291fff7e --- /dev/null +++ b/frappe/website/doctype/web_list/web_list.js @@ -0,0 +1,30 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Web List', { + refresh: function(frm) { + return frm.trigger('reference_doctype'); + }, + reference_doctype: function(frm) { + // update Select fields in the child tables + if (frm.doc.reference_doctype) { + // fetch fields + return frappe.model.with_doctype(frm.doc.reference_doctype, function() { + // map fields with value + var fields = $.map(frappe.get_doc("DocType", frm.doc.reference_doctype).fields, function(d) { + if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1) { + return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname }; + } else { + return null; + } + }); + + fields.unshift({label: __("Name"), value: "name"}); + + // update the `options` property with the fields + frappe.meta.get_docfield("Web List Filter", "fieldname", frm.doc.name).options = [""].concat(fields); + frappe.meta.get_docfield("Web List Column", "fieldname", frm.doc.name).options = [""].concat(fields); + }); + } + } +}); diff --git a/frappe/website/doctype/web_list/web_list.json b/frappe/website/doctype/web_list/web_list.json new file mode 100644 index 0000000000..0af8f2e5e3 --- /dev/null +++ b/frappe/website/doctype/web_list/web_list.json @@ -0,0 +1,138 @@ +{ + "actions": [], + "creation": "2020-03-28 14:30:02.523080", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "reference_doctype", + "list_style", + "css_class", + "column_break_3", + "route", + "is_published", + "section_break_6", + "filters", + "section_break_8", + "columns", + "template_section", + "template" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "reqd": 1 + }, + { + "fieldname": "reference_doctype", + "fieldtype": "Link", + "label": "Reference DocType", + "options": "DocType", + "reqd": 1 + }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, + { + "fieldname": "route", + "fieldtype": "Data", + "label": "Route" + }, + { + "default": "0", + "fieldname": "is_published", + "fieldtype": "Check", + "label": "Is Published" + }, + { + "fieldname": "section_break_6", + "fieldtype": "Section Break", + "label": "Filters" + }, + { + "fieldname": "filters", + "fieldtype": "Table", + "label": "Filters", + "options": "Web List Filter" + }, + { + "description": "For Blog and Card style, first column is the title, second is the content, the rest are badges.", + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "label": "Columns" + }, + { + "fieldname": "columns", + "fieldtype": "Table", + "label": "Columns", + "options": "Web List Column", + "reqd": 1 + }, + { + "depends_on": "eval:doc.list_style===\"Template\"", + "fieldname": "template_section", + "fieldtype": "Section Break", + "label": "Template" + }, + { + "fieldname": "template", + "fieldtype": "Code", + "label": "Template" + }, + { + "fieldname": "list_style", + "fieldtype": "Select", + "label": "List Style", + "options": "Table\nBlog\nCard\nTemplate", + "reqd": 1 + }, + { + "fieldname": "css_class", + "fieldtype": "Link", + "label": "CSS Class", + "options": "CSS Class" + } + ], + "has_web_view": 1, + "links": [], + "modified": "2020-03-29 12:20:57.747810", + "modified_by": "Administrator", + "module": "Website", + "name": "Web List", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Website Manager", + "share": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "sort_field": "creation", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_list/web_list.py b/frappe/website/doctype/web_list/web_list.py new file mode 100644 index 0000000000..f099a5d851 --- /dev/null +++ b/frappe/website/doctype/web_list/web_list.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.website.website_generator import WebsiteGenerator + +class WebList(WebsiteGenerator): + def get_context(self, context): + context.data = self.get_data() + + def get_data(self): + return frappe.get_all(self.reference_doctype, + fields = [d.fieldname for d in self.columns], as_list = True, limit=20) diff --git a/frappe/website/doctype/web_list_column/__init__.py b/frappe/website/doctype/web_list_column/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_list_column/web_list_column.json b/frappe/website/doctype/web_list_column/web_list_column.json new file mode 100644 index 0000000000..a485ca6c74 --- /dev/null +++ b/frappe/website/doctype/web_list_column/web_list_column.json @@ -0,0 +1,46 @@ +{ + "actions": [], + "creation": "2020-03-28 14:33:25.174696", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "fieldname", + "column_label", + "columns" + ], + "fields": [ + { + "fieldname": "fieldname", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Fieldname", + "reqd": 1 + }, + { + "fieldname": "columns", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Columns" + }, + { + "fieldname": "column_label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Column Label", + "reqd": 1 + } + ], + "istable": 1, + "links": [], + "modified": "2020-03-29 11:58:49.428037", + "modified_by": "Administrator", + "module": "Website", + "name": "Web List Column", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_list_column/web_list_column.py b/frappe/website/doctype/web_list_column/web_list_column.py new file mode 100644 index 0000000000..6239283f5b --- /dev/null +++ b/frappe/website/doctype/web_list_column/web_list_column.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class WebListColumn(Document): + pass diff --git a/frappe/website/doctype/web_list_filter/__init__.py b/frappe/website/doctype/web_list_filter/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/website/doctype/web_list_filter/web_list_filter.json b/frappe/website/doctype/web_list_filter/web_list_filter.json new file mode 100644 index 0000000000..ec0428332b --- /dev/null +++ b/frappe/website/doctype/web_list_filter/web_list_filter.json @@ -0,0 +1,39 @@ +{ + "actions": [], + "creation": "2020-03-28 14:31:42.409639", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "fieldname", + "mandatory" + ], + "fields": [ + { + "fieldname": "fieldname", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Fieldname", + "reqd": 1 + }, + { + "default": "0", + "fieldname": "mandatory", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Mandatory" + } + ], + "istable": 1, + "links": [], + "modified": "2020-03-28 14:37:07.249436", + "modified_by": "Administrator", + "module": "Website", + "name": "Web List Filter", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/website/doctype/web_list_filter/web_list_filter.py b/frappe/website/doctype/web_list_filter/web_list_filter.py new file mode 100644 index 0000000000..4dd0ef7fd6 --- /dev/null +++ b/frappe/website/doctype/web_list_filter/web_list_filter.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class WebListFilter(Document): + pass diff --git a/frappe/website/doctype/web_view_item/web_view_item.json b/frappe/website/doctype/web_view_item/web_view_item.json index df2c13548a..0d33cbb8ce 100644 --- a/frappe/website/doctype/web_view_item/web_view_item.json +++ b/frappe/website/doctype/web_view_item/web_view_item.json @@ -26,7 +26,7 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Element Type", - "options": "Section\nContent\nHero\nParagraph\nImage\nQuote", + "options": "Section\nContent\nParagraph\nWeb List\nWeb Form", "reqd": 1 }, { @@ -108,7 +108,7 @@ ], "istable": 1, "links": [], - "modified": "2020-03-18 23:14:24.020488", + "modified": "2020-03-28 14:21:50.014823", "modified_by": "Administrator", "module": "Website", "name": "Web View Item", From 1f896705d3f5b2d52ddd87cdca6b1ac18b3090f9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 15 Apr 2020 23:19:20 +0530 Subject: [PATCH 24/49] fix(cleanup): remove weblist --- frappe/website/doctype/web_list/__init__.py | 0 .../doctype/web_list/templates/web_list.html | 6 - .../templates/web_list_component.html | 17 --- .../web_list/templates/web_list_row.html | 4 - .../website/doctype/web_list/test_web_list.py | 10 -- frappe/website/doctype/web_list/web_list.js | 30 ---- frappe/website/doctype/web_list/web_list.json | 138 ------------------ frappe/website/doctype/web_list/web_list.py | 15 -- .../doctype/web_list_column/__init__.py | 0 .../web_list_column/web_list_column.json | 46 ------ .../web_list_column/web_list_column.py | 10 -- .../doctype/web_list_filter/__init__.py | 0 .../web_list_filter/web_list_filter.json | 39 ----- .../web_list_filter/web_list_filter.py | 10 -- 14 files changed, 325 deletions(-) delete mode 100644 frappe/website/doctype/web_list/__init__.py delete mode 100644 frappe/website/doctype/web_list/templates/web_list.html delete mode 100644 frappe/website/doctype/web_list/templates/web_list_component.html delete mode 100644 frappe/website/doctype/web_list/templates/web_list_row.html delete mode 100644 frappe/website/doctype/web_list/test_web_list.py delete mode 100644 frappe/website/doctype/web_list/web_list.js delete mode 100644 frappe/website/doctype/web_list/web_list.json delete mode 100644 frappe/website/doctype/web_list/web_list.py delete mode 100644 frappe/website/doctype/web_list_column/__init__.py delete mode 100644 frappe/website/doctype/web_list_column/web_list_column.json delete mode 100644 frappe/website/doctype/web_list_column/web_list_column.py delete mode 100644 frappe/website/doctype/web_list_filter/__init__.py delete mode 100644 frappe/website/doctype/web_list_filter/web_list_filter.json delete mode 100644 frappe/website/doctype/web_list_filter/web_list_filter.py diff --git a/frappe/website/doctype/web_list/__init__.py b/frappe/website/doctype/web_list/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/doctype/web_list/templates/web_list.html b/frappe/website/doctype/web_list/templates/web_list.html deleted file mode 100644 index 6d59f8cfbd..0000000000 --- a/frappe/website/doctype/web_list/templates/web_list.html +++ /dev/null @@ -1,6 +0,0 @@ -{% extends "templates/web.html" %} - -{% block page_content %} - {% include "frappe/website/doctype/web_list/templates/web_list_component.html" %} -{% endblock %} - \ No newline at end of file diff --git a/frappe/website/doctype/web_list/templates/web_list_component.html b/frappe/website/doctype/web_list/templates/web_list_component.html deleted file mode 100644 index 01e151c57c..0000000000 --- a/frappe/website/doctype/web_list/templates/web_list_component.html +++ /dev/null @@ -1,17 +0,0 @@ -{% if list_style=="Blog" %} - {% for row in data %} -
-

{{ row[0] }}

- {% if row|len > 1 %} -

{{ row[1] }}

- {% endif %} - {% if row|len > 2 %} -

- {% for i in range(2, row|len) %} - {{ row[i] }} - {% endfor %} -

- {% endif %} -
- {% endfor %} -{% endif %} \ No newline at end of file diff --git a/frappe/website/doctype/web_list/templates/web_list_row.html b/frappe/website/doctype/web_list/templates/web_list_row.html deleted file mode 100644 index d7014b453a..0000000000 --- a/frappe/website/doctype/web_list/templates/web_list_row.html +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/frappe/website/doctype/web_list/test_web_list.py b/frappe/website/doctype/web_list/test_web_list.py deleted file mode 100644 index 23be467025..0000000000 --- a/frappe/website/doctype/web_list/test_web_list.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestWebList(unittest.TestCase): - pass diff --git a/frappe/website/doctype/web_list/web_list.js b/frappe/website/doctype/web_list/web_list.js deleted file mode 100644 index ea291fff7e..0000000000 --- a/frappe/website/doctype/web_list/web_list.js +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2020, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Web List', { - refresh: function(frm) { - return frm.trigger('reference_doctype'); - }, - reference_doctype: function(frm) { - // update Select fields in the child tables - if (frm.doc.reference_doctype) { - // fetch fields - return frappe.model.with_doctype(frm.doc.reference_doctype, function() { - // map fields with value - var fields = $.map(frappe.get_doc("DocType", frm.doc.reference_doctype).fields, function(d) { - if (frappe.model.no_value_type.indexOf(d.fieldtype) === -1) { - return { label: d.label + ' (' + d.fieldtype + ')', value: d.fieldname }; - } else { - return null; - } - }); - - fields.unshift({label: __("Name"), value: "name"}); - - // update the `options` property with the fields - frappe.meta.get_docfield("Web List Filter", "fieldname", frm.doc.name).options = [""].concat(fields); - frappe.meta.get_docfield("Web List Column", "fieldname", frm.doc.name).options = [""].concat(fields); - }); - } - } -}); diff --git a/frappe/website/doctype/web_list/web_list.json b/frappe/website/doctype/web_list/web_list.json deleted file mode 100644 index 0af8f2e5e3..0000000000 --- a/frappe/website/doctype/web_list/web_list.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "actions": [], - "creation": "2020-03-28 14:30:02.523080", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "title", - "reference_doctype", - "list_style", - "css_class", - "column_break_3", - "route", - "is_published", - "section_break_6", - "filters", - "section_break_8", - "columns", - "template_section", - "template" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title", - "reqd": 1 - }, - { - "fieldname": "reference_doctype", - "fieldtype": "Link", - "label": "Reference DocType", - "options": "DocType", - "reqd": 1 - }, - { - "fieldname": "column_break_3", - "fieldtype": "Column Break" - }, - { - "fieldname": "route", - "fieldtype": "Data", - "label": "Route" - }, - { - "default": "0", - "fieldname": "is_published", - "fieldtype": "Check", - "label": "Is Published" - }, - { - "fieldname": "section_break_6", - "fieldtype": "Section Break", - "label": "Filters" - }, - { - "fieldname": "filters", - "fieldtype": "Table", - "label": "Filters", - "options": "Web List Filter" - }, - { - "description": "For Blog and Card style, first column is the title, second is the content, the rest are badges.", - "fieldname": "section_break_8", - "fieldtype": "Section Break", - "label": "Columns" - }, - { - "fieldname": "columns", - "fieldtype": "Table", - "label": "Columns", - "options": "Web List Column", - "reqd": 1 - }, - { - "depends_on": "eval:doc.list_style===\"Template\"", - "fieldname": "template_section", - "fieldtype": "Section Break", - "label": "Template" - }, - { - "fieldname": "template", - "fieldtype": "Code", - "label": "Template" - }, - { - "fieldname": "list_style", - "fieldtype": "Select", - "label": "List Style", - "options": "Table\nBlog\nCard\nTemplate", - "reqd": 1 - }, - { - "fieldname": "css_class", - "fieldtype": "Link", - "label": "CSS Class", - "options": "CSS Class" - } - ], - "has_web_view": 1, - "links": [], - "modified": "2020-03-29 12:20:57.747810", - "modified_by": "Administrator", - "module": "Website", - "name": "Web List", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Website Manager", - "share": 1, - "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "quick_entry": 1, - "sort_field": "creation", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/website/doctype/web_list/web_list.py b/frappe/website/doctype/web_list/web_list.py deleted file mode 100644 index f099a5d851..0000000000 --- a/frappe/website/doctype/web_list/web_list.py +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.website.website_generator import WebsiteGenerator - -class WebList(WebsiteGenerator): - def get_context(self, context): - context.data = self.get_data() - - def get_data(self): - return frappe.get_all(self.reference_doctype, - fields = [d.fieldname for d in self.columns], as_list = True, limit=20) diff --git a/frappe/website/doctype/web_list_column/__init__.py b/frappe/website/doctype/web_list_column/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/doctype/web_list_column/web_list_column.json b/frappe/website/doctype/web_list_column/web_list_column.json deleted file mode 100644 index a485ca6c74..0000000000 --- a/frappe/website/doctype/web_list_column/web_list_column.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "actions": [], - "creation": "2020-03-28 14:33:25.174696", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "fieldname", - "column_label", - "columns" - ], - "fields": [ - { - "fieldname": "fieldname", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Fieldname", - "reqd": 1 - }, - { - "fieldname": "columns", - "fieldtype": "Int", - "in_list_view": 1, - "label": "Columns" - }, - { - "fieldname": "column_label", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Column Label", - "reqd": 1 - } - ], - "istable": 1, - "links": [], - "modified": "2020-03-29 11:58:49.428037", - "modified_by": "Administrator", - "module": "Website", - "name": "Web List Column", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/website/doctype/web_list_column/web_list_column.py b/frappe/website/doctype/web_list_column/web_list_column.py deleted file mode 100644 index 6239283f5b..0000000000 --- a/frappe/website/doctype/web_list_column/web_list_column.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.model.document import Document - -class WebListColumn(Document): - pass diff --git a/frappe/website/doctype/web_list_filter/__init__.py b/frappe/website/doctype/web_list_filter/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/website/doctype/web_list_filter/web_list_filter.json b/frappe/website/doctype/web_list_filter/web_list_filter.json deleted file mode 100644 index ec0428332b..0000000000 --- a/frappe/website/doctype/web_list_filter/web_list_filter.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "actions": [], - "creation": "2020-03-28 14:31:42.409639", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "fieldname", - "mandatory" - ], - "fields": [ - { - "fieldname": "fieldname", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Fieldname", - "reqd": 1 - }, - { - "default": "0", - "fieldname": "mandatory", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Mandatory" - } - ], - "istable": 1, - "links": [], - "modified": "2020-03-28 14:37:07.249436", - "modified_by": "Administrator", - "module": "Website", - "name": "Web List Filter", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/website/doctype/web_list_filter/web_list_filter.py b/frappe/website/doctype/web_list_filter/web_list_filter.py deleted file mode 100644 index 4dd0ef7fd6..0000000000 --- a/frappe/website/doctype/web_list_filter/web_list_filter.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -# import frappe -from frappe.model.document import Document - -class WebListFilter(Document): - pass From a7c7df3cc498b0943a7a3945cc155af3ff29746e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 01:03:18 +0530 Subject: [PATCH 25/49] fix(tests): Added tests for Web View, Website Theme --- .../website/doctype/web_view/test_web_view.py | 86 ++++++++++++++++++- frappe/website/doctype/web_view/web_view.json | 3 +- frappe/website/doctype/web_view/web_view.py | 2 +- .../website_settings/website_settings.json | 2 +- .../website_theme/test_website_theme.py | 17 +++- .../doctype/website_theme/website_theme.py | 15 +++- 6 files changed, 117 insertions(+), 8 deletions(-) diff --git a/frappe/website/doctype/web_view/test_web_view.py b/frappe/website/doctype/web_view/test_web_view.py index 70dc1ca906..89ff7fea3e 100644 --- a/frappe/website/doctype/web_view/test_web_view.py +++ b/frappe/website/doctype/web_view/test_web_view.py @@ -3,8 +3,90 @@ # See license.txt from __future__ import unicode_literals -# import frappe +import frappe import unittest +from frappe.website.doctype.web_page.test_web_page import get_page_content + +test_dependencies = ['Web Page'] # for test + class TestWebView(unittest.TestCase): - pass + def setUpClass(): + frappe.delete_doc_if_exists('Web View', 'test-web-view') + frappe.delete_doc_if_exists('CSS Class', 'test-css-class') + + frappe.get_doc(dict( + doctype = 'CSS Class', + name = 'test-css-class', + css = '.test-class { color: red; }' + )).insert() + + frappe.get_doc(dict( + doctype = 'Web View', + title = 'Test Web View', + route = 'test-web-view', + published = 1, + items = [ + dict( + element_type = 'Section', + section_type = 'List' + ), + dict( + element_type = 'Content', + web_content_type = 'Markdown', + web_content_markdown = '## Heading\n\nBody' + ), + dict( + element_type = 'Content', + web_content_type = 'HTML', + web_content_html = '
Here is some HTML
' + ), + dict( + element_type = 'Section', + section_type = 'Grid' + ), + dict( + element_type = 'Content', + element_class = 'test-css-class', + web_content_type = 'Markdown', + web_content_markdown = 'Column 1' + ), + dict( + element_type = 'Content', + web_content_type = 'Markdown', + web_content_markdown = 'Column 2' + ), + ] + )).insert() + + def test_web_view(self): + html = get_page_content('test-web-view') + #print(html) + self.assert_web_view_in_html(html) + + def assert_web_view_in_html(self, html): + self.assertTrue('

Heading

' in html) + self.assertTrue('
Here is some HTML
' in html) + self.assertTrue('Column 1' in html) + self.assertTrue('Column 2' in html) + self.assertTrue('.test-class { color: red; }' in html) + + def test_web_view_in_footer(self): + website_settings = frappe.get_single("Website Settings") + website_settings.footer_type = 'Web View' + website_settings.footer_web_view = 'test-web-view' + website_settings.save() + + html = get_page_content('test-web-page-1') + + website_settings.footer_type = 'Standard' + website_settings.footer_web_view = '' + website_settings.save() + + # web view should still come as footer + self.assert_web_view_in_html(html) + + html_without_footer = get_page_content('test-web-page-1') + + # no more footer + self.assertFalse('Column 1' in html_without_footer) diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json index 964cc1fbae..927495bb49 100644 --- a/frappe/website/doctype/web_view/web_view.json +++ b/frappe/website/doctype/web_view/web_view.json @@ -4,6 +4,7 @@ "allow_import": 1, "allow_rename": 1, "autoname": "field:title", + "beta": 1, "creation": "2020-03-16 15:28:03.828741", "doctype": "DocType", "editable_grid": 1, @@ -52,7 +53,7 @@ ], "has_web_view": 1, "links": [], - "modified": "2020-03-16 18:06:47.024221", + "modified": "2020-04-15 14:26:10.619893", "modified_by": "Administrator", "module": "Website", "name": "Web View", diff --git a/frappe/website/doctype/web_view/web_view.py b/frappe/website/doctype/web_view/web_view.py index 92f564553c..6828057fe1 100644 --- a/frappe/website/doctype/web_view/web_view.py +++ b/frappe/website/doctype/web_view/web_view.py @@ -66,7 +66,7 @@ class WebView(WebsiteGenerator): def add_default_section(self, context): # add a default section if not added - context.section.append(dict( + context.sections.append(frappe._dict( element_type='Section', section_type='List', title='Default Section', diff --git a/frappe/website/doctype/website_settings/website_settings.json b/frappe/website/doctype/website_settings/website_settings.json index a730f4746f..f9ed247c0d 100644 --- a/frappe/website/doctype/website_settings/website_settings.json +++ b/frappe/website/doctype/website_settings/website_settings.json @@ -364,7 +364,7 @@ "issingle": 1, "links": [], "max_attachments": 10, - "modified": "2020-02-21 16:46:59.947403", + "modified": "2020-04-21 16:46:59.947403", "modified_by": "Administrator", "module": "Website", "name": "Website Settings", diff --git a/frappe/website/doctype/website_theme/test_website_theme.py b/frappe/website/doctype/website_theme/test_website_theme.py index 216a7ae4ce..888abc7606 100644 --- a/frappe/website/doctype/website_theme/test_website_theme.py +++ b/frappe/website/doctype/website_theme/test_website_theme.py @@ -8,4 +8,19 @@ import unittest test_records = frappe.get_test_records('Website Theme') class TestWebsiteTheme(unittest.TestCase): - pass + def test_website_theme(self): + + frappe.delete_doc_if_exists('Website Theme', 'test-theme') + theme = frappe.get_doc(dict( + doctype = 'Website Theme', + theme = 'test-theme', + google_font = 'Inter', + custom_scss = 'body { font-size: 16.5px; }' + )).insert() + + with open(theme.theme_url[1:]) as f: + css = f.read() + + self.assertTrue(theme.custom_scss in css) + self.assertTrue('fonts.googleapis.com' in css) + diff --git a/frappe/website/doctype/website_theme/website_theme.py b/frappe/website/doctype/website_theme/website_theme.py index 94d1ff9fe9..d0ce582482 100644 --- a/frappe/website/doctype/website_theme/website_theme.py +++ b/frappe/website/doctype/website_theme/website_theme.py @@ -60,8 +60,13 @@ class WebsiteTheme(Document): def generate_bootstrap_theme(self): from subprocess import Popen, PIPE + folder_path = join_path(frappe.utils.get_bench_path(), 'sites', 'assets', 'css') + self.delete_old_theme_files(folder_path) + + # add a random suffix file_name = frappe.scrub(self.name) + '_' + frappe.generate_hash('Website Theme', 8) + '.css' - output_path = join_path(frappe.utils.get_bench_path(), 'sites', 'assets', 'css', file_name) + output_path = join_path(folder_path, file_name) + content = get_scss(self) content = content.replace('\n', '\\n') command = ['node', 'generate_bootstrap_theme.js', output_path, content] @@ -79,6 +84,12 @@ class WebsiteTheme(Document): frappe.msgprint(_('Compiled Successfully'), alert=True) + def delete_old_theme_files(self, folder_path): + import os + for fname in os.listdir(folder_path): + if fname.startswith(frappe.scrub(self.name) + '_') and fname.endswith('.css'): + os.remove(os.path.join(folder_path, fname)) + def generate_theme_if_not_exist(self): bench_path = frappe.utils.get_bench_path() if self.theme_url: @@ -121,5 +132,5 @@ def generate_theme_files_if_not_exist(): frappe.log_error(frappe.get_traceback(), "Theme File Generation Failed") def get_scss(doc): - return doc.theme_scss + '\n' + doc.custom_scss + return (doc.theme_scss or '') + '\n' + (doc.custom_scss or '') From ee6903523be26d3565851986b772c48df00116fd Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 01:20:54 +0530 Subject: [PATCH 26/49] fix(test): Theme tests does not run on Travis --- frappe/website/doctype/website_theme/test_website_theme.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/website/doctype/website_theme/test_website_theme.py b/frappe/website/doctype/website_theme/test_website_theme.py index 888abc7606..0402ec1e52 100644 --- a/frappe/website/doctype/website_theme/test_website_theme.py +++ b/frappe/website/doctype/website_theme/test_website_theme.py @@ -2,6 +2,8 @@ # See license.txt from __future__ import unicode_literals + +import os import frappe import unittest @@ -9,6 +11,9 @@ test_records = frappe.get_test_records('Website Theme') class TestWebsiteTheme(unittest.TestCase): def test_website_theme(self): + if os.environ.get('CI'): + # no node-sass on travis (?) + return frappe.delete_doc_if_exists('Website Theme', 'test-theme') theme = frappe.get_doc(dict( From 7800fdbfee7c03f37f9513bed9f9955b56c0f30f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 09:38:34 +0530 Subject: [PATCH 27/49] fix(tests): sitemap and condition field for Web View --- frappe/cache_manager.py | 3 ++- frappe/tests/test_sitemap.py | 2 ++ frappe/website/doctype/web_page/web_page.py | 1 + frappe/website/doctype/web_view/web_view.json | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 0c5b5f94b4..78f452db21 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -15,7 +15,8 @@ global_cache_keys = ("app_hooks", "installed_apps", "app_modules", "module_app", "system_settings", 'scheduler_events', 'time_zone', 'webhooks', 'active_domains', 'active_modules', 'assignment_rule', 'server_script_map', 'wkhtmltopdf_version', - 'domain_restricted_doctypes', 'domain_restricted_pages', 'information_schema:counts') + 'domain_restricted_doctypes', 'domain_restricted_pages', 'information_schema:counts', + 'sitemap_routes') user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang", "defaults", "user_permissions", "home_page", "linked_with", diff --git a/frappe/tests/test_sitemap.py b/frappe/tests/test_sitemap.py index 455a80eb3e..22669000c1 100644 --- a/frappe/tests/test_sitemap.py +++ b/frappe/tests/test_sitemap.py @@ -5,6 +5,8 @@ from frappe.utils import get_html_for_route class TestSitemap(unittest.TestCase): def test_sitemap(self): + from frappe.test_runner import make_test_records + make_test_records('Blog Post') blogs = frappe.db.get_all('Blog Post', {'published': 1}, ['route'], limit=1) xml = get_html_for_route('sitemap.xml') self.assertTrue('/about' in xml) diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index ee0c4de074..ffa836e3c5 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -148,6 +148,7 @@ class WebPage(WebsiteGenerator): def check_publish_status(): + # called via daily scheduler web_pages = frappe.get_all("Web Page", fields=["name", "published", "start_date", "end_date"]) now_date = get_datetime(now()) diff --git a/frappe/website/doctype/web_view/web_view.json b/frappe/website/doctype/web_view/web_view.json index 927495bb49..6d957fd0d9 100644 --- a/frappe/website/doctype/web_view/web_view.json +++ b/frappe/website/doctype/web_view/web_view.json @@ -52,8 +52,9 @@ } ], "has_web_view": 1, + "is_published_field": "published", "links": [], - "modified": "2020-04-15 14:26:10.619893", + "modified": "2020-04-15 23:58:12.208049", "modified_by": "Administrator", "module": "Website", "name": "Web View", @@ -84,6 +85,7 @@ "write": 1 } ], + "route": "route", "sort_field": "creation", "sort_order": "DESC", "track_changes": 1 From 5bb489c63748d5bfba0024f2f08a02b58df1f642 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Thu, 16 Apr 2020 10:06:41 +0530 Subject: [PATCH 28/49] Update frappe/model/delete_doc.py --- frappe/model/delete_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index b6db154bd4..c0d2c4eef9 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -210,7 +210,7 @@ def check_permission_and_not_submitted(doc): # check if submitted if doc.docstatus == 1: - frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted. You must Cancel it first.").format(_(doc.doctype), doc.name), + frappe.msgprint(_("{0} {1}: Submitted Record cannot be deleted. You must {2} Cancel {3} it first.").format(_(doc.doctype), doc.name, "", ""), raise_exception=True) def check_if_doc_is_linked(doc, method="Delete"): From 8a2c85c6872fe6ec5d0ac2cee7b405d61ef90ece Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Thu, 16 Apr 2020 10:16:35 +0530 Subject: [PATCH 29/49] feat: Add new report column property disable_total (#9909) * Adding new column property disable_total * Sider fix * Sider fix Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/public/js/frappe/utils/utils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index a2b03f180e..0f27e97178 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -675,7 +675,9 @@ Object.assign(frappe.utils, { return __(frappe.utils.to_title_case(route[0], true)); }, report_column_total: function(values, column, type) { - if (values.length > 0) { + if (column.column.disable_total) { + return ''; + } else if (values.length > 0) { if (column.column.fieldtype == "Percent" || type === "mean") { return values.reduce((a, b) => a + flt(b)) / values.length; } else if (column.column.fieldtype == "Int") { From ddb3c660aa61478ceec9e7136fbc888137153025 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 10:21:44 +0530 Subject: [PATCH 30/49] fix(test): test_web_view.py for Python 2.7 added classmethod decorator --- frappe/website/doctype/web_view/test_web_view.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/web_view/test_web_view.py b/frappe/website/doctype/web_view/test_web_view.py index 89ff7fea3e..67b353844d 100644 --- a/frappe/website/doctype/web_view/test_web_view.py +++ b/frappe/website/doctype/web_view/test_web_view.py @@ -11,7 +11,8 @@ from frappe.website.doctype.web_page.test_web_page import get_page_content test_dependencies = ['Web Page'] # for test class TestWebView(unittest.TestCase): - def setUpClass(): + @classmethod + def setUpClass(cls): frappe.delete_doc_if_exists('Web View', 'test-web-view') frappe.delete_doc_if_exists('CSS Class', 'test-css-class') From 24b737f4c003388c5cbfbb88a91b001533339687 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 12:05:37 +0530 Subject: [PATCH 31/49] refactor: Move Syntax checking code to a separate file --- .github/frappe_linter/translation.py | 26 +++++++++++++++ .github/workflows/translation_linter.yml | 41 ++++++------------------ 2 files changed, 36 insertions(+), 31 deletions(-) create mode 100644 .github/frappe_linter/translation.py diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py new file mode 100644 index 0000000000..c8a90e68ce --- /dev/null +++ b/.github/frappe_linter/translation.py @@ -0,0 +1,26 @@ +import re +import sys + +errors_encounter = 0 +pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") +start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") + +files = sys.argv +for _file in files: + if not _file.endswith(('.py', '.js')): + continue + with open(_file, 'r') as f: + print(f'Checking: {_file}') + for num, line in enumerate(f, 1): + all_matches = start_pattern.finditer(line) + if all_matches: + for match in all_matches: + verify = pattern.search(line) + if not verify: + errors_encounter += 1 + num_str = str(num) + print(f'A syntax error has been discovered at line number: {num}') + print(f'Syntax error occurred with: {line}') +if errors_encounter > 0 : + print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') + assert 1+1 == 3 \ No newline at end of file diff --git a/.github/workflows/translation_linter.yml b/.github/workflows/translation_linter.yml index 6b8ba91e99..ca7b152921 100644 --- a/.github/workflows/translation_linter.yml +++ b/.github/workflows/translation_linter.yml @@ -1,12 +1,13 @@ -name: frappe_linter +name: Frappe Linter on: pull_request: - branches: - - master - - develop + branches: + - develop + - version-12-hotfix + - version-11-hotfix jobs: check_translation: - name: Check format + name: Translation Syntax Check runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 @@ -14,30 +15,8 @@ jobs: uses: actions/setup-python@v1 with: python-version: 3.6 - - name: Run check_translation for pull_request + - name: Validating Translation Syntax run: | - import os - import subprocess - import re - errors_encounter = 0 - pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") - temp = re.compile(r"_\(([\"']{,3})") - subprocess.run('git fetch origin '+os.environ['GITHUB_BASE_REF']+ ' :' +os.environ['GITHUB_BASE_REF']+ ' -q', shell=True) - files = subprocess.check_output('git diff --name-only '+os.environ['GITHUB_BASE_REF'], shell=True) - files = files.decode('utf-8') - files = files.split() - for file in files: - with open(file, 'r') as f: - for num, line in enumerate(f, 1): - all_matches = temp.finditer(line) - if all_matches: - for match in all_matches: - verify = pattern.search(line) - if not verify: - errors_encounter += 1 - print('A syntax error has been discovered at line number: ' + num) - print('Syntax error occured with: ' + line) - if errors_encounter > 0 : - print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') - assert 1+1 == 3 - shell: python \ No newline at end of file + git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q + files=$(git diff --name-only $GITHUB_BASE_REF) + python $GITHUB_WORKSPACE/.github/frappe_linter/translation.py $files \ No newline at end of file From 220698f788abc1d81aa10327f1dd1ba292373bdc Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 16 Apr 2020 12:32:09 +0530 Subject: [PATCH 32/49] chore(mergify): Replace codacy with sider --- .mergify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index d810898eee..b145834cc4 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,7 +1,7 @@ pull_request_rules: - name: Automatic merge on CI success and review conditions: - - status-success=Codacy/PR Quality Review + - status-success=Sider - status-success=Semantic Pull Request - status-success=Travis CI - Pull Request - status-success=security/snyk - package.json (frappe) @@ -14,7 +14,7 @@ pull_request_rules: method: merge - name: Automatic squash on CI success and review conditions: - - status-success=Codacy/PR Quality Review + - status-success=Sider - status-success=Semantic Pull Request - status-success=Travis CI - Pull Request - status-success=security/snyk - package.json (frappe) From ab673a9bb95e5ba33dd30bb537dd5f540dd5cf1e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 12:37:53 +0530 Subject: [PATCH 33/49] fix(patch): custom and standard scss is separated in theme --- frappe/patches.txt | 1 + frappe/patches/v13_0/website_theme_custom_scss.py | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 frappe/patches/v13_0/website_theme_custom_scss.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 0e02423639..cbda8cf677 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -272,3 +272,4 @@ execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Account') execute:frappe.delete_doc_if_exists('DocType', 'GCalendar Settings') frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders() +frappe.patches.v13_0.website_theme_custom_scss diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py new file mode 100644 index 0000000000..72c98bfc88 --- /dev/null +++ b/frappe/patches/v13_0/website_theme_custom_scss.py @@ -0,0 +1,9 @@ +import frappe + +def execute(): + for theme in frappe.get_all('Website Theme'): + doc = frappe.get_doc('Website Theme', theme.name) + if not doc.custom_scss and doc.theme_scss: + # move old theme to new theme + doc.custom_scss = doc.theme_scss + doc.save() \ No newline at end of file From fd68b7f39854d9cfc30bee92b1521915ff143438 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 16 Apr 2020 12:54:06 +0530 Subject: [PATCH 34/49] fix: Skip first 2 arguments --- .github/frappe_linter/translation.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py index c8a90e68ce..63c4821775 100644 --- a/.github/frappe_linter/translation.py +++ b/.github/frappe_linter/translation.py @@ -5,7 +5,8 @@ errors_encounter = 0 pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") -files = sys.argv +# skip first 2 arguments +files = sys.argv[2:] for _file in files: if not _file.endswith(('.py', '.js')): continue @@ -18,9 +19,10 @@ for _file in files: verify = pattern.search(line) if not verify: errors_encounter += 1 - num_str = str(num) print(f'A syntax error has been discovered at line number: {num}') print(f'Syntax error occurred with: {line}') -if errors_encounter > 0 : +if errors_encounter > 0: print('You can visit "https://frappe.io/docs/user/en/translations" to resolve this error.') - assert 1+1 == 3 \ No newline at end of file + assert 1+1 == 3 +else: + print('Good To Go!') From 82806dd16158121af32e849419eea73d7b618eea Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Apr 2020 12:48:42 +0530 Subject: [PATCH 35/49] feat: disable file browser for both attach and attach image --- frappe/public/js/frappe/web_form/webform_script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/web_form/webform_script.js b/frappe/public/js/frappe/web_form/webform_script.js index 688c0938c4..53d9701774 100644 --- a/frappe/public/js/frappe/web_form/webform_script.js +++ b/frappe/public/js/frappe/web_form/webform_script.js @@ -113,8 +113,9 @@ frappe.ready(function() { df.only_select = true; } if (["Attach", "Attach Image"].includes(df.fieldtype)) { - if (!df.options) + if (typeof df.options !== "object") { df.options = {}; + } df.options.disable_file_browser = true; } }); From 15493a9a23e4d0a5ef69431f13962b7549c15988 Mon Sep 17 00:00:00 2001 From: P-Froggy <60393001+P-Froggy@users.noreply.github.com> Date: Thu, 16 Apr 2020 09:49:41 +0200 Subject: [PATCH 36/49] fix: Incorrect translation of short format time difference strings (#9802) --- frappe/public/js/frappe/utils/pretty_date.js | 115 ++++++++++--------- frappe/translations/de.csv | 30 +++-- 2 files changed, 81 insertions(+), 64 deletions(-) diff --git a/frappe/public/js/frappe/utils/pretty_date.js b/frappe/public/js/frappe/utils/pretty_date.js index 1ad02e675c..060ae73a98 100644 --- a/frappe/public/js/frappe/utils/pretty_date.js +++ b/frappe/public/js/frappe/utils/pretty_date.js @@ -1,64 +1,71 @@ -// moment strings for translation +function prettyDate(date, mini) { + if (!date) return ''; -function prettyDate(time, mini) { - if (!time) { - time = new Date(); - } - if ('moment' in window) { // use frappe.ImportError ;) - let ret; - if (frappe.sys_defaults && frappe.sys_defaults.time_zone) { - ret = moment.tz(time, frappe.sys_defaults.time_zone).locale(frappe.boot.lang).fromNow(mini); - } else { - ret = moment(time).locale(frappe.boot.lang).fromNow(mini); - } - if (mini) { - if (ret === moment().locale(frappe.boot.lang).fromNow(mini)) { - ret = __("now"); - } else { - var parts = ret.split(" "); - if (parts.length > 1) { - if (parts[0] === "a" || parts[0] === "an") { - parts[0] = 1; - } - if (parts[1].substr(0, 2) === "mo") { - ret = parts[0] + " M"; - } else { - ret = parts[0] + " " + parts[1].substr(0, 1); - } - } + if (typeof (date) == "string") + date = new Date((date || "").replace(/-/g, "/").replace(/[TZ]/g, " ").replace(/\.[0-9]*/, "")); + + let diff = (((new Date()).getTime() - date.getTime()) / 1000); + let day_diff = Math.floor(diff / 86400); + + if (isNaN(day_diff) || day_diff < 0) return ''; + + if (mini) { + // Return short format of time difference + if (day_diff == 0) { + if (diff < 60) { + return __("Now"); + } else if (diff < 3600) { + return __("{0} m", [Math.floor(diff / 60)]); + } else if (diff < 86400) { + return __("{0} h", [Math.floor(diff / 3600)]); + } + } else { + if (day_diff < 7) { + return __("{0} D", [day_diff]); + } else if (day_diff < 31) { + return __("{0} W", [Math.ceil(day_diff / 7)]); + } else if (day_diff < 365) { + return __("{0} M", [Math.ceil(day_diff / 30)]); + } else { + return __("{0} Y", [Math.ceil(day_diff / 365)]); } - ret = ret.substr(0, 5); } - return ret; } else { - if (!time) return ''; - var date = time; - if (typeof (time) == "string") - date = new Date((time || "").replace(/-/g, "/").replace(/[TZ]/g, " ").replace(/\.[0-9]*/, "")); - - var diff = (((new Date()).getTime() - date.getTime()) / 1000), - day_diff = Math.floor(diff / 86400); - - if (isNaN(day_diff) || day_diff < 0) - return ''; - - var when = day_diff == 0 && ( - diff < 60 && __("just now") || - diff < 120 && __("1 minute ago") || - diff < 3600 && __("{0} minutes ago", [Math.floor(diff / 60)]) || - diff < 7200 && __("1 hour ago") || - diff < 86400 && ("{0} hours ago", [Math.floor(diff / 3600)])) || - day_diff == 1 && __("Yesterday") || - day_diff < 7 && __("{0} days ago", day_diff) || - day_diff < 31 && __("{0} weeks ago", [Math.ceil(day_diff / 7)]) || - day_diff < 365 && __("{0} months ago", [Math.ceil(day_diff / 30)]) || - __("> {0} year(s) ago", [Math.floor(day_diff / 365)]); - - return when; + // Return long format of time difference + if (day_diff == 0) { + if (diff < 60) { + return __("Just now"); + } else if (diff < 120) { + return __("1 minute ago"); + } else if (diff < 3600) { + return __("{0} minutes ago", [Math.floor(diff / 60)]); + } else if (diff < 7200) { + return __("1 hour ago"); + } else if (diff < 86400) { + return __("{0} hours ago", [Math.floor(diff / 3600)]); + } + } else { + if (day_diff == 1) { + return __("Yesterday"); + } else if (day_diff < 7) { + return __("{0} days ago", [day_diff]); + } else if (day_diff < 14) { + return __("1 week ago"); + } else if (day_diff < 31) { + return __("{0} weeks ago", [Math.ceil(day_diff / 7)]); + } else if (day_diff < 62) { + return __("1 month ago"); + } else if (day_diff < 365) { + return __("{0} months ago", [Math.ceil(day_diff / 30)]); + } else if (day_diff < 730) { + return __("1 year ago"); + } else { + return __("{0} years ago", [Math.ceil(day_diff / 365)]); + } + } } } - frappe.provide("frappe.datetime"); window.comment_when = function(datetime, mini) { var timestamp = frappe.datetime.str_to_user ? diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index efeb68df62..18d66591b3 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -63,7 +63,6 @@ apps/frappe/frappe/templates/emails/download_data.html,We have received a reques DocType: System Settings,"If enabled, the password strength will be enforced based on the Minimum Password Score value. A value of 2 being medium strong and 4 being very strong.","Falls diese Option aktiviert ist, wird die Passwortstärke auf der Grundlage des Minimum Password Score Wertes erzwungen. Ein Wert von 2 ist mittelstark und 4 sehr stark." DocType: About Us Settings,"""Team Members"" or ""Management""",„Teammitglieder“ oder „Management“ apps/frappe/frappe/core/doctype/doctype/doctype.py,Default for 'Check' type of field must be either '0' or '1',Standard für 'Prüfen'-Feldtyp muss entweder '0' oder '1' sein -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Yesterday,Gestern DocType: Contact,Designation,Bezeichnung apps/frappe/frappe/email/doctype/email_account/email_account.py,Automatic Linking can be activated only for one Email Account.,Die automatische Verknüpfung kann nur für ein E-Mail-Konto aktiviert werden. DocType: Test Runner,Test Runner,Tester @@ -120,7 +119,6 @@ DocType: Dashboard Chart,Timespan,Zeitspanne apps/frappe/frappe/public/js/frappe/file_uploader/FileUploader.vue,Web Link,Weblink DocType: Deleted Document,Restored,Restauriert apps/frappe/frappe/public/js/frappe/form/print.js,"Error connecting to QZ Tray Application...

You need to have QZ Tray application installed and running, to use the Raw Print feature.

Click here to Download and install QZ Tray.
Click here to learn more about Raw Printing.","Fehler beim Verbinden mit der QZ-Tray-Anwendung ...

Sie müssen die QZ Tray-Anwendung installiert haben und ausführen, um die Raw Print-Funktion verwenden zu können.

Klicken Sie hier, um QZ Tray herunterzuladen und zu installieren .
Klicken Sie hier, um mehr über den Rohdruck zu erfahren ." -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 minute ago,Vor 1 Minute apps/frappe/frappe/core/page/permission_manager/permission_manager_help.html,"Apart from System Manager, roles with Set User Permissions right can set permissions for other users for that Document Type.",Zusätzlich zum System-Manager können Rollen mit der Erlaubnis Benutzer anzulegen Berechtigungen für andere Nutzer für diesen Dokumententyp setzen. apps/frappe/frappe/website/doctype/website_theme/website_theme.js,Configure Theme,Thema konfigurieren DocType: Company History,Company History,Unternehmensgeschichte @@ -971,7 +969,6 @@ apps/frappe/frappe/public/js/frappe/list/list_view.js,Share URL,URL teilen DocType: System Settings,Allow Consecutive Login Attempts ,Erlaube aufeinanderfolgende Login-Versuche apps/frappe/frappe/templates/pages/integrations/stripe_checkout.html,An error occured during the payment process. Please contact us.,Während des Bezahlvorgangs ist ein Fehler aufgetreten. Bitte kontaktieren Sie uns. DocType: Onboarding Slide,If Slide Type is Create or Settings there should be a 'create_onboarding_docs' method in the {ref_doctype}.py file bound to be executed after the slide is completed.,"Wenn der Folientyp "Erstellen" oder "Einstellungen" ist, sollte die Methode "create_onboarding_docs" in der Datei "{ref_doctype} .py" enthalten sein, die nach Abschluss der Folie ausgeführt werden soll." -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} days ago,vor {0} Tag(en) DocType: Email Account,Awaiting Password,Warte auf Passwort DocType: Address,Address Line 1,Adresse Zeile 1 apps/frappe/frappe/public/js/frappe/ui/filters/filter.js,Not Descendants Of,Nicht Nachkommen von @@ -1360,7 +1357,6 @@ apps/frappe/frappe/social/doctype/energy_point_rule/energy_point_rule.py,Referen DocType: PayPal Settings,PayPal Settings,PayPal-Einstellungen apps/frappe/frappe/core/page/permission_manager/permission_manager.js,Select Document Type,Dokumenttyp auswählen apps/frappe/frappe/utils/nestedset.py,Cannot delete {0} as it has child nodes,"{0} kann nicht gelöscht werden, da es Unterknoten gibt" -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} minutes ago,vor {0} Minute(n) apps/frappe/frappe/automation/doctype/assignment_rule/assignment_rule.py,Assignment Day {0} has been repeated.,Der Zuordnungstag {0} wurde wiederholt. DocType: Kanban Board Column,lightblue,hellblau apps/frappe/frappe/integrations/doctype/webhook/webhook.py,Same Field is entered more than once,Gleiches Feld wird mehrmals eingegeben @@ -1787,7 +1783,6 @@ DocType: Notification Log,Assignment,Zuordnung DocType: Notification,Slack Channel,Slack-Kanal DocType: About Us Team Member,Image Link,Bildverknüpfung DocType: Auto Email Report,Report Filters,Berichtsfilter -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,now,jetzt DocType: Workflow State,step-backward,Schritt zurück apps/frappe/frappe/utils/boilerplate.py,{app_title},{app_title} apps/frappe/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py,Please set Dropbox access keys in your site config,Bitte Dropbox-Zugriffsdaten in den Einstellungen der Seite setzen @@ -2520,7 +2515,6 @@ apps/frappe/frappe/public/js/frappe/form/print.js,QZ Tray Connection Active!,QZ- DocType: Contact Us Settings,Settings for Contact Us Page,Einstellungen Kontakt DocType: Server Script,Script Type,Skripttyp DocType: Print Settings,Enable Print Server,Aktivieren Sie den Druckserver -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} weeks ago,vor {0} Woche(n) DocType: Email Account,Footer,Fußzeile apps/frappe/frappe/config/integrations.py,Authentication,Authentifizierung apps/frappe/frappe/utils/verified_command.py,Invalid Link,Ungültige Verknüpfung @@ -3444,7 +3438,6 @@ apps/frappe/frappe/integrations/doctype/ldap_settings/ldap_settings.py,Please In apps/frappe/frappe/core/doctype/data_import/log_details.html,Row Status,Zeilenstatus DocType: S3 Backup Settings,sa-east-1,sa-east-1 DocType: Workflow Transition,Workflow Transition,Workflow-Übergang -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} months ago,vor {0} Monate(n) apps/frappe/frappe/custom/doctype/custom_field/custom_field.py,Custom Fields can only be added to a standard DocType.,Benutzerdefinierte Felder können nur zu einem Standard-DocType hinzugefügt werden. apps/frappe/frappe/public/js/frappe/list/list_sidebar_group_by.js,Created By,Erstellt von apps/frappe/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py,Dropbox Setup,Dropbox-Setup @@ -3500,7 +3493,6 @@ apps/frappe/frappe/website/doctype/website_theme/website_theme.js,Theme Colors,T apps/frappe/frappe/printing/page/print_format_builder/print_format_builder.js,Select a DocType to make a new format,"DocType auswählen, um ein neues Format zu erstellen" apps/frappe/frappe/desk/page/user_profile/user_profile.js,User does not exist,Benutzer existiert nicht apps/frappe/frappe/automation/doctype/auto_repeat/auto_repeat.py,'Recipients' not specified,"Keine ""Empfänger"" angegeben" -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,just now,gerade eben apps/frappe/frappe/public/js/frappe/ui/filters/edit_filter.html,Apply,Anwenden DocType: Footer Item,Policy,Politik apps/frappe/frappe/integrations/utils.py,{0} Settings not found,{0} Einstellungen nicht gefunden @@ -3592,7 +3584,6 @@ DocType: Auto Email Report,Period,Periode apps/frappe/frappe/core/doctype/data_import_beta/data_import_beta.js,About {0} minute remaining,Noch ungefähr {0} Minuten apps/frappe/frappe/www/login.py,Invalid Login Token,Invalid Login Token apps/frappe/frappe/public/js/frappe/chat.js,Discard,Verwerfen -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 hour ago,vor 1 Stunde DocType: Website Settings,Home Page,Startseite DocType: Error Snapshot,Parent Error Snapshot,Momentaufnahme des übergeordneten Fehlers apps/frappe/frappe/public/js/frappe/data_import/import_preview.js,Map columns from {0} to fields in {1},Ordnen Sie Spalten von {0} Feldern in {1} zu. @@ -3804,7 +3795,6 @@ DocType: Webhook,on_update_after_submit,on_update_after_submit DocType: System Settings,Allow Login using User Name,Login mit Benutzernamen zulassen apps/frappe/frappe/core/doctype/report/report.js,Enable Report,Bericht aktivieren DocType: DocField,Display Depends On,Anzeige ist abhängig von -apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,> {0} year(s) ago,> {0} Jahr (e) her DocType: Social Login Key,API Endpoint,API-Endpunkt DocType: Web Page,Insert Code,Code einfügen DocType: Data Migration Run,Current Mapping Type,Aktueller Kartentyp @@ -4188,3 +4178,23 @@ DocType: DocField,Ignore User Permissions,Ignorieren von Benutzerberechtigungen apps/frappe/frappe/public/js/frappe/web_form/web_form.js,Saved Successfully,Erfolgreich gespeichert apps/frappe/frappe/core/doctype/user/user.py,Please ask your administrator to verify your sign-up,Bitte fragen Sie Ihren Administrator Ihre Anmeldung bis zum überprüfen DocType: Domain Settings,Active Domains,Aktive Domains +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Now,Jetzt +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} m,{0} m +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} h,{0} h +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} D,{0} T +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} W,{0} W +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} M,{0} M +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} Y,{0} J +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Just now,Gerade eben +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 minute ago,Vor einer Minute +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} minutes ago,Vor {0} Minuten +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 hour ago,Vor einer Stunde +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} hours ago,Vor {0} Stunden +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,Yesterday,Gestern +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} days ago,Vor {0} Tagen +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 week ago,Vor einer Woche +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} weeks ago,Vor {0} Wochen +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 month ago,Vor einem Monat +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} months ago,Vor {0} Monaten +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,1 year ago,Vor einem Jahr +apps/frappe/frappe/public/js/frappe/utils/pretty_date.js,{0} years ago,Vor {0} Jahren \ No newline at end of file From 326439a4d1e90b085aee8b2a6eef4536c1dbd545 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 16 Apr 2020 14:09:21 +0530 Subject: [PATCH 37/49] fix: backups dont break if one site is corrupted --- frappe/commands/site.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index fd43cc8cf3..b88e9f78c0 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -317,10 +317,18 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non "Backup" from frappe.utils.backups import scheduled_backup verbose = context.verbose + exit_code = 0 for site in context.sites: - frappe.init(site=site) - frappe.connect() - odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True) + try: + frappe.init(site=site) + frappe.connect() + odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True) + except Exception as e: + if verbose: + print("Backup failed for {0}. Database or site_config.json may be corrupted".format(site)) + exit_code = 1 + continue + if verbose: from frappe.utils import now print("database backup taken -", odb.backup_path_db, "- on", now()) @@ -329,6 +337,7 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non print("private files backup taken -", odb.backup_path_private_files, "- on", now()) frappe.destroy() + sys.exit(exit_code) @click.command('remove-from-installed-apps') @click.argument('app') From e20df3d83c4f76a05f40e832aff9fab097bb838a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 16 Apr 2020 14:19:01 +0530 Subject: [PATCH 38/49] fix(path): __init__ for v13_0 folder --- frappe/patches/v13_0/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 frappe/patches/v13_0/__init__.py diff --git a/frappe/patches/v13_0/__init__.py b/frappe/patches/v13_0/__init__.py new file mode 100644 index 0000000000..e69de29bb2 From feba8878d9739490c2240bc29cacfe022c86f5f3 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 16 Apr 2020 14:26:55 +0530 Subject: [PATCH 39/49] fix: increase the length of the password to maximum possible under current structure --- frappe/utils/password.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/utils/password.py b/frappe/utils/password.py index da5cdecc55..b939607b19 100644 --- a/frappe/utils/password.py +++ b/frappe/utils/password.py @@ -131,9 +131,9 @@ def create_auth_table(): frappe.db.create_auth_table() def encrypt(pwd): - if len(pwd) > 100: - # encrypting > 100 chars will lead to truncation - frappe.throw(_('Password cannot be more than 100 characters long')) + 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))) From ede263ca8c357ebba4718775ed2609b4c58dfae0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 16 Apr 2020 19:06:45 +0530 Subject: [PATCH 40/49] chore(linter): Skip only first argument --- .github/frappe_linter/translation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py index 63c4821775..bb81e848f1 100644 --- a/.github/frappe_linter/translation.py +++ b/.github/frappe_linter/translation.py @@ -5,8 +5,8 @@ errors_encounter = 0 pattern = re.compile(r"_\(([\"']{,3})(?P((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P((?!\11).)*)\11)*)*\)") start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") -# skip first 2 arguments -files = sys.argv[2:] +# skip first argument +files = sys.argv[1:] for _file in files: if not _file.endswith(('.py', '.js')): continue From d20de0495f5e6f55be57afd473a72028cb75467b Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 16 Apr 2020 20:21:23 +0530 Subject: [PATCH 41/49] fix: Remove focus outline from summary tag --- frappe/public/less/common.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/less/common.less b/frappe/public/less/common.less index b0aca5cb47..c2de48d553 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -32,6 +32,10 @@ details > summary { cursor: pointer; } +details > summary:focus { + outline: none; +} + .text-color { color: @text-color !important; } From c440f13bd1df0bd0b31dffc2f3c7239577b4a643 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:26:01 +0530 Subject: [PATCH 42/49] feat: Add checkbox option to text editor's toolbar --- frappe/public/js/frappe/form/controls/text_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index b35c92c1ae..4e18b081cc 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -147,7 +147,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ [{ 'color': [] }, { 'background': [] }], ['blockquote', 'code-block'], ['link', 'image'], - [{ 'list': 'ordered' }, { 'list': 'bullet' }], + [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'list': 'check' }], [{ 'align': [] }], [{ 'indent': '-1'}, { 'indent': '+1' }], [{'table': [ From 87f6c17dc887b27abe679d8b788635dbeac9d1e9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:31:01 +0530 Subject: [PATCH 43/49] Revert "feat: Add checkbox option to text editor's toolbar" This reverts commit c440f13bd1df0bd0b31dffc2f3c7239577b4a643. --- frappe/public/js/frappe/form/controls/text_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index 4e18b081cc..b35c92c1ae 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -147,7 +147,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ [{ 'color': [] }, { 'background': [] }], ['blockquote', 'code-block'], ['link', 'image'], - [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'list': 'check' }], + [{ 'list': 'ordered' }, { 'list': 'bullet' }], [{ 'align': [] }], [{ 'indent': '-1'}, { 'indent': '+1' }], [{'table': [ From 32330f46681fca749f3eca4026276a397df31950 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:26:01 +0530 Subject: [PATCH 44/49] feat: Add checkbox option to text editor's toolbar --- frappe/public/js/frappe/form/controls/text_editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index b35c92c1ae..4e18b081cc 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -147,7 +147,7 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({ [{ 'color': [] }, { 'background': [] }], ['blockquote', 'code-block'], ['link', 'image'], - [{ 'list': 'ordered' }, { 'list': 'bullet' }], + [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'list': 'check' }], [{ 'align': [] }], [{ 'indent': '-1'}, { 'indent': '+1' }], [{'table': [ From 051fa9b2cc08c1a8132504921f17ea49915cf6ee Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 16 Apr 2020 20:54:20 +0530 Subject: [PATCH 45/49] fix: Check is_dirty only if action is save --- frappe/public/js/frappe/form/save.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index d40b3ed341..7efbbe2d3d 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -21,7 +21,7 @@ frappe.ui.form.save = function (frm, action, callback, btn) { remove_empty_rows(); $(frm.wrapper).addClass('validated-form'); - if (frm.is_dirty() && check_mandatory()) { + if ((action !== 'Save' || frm.is_dirty()) && check_mandatory()) { _call({ method: "frappe.desk.form.save.savedocs", args: { doc: frm.doc, action: action }, From 0cdcfdcd9ed7cae9c3af17c86ae1ca47c170ff93 Mon Sep 17 00:00:00 2001 From: marination Date: Thu, 16 Apr 2020 22:13:51 +0530 Subject: [PATCH 46/49] fix: User should not be able to create a language --- frappe/core/doctype/language/language.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/language/language.json b/frappe/core/doctype/language/language.json index 099b383980..eed29883c1 100644 --- a/frappe/core/doctype/language/language.json +++ b/frappe/core/doctype/language/language.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_rename": 1, "autoname": "field:language_code", "creation": "2014-08-22 16:12:17.249590", @@ -41,7 +42,9 @@ } ], "icon": "fa fa-globe", - "modified": "2019-07-19 16:32:12.652550", + "in_create": 1, + "links": [], + "modified": "2020-04-16 22:11:33.066852", "modified_by": "Administrator", "module": "Core", "name": "Language", From 389034aea8d4eb359acf6e13fa3b7236b774a1b0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 17 Apr 2020 10:44:28 +0530 Subject: [PATCH 47/49] test: Increase defaultCommandTimeout to 10sec --- cypress.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cypress.json b/cypress.json index 7d853271b9..ae0c45c3ae 100644 --- a/cypress.json +++ b/cypress.json @@ -1,5 +1,7 @@ { "baseUrl": "http://test_site_ui:8000", "projectId": "92odwv", - "adminPassword": "admin" + "adminPassword": "admin", + "defaultCommandTimeout": 10000, + "pageLoadTimeout": 15000 } From 9a3998c43c156b1ec480c694e4e7b2e80d6a261e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 17 Apr 2020 11:17:31 +0530 Subject: [PATCH 48/49] fix(patch): reload doctype before running the patch --- frappe/patches/v13_0/website_theme_custom_scss.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py index 72c98bfc88..9d5a78643e 100644 --- a/frappe/patches/v13_0/website_theme_custom_scss.py +++ b/frappe/patches/v13_0/website_theme_custom_scss.py @@ -1,6 +1,7 @@ import frappe def execute(): + frappe.reload_doctype('Website Theme') for theme in frappe.get_all('Website Theme'): doc = frappe.get_doc('Website Theme', theme.name) if not doc.custom_scss and doc.theme_scss: From 37bae8cfac8bfca9c501c45ac9512ebe85c91f57 Mon Sep 17 00:00:00 2001 From: gavin Date: Fri, 17 Apr 2020 13:01:14 +0530 Subject: [PATCH 49/49] style: install_db re-arrange parameters Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/commands/site.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index 540f250918..9dcf97005a 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -81,9 +81,9 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N installing = touch_file(get_site_path('locks', 'installing.lock')) atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password) - install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, - db_name=db_name, admin_password=admin_password, verbose=verbose, - source_sql=source_sql, force=force, reinstall=reinstall, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) + install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, db_name=db_name, + admin_password=admin_password, verbose=verbose, source_sql=source_sql, force=force, reinstall=reinstall, + db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port, no_mariadb_socket=no_mariadb_socket) apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) for app in apps_to_install: _install_app(app, verbose=verbose, set_as_patched=not source_sql)