From 93b9ca86f78423339ae5830eb81dba39c04a40b5 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Tue, 29 Oct 2019 15:02:10 +0530 Subject: [PATCH 001/226] perf: optimise globals search --- .../global_search_settings.py | 11 +++- frappe/utils/global_search.py | 53 +++++++++---------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py index 0729fca5cb..42ac5db8d2 100644 --- a/frappe/desk/doctype/global_search_settings/global_search_settings.py +++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py @@ -29,12 +29,21 @@ class GlobalSearchSettings(Document): repeated_dts = (", ".join([frappe.bold(dt) for dt in repeated_dts])) frappe.throw(_("Document Type {0} has been repeated.").format(repeated_dts)) + def on_update(self): + get_doctypes_for_global_search() + def get_doctypes_for_global_search(): doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC") if not doctypes: return [] - return [d.document_type for d in doctypes] + priorities = [d.document_type for d in doctypes] + allowed_doctypes = ",".join(["'{0}'".format(dt) for dt in priorities]) + + frappe.cache().hset("global_search", "search_priorities", priorities) + frappe.cache().hset("global_search", "allowed_doctypes", allowed_doctypes) + + return priorities, allowed_doctypes @frappe.whitelist() def reset_global_search_settings_doctypes(): diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 447466770d..7c38298dc3 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -418,10 +418,19 @@ def search(text, start=0, limit=20, doctype=""): from frappe.desk.doctype.global_search_settings.global_search_settings import get_doctypes_for_global_search results = [] - texts = [t.strip() for t in text.split('&') if t] - priorities = get_doctypes_for_global_search() - allowed_doctypes = ",".join(["'{0}'".format(dt) for dt in priorities]) - for text in texts: + sorted_results = [] + + priorities = frappe.cache().hget("global_search", "search_priorities") + allowed_doctypes = frappe.cache().hget("global_search", "allowed_doctypes") + + if not priorities or not allowed_doctypes: + priorities, allowed_doctypes = get_doctypes_for_global_search() + + for text in set(text.split('&')): + text = text.strip() + if not text: + continue + mariadb_conditions = '' postgres_conditions = '' offset = '' @@ -455,36 +464,22 @@ def search(text, start=0, limit=20, doctype=""): 'postgres': common_query.format(fields=postgres_fields, conditions=postgres_conditions, limit=limit, offset=offset) }, as_dict=True) - tmp_result=[] - for i in result: - if i.rank > 0.0: - if i in results or not results: - tmp_result.extend([i]) - results.extend(tmp_result) - - for r in results: - try: - if frappe.get_meta(r.doctype).image_field: - r.image = frappe.db.get_value(r.doctype, r.name, frappe.get_meta(r.doctype).image_field) - except Exception: - frappe.clear_messages() - - sorted_results = [] + results.extend(result) for priority in priorities: - tmp_result = [] - if not results: - break - for index, r in enumerate(results): - if r.doctype == priority: - tmp_result.extend([r]) + if r.doctype == priority and r.rank > 0.0: + try: + meta = frappe.get_meta(r.doctype) + if meta.image_field: + r.image = frappe.db.get_value(r.doctype, r.name, meta.image_field) + except Exception: + frappe.clear_messages() + + sorted_results.extend([r]) results.pop(index) - sorted_results.extend(tmp_result) - - return sorted_results - + return sorted_results or results @frappe.whitelist(allow_guest=True) def web_search(text, scope=None, start=0, limit=20): From 369e4ff5782ef30d8e01506d4b3c58a1ec71d18f Mon Sep 17 00:00:00 2001 From: Himanshu Date: Tue, 29 Oct 2019 15:22:38 +0530 Subject: [PATCH 002/226] Patch(Tags): Check if column exists (#8682) * fix: tags patch * fix: auto_commit_on_many_writes * fix: check if tag exists * fix: check if tag or tag link exists * fix: check if column exists * fix: set autocommit false * fix: use ignore in insert query for bulk insert * fix: add option to ignore duplicates --- frappe/database/database.py | 5 +++-- frappe/patches.txt | 1 + frappe/patches/v12_0/setup_tags.py | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 95096ed2d9..1e6a85236e 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -968,7 +968,7 @@ class Database(object): frappe.flags.touched_tables = set() frappe.flags.touched_tables.update(tables) - def bulk_insert(self, doctype, fields, values): + def bulk_insert(self, doctype, fields, values, ignore_duplicates=False): """ Insert multiple records at a time @@ -982,7 +982,8 @@ class Database(object): for idx, value in enumerate(values): insert_list.append(tuple(value)) if idx and (idx%10000 == 0 or idx < len(values)-1): - self.sql("""INSERT INTO `tab{doctype}` ({fields}) VALUES {values}""".format( + self.sql("""INSERT {ignore_duplicates} INTO `tab{doctype}` ({fields}) VALUES {values}""".format( + ignore_duplicates="IGNORE" if ignore_duplicates else "", doctype=doctype, fields=fields, values=", ".join(['%s'] * len(insert_list)) diff --git a/frappe/patches.txt b/frappe/patches.txt index 8321debf3a..621a2107df 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -254,3 +254,4 @@ frappe.patches.v12_0.delete_duplicate_indexes frappe.patches.v12_0.set_default_incoming_email_port frappe.patches.v12_0.update_global_search execute:frappe.reload_doc('desk', 'doctype', 'notification_settings') +frappe.patches.v12_0.setup_tags diff --git a/frappe/patches/v12_0/setup_tags.py b/frappe/patches/v12_0/setup_tags.py index cd50b0d505..d663cb2e0e 100644 --- a/frappe/patches/v12_0/setup_tags.py +++ b/frappe/patches/v12_0/setup_tags.py @@ -12,19 +12,22 @@ def execute(): time = frappe.utils.get_datetime() for doctype in frappe.get_list("DocType", filters={"istable": 0, "issingle": 0}): - for dt_tags in frappe.db.sql("select `name`, `_user_tags` from `tab{0}`".format(doctype.name), as_dict=True): - tags = dt_tags.get("_user_tags").split(",") if dt_tags.get("_user_tags") else None - if not tags: + if not frappe.db.count(doctype.name) or not frappe.db.has_column(doctype.name, "_user_tags"): + continue + + for _user_tags in frappe.db.sql("select `name`, `_user_tags` from `tab{0}`".format(doctype.name), as_dict=True): + if not _user_tags.get("_user_tags"): continue - for tag in tags: + for tag in _user_tags.get("_user_tags").split(",") if _user_tags.get("_user_tags") else []: if not tag: continue tag_list.append((tag.strip(), time, time, 'Administrator')) - tag_link_name = frappe.generate_hash(dt_tags.name + tag.strip() + doctype.name, 10), - tag_links.append((tag_link_name, doctype.name, dt_tags.name, tag.strip(), time, time, 'Administrator')) + tag_link_name = frappe.generate_hash(_user_tags.name + tag.strip() + doctype.name, 10) + tag_links.append((tag_link_name, doctype.name, _user_tags.name, tag.strip(), time, time, 'Administrator')) - frappe.db.bulk_insert("Tag", fields=["name", "creation", "modified", "modified_by"], values=set(tag_list)) - frappe.db.bulk_insert("Tag Link", fields=["name", "document_type", "document_name", "tag", "creation", "modified", "modified_by"], values=set(tag_links)) \ No newline at end of file + + frappe.db.bulk_insert("Tag", fields=["name", "creation", "modified", "modified_by"], values=set(tag_list), ignore_duplicates=True) + frappe.db.bulk_insert("Tag Link", fields=["name", "document_type", "document_name", "tag", "creation", "modified", "modified_by"], values=set(tag_links), ignore_duplicates=True) From f185ed979088bf4e0906f721bc033f06c30dd7b9 Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Wed, 30 Oct 2019 13:09:26 +0550 Subject: [PATCH 003/226] bumped to version 12.0.18 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 6424dcd9b5..77207e017f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '12.0.17' +__version__ = '12.0.18' __title__ = "Frappe Framework" local = Local() From 7cd329fac97ee02745345a5ccd6eb4ac21839342 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 24 Sep 2019 00:16:44 +0530 Subject: [PATCH 004/226] reactor(scheduler): created "Scheduler Job Type" and cleaned up scheduler --- .pylintrc | 2 + frappe/__init__.py | 16 +- frappe/core/doctype/communication/email.py | 13 +- frappe/core/doctype/doctype/doctype.json | 15 +- .../core/doctype/doctype_action/__init__.py | 0 .../doctype_action/doctype_action.json | 54 ++++ .../doctype/doctype_action/doctype_action.py | 10 + .../doctype/scheduled_job_log/__init__.py | 0 .../scheduled_job_log/scheduled_job_log.js | 8 + .../scheduled_job_log/scheduled_job_log.json | 62 +++++ .../scheduled_job_log/scheduled_job_log.py | 10 + .../test_scheduled_job_log.py | 10 + .../doctype/scheduled_job_type/__init__.py | 0 .../scheduled_job_type/scheduled_job_type.js | 8 + .../scheduled_job_type.json | 92 +++++++ .../scheduled_job_type/scheduled_job_type.py | 129 +++++++++ .../test_scheduled_job_type.py | 62 +++++ frappe/core/doctype/version/version.py | 2 +- .../doctype/email_account/email_account.py | 3 +- frappe/email/doctype/newsletter/newsletter.py | 3 +- frappe/email/queue.py | 3 +- frappe/email/receive.py | 5 +- frappe/hooks.py | 13 +- frappe/migrate.py | 3 + frappe/model/__init__.py | 2 +- frappe/model/base_document.py | 8 +- frappe/model/document.py | 4 +- frappe/model/meta.py | 11 +- frappe/model/sync.py | 1 + frappe/patches.txt | 1 + frappe/public/js/frappe/form/form.js | 19 ++ frappe/test_runner.py | 2 +- frappe/tests/test_scheduler.py | 68 +---- frappe/utils/background_jobs.py | 6 +- frappe/utils/scheduler.py | 249 ++---------------- 35 files changed, 561 insertions(+), 333 deletions(-) create mode 100644 .pylintrc create mode 100644 frappe/core/doctype/doctype_action/__init__.py create mode 100644 frappe/core/doctype/doctype_action/doctype_action.json create mode 100644 frappe/core/doctype/doctype_action/doctype_action.py create mode 100644 frappe/core/doctype/scheduled_job_log/__init__.py create mode 100644 frappe/core/doctype/scheduled_job_log/scheduled_job_log.js create mode 100644 frappe/core/doctype/scheduled_job_log/scheduled_job_log.json create mode 100644 frappe/core/doctype/scheduled_job_log/scheduled_job_log.py create mode 100644 frappe/core/doctype/scheduled_job_log/test_scheduled_job_log.py create mode 100644 frappe/core/doctype/scheduled_job_type/__init__.py create mode 100644 frappe/core/doctype/scheduled_job_type/scheduled_job_type.js create mode 100644 frappe/core/doctype/scheduled_job_type/scheduled_job_type.json create mode 100644 frappe/core/doctype/scheduled_job_type/scheduled_job_type.py create mode 100644 frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000000..c11c0ab6a3 --- /dev/null +++ b/.pylintrc @@ -0,0 +1,2 @@ +disable=access-member-before-definition +disable=no-member \ No newline at end of file diff --git a/frappe/__init__.py b/frappe/__init__.py index 6424dcd9b5..5827541590 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -123,7 +123,6 @@ def init(site, sites_path=None, new_site=False): local.debug_log = [] local.realtime_log = [] local.flags = _dict({ - "ran_schedulers": [], "currently_saving": [], "redirect_location": "", "in_install_db": False, @@ -1504,7 +1503,20 @@ def logger(module=None, with_more_info=True): def log_error(message=None, title=None): '''Log error to Error Log''' - return get_doc(dict(doctype='Error Log', error=as_unicode(message or get_traceback()), + + # AI ALERT: + # the title and message may be swapped + # the better API for this is log_error(title, message), and used in many cases this way + # this hack tries to be smart about whats a title (single line ;-)) and fixes it + + if message: + if '\n' not in message: + title = message + error = get_traceback() + else: + error = message + + return get_doc(dict(doctype='Error Log', error=as_unicode(error), method=title)).insert(ignore_permissions=True) def get_desk_link(doctype, name): diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index a285941c68..361030d07a 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -10,7 +10,6 @@ from email.utils import formataddr from frappe.core.utils import get_parent_doc from frappe.utils import (get_url, get_formatted_email, cint, validate_email_address, split_emails, time_diff_in_seconds, parse_addr, get_datetime) -from frappe.utils.scheduler import log from frappe.email.email_body import get_message_id import frappe.email.smtp import time @@ -509,17 +508,7 @@ def sendmail(communication_name, print_html=None, print_format=None, attachments break except: - traceback = log("frappe.core.doctype.communication.email.sendmail", frappe.as_json({ - "communication_name": communication_name, - "print_html": print_html, - "print_format": print_format, - "attachments": attachments, - "recipients": recipients, - "cc": cc, - "bcc": bcc, - "lang": lang - })) - frappe.logger(__name__).error(traceback) + traceback = frappe.log_error("frappe.core.doctype.communication.email.sendmail") raise def update_mins_to_first_communication(parent, communication): diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json index a6a5e258ee..834ac9b60b 100644 --- a/frappe/core/doctype/doctype/doctype.json +++ b/frappe/core/doctype/doctype/doctype.json @@ -57,6 +57,8 @@ "restrict_to_domain", "read_only", "in_create", + "actions_section", + "actions", "web_view", "has_web_view", "allow_guest_to_view", @@ -454,11 +456,22 @@ "fieldname": "nsm_parent_field", "fieldtype": "Data", "label": "Parent Field (Tree)" + }, + { + "fieldname": "actions_section", + "fieldtype": "Section Break", + "label": "Actions" + }, + { + "fieldname": "actions", + "fieldtype": "Table", + "label": "Actions", + "options": "DocType Action" } ], "icon": "fa fa-bolt", "idx": 6, - "modified": "2019-09-07 14:28:05.392490", + "modified": "2019-09-23 16:29:21.209832", "modified_by": "Administrator", "module": "Core", "name": "DocType", diff --git a/frappe/core/doctype/doctype_action/__init__.py b/frappe/core/doctype/doctype_action/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/doctype_action/doctype_action.json b/frappe/core/doctype/doctype_action/doctype_action.json new file mode 100644 index 0000000000..86757ea050 --- /dev/null +++ b/frappe/core/doctype/doctype_action/doctype_action.json @@ -0,0 +1,54 @@ +{ + "actions": [], + "creation": "2019-09-23 16:28:13.953520", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "label", + "action_type", + "method", + "group" + ], + "fields": [ + { + "columns": 2, + "fieldname": "label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Label", + "reqd": 1 + }, + { + "columns": 6, + "fieldname": "method", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Method", + "reqd": 1 + }, + { + "fieldname": "group", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Group" + }, + { + "fieldname": "action_type", + "fieldtype": "Data", + "label": "Action Type", + "options": "Server Action" + } + ], + "istable": 1, + "modified": "2019-09-23 21:34:39.971700", + "modified_by": "Administrator", + "module": "Core", + "name": "DocType Action", + "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/core/doctype/doctype_action/doctype_action.py b/frappe/core/doctype/doctype_action/doctype_action.py new file mode 100644 index 0000000000..a745c7da40 --- /dev/null +++ b/frappe/core/doctype/doctype_action/doctype_action.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 DocTypeAction(Document): + pass diff --git a/frappe/core/doctype/scheduled_job_log/__init__.py b/frappe/core/doctype/scheduled_job_log/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.js b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.js new file mode 100644 index 0000000000..d43160c658 --- /dev/null +++ b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Scheduled Job Log', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json new file mode 100644 index 0000000000..cfa2f27d1a --- /dev/null +++ b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json @@ -0,0 +1,62 @@ +{ + "creation": "2019-09-23 14:36:36.935869", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "status", + "scheduled_job", + "details" + ], + "fields": [ + { + "fieldname": "status", + "fieldtype": "Select", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Status", + "options": "Scheduled\nSuccess\nFailed", + "read_only": 1, + "reqd": 1 + }, + { + "fieldname": "scheduled_job", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Scheduled Job", + "options": "Scheduled Job Type", + "read_only": 1, + "reqd": 1 + }, + { + "fieldname": "details", + "fieldtype": "Code", + "label": "Details", + "read_only": 1 + } + ], + "modified": "2019-09-23 14:36:36.935869", + "modified_by": "Administrator", + "module": "Core", + "name": "Scheduled Job Log", + "owner": "Administrator", + "permissions": [ + { + "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": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.py b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.py new file mode 100644 index 0000000000..26871c9adf --- /dev/null +++ b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 ScheduledJobLog(Document): + pass diff --git a/frappe/core/doctype/scheduled_job_log/test_scheduled_job_log.py b/frappe/core/doctype/scheduled_job_log/test_scheduled_job_log.py new file mode 100644 index 0000000000..1e5290425b --- /dev/null +++ b/frappe/core/doctype/scheduled_job_log/test_scheduled_job_log.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestScheduledJobLog(unittest.TestCase): + pass diff --git a/frappe/core/doctype/scheduled_job_type/__init__.py b/frappe/core/doctype/scheduled_job_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.js b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.js new file mode 100644 index 0000000000..55907b17fc --- /dev/null +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Scheduled Job Type', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json new file mode 100644 index 0000000000..c8dac630e9 --- /dev/null +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -0,0 +1,92 @@ +{ + "actions": [ + { + "action_path": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event", + "label": "Execute", + "method": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event" + } + ], + "creation": "2019-09-23 14:34:09.205368", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "stopped", + "method", + "queue", + "cron_format", + "last_execution", + "create_log" + ], + "fields": [ + { + "fieldname": "method", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Method", + "read_only": 1, + "reqd": 1 + }, + { + "fieldname": "queue", + "fieldtype": "Select", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Queue", + "options": "All\nHourly\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", + "read_only": 1, + "reqd": 1 + }, + { + "default": "0", + "fieldname": "stopped", + "fieldtype": "Check", + "label": "Stopped" + }, + { + "default": "0", + "depends_on": "eval:doc.queue==='All'", + "fieldname": "create_log", + "fieldtype": "Check", + "label": "Create Log" + }, + { + "fieldname": "last_execution", + "fieldtype": "Datetime", + "label": "Last Execution", + "read_only": 1 + }, + { + "allow_in_quick_entry": 1, + "depends_on": "eval:doc.queue==='Cron'", + "fieldname": "cron_format", + "fieldtype": "Data", + "label": "Cron Format", + "read_only": 1 + } + ], + "in_create": 1, + "modified": "2019-09-23 22:19:22.594874", + "modified_by": "Administrator", + "module": "Core", + "name": "Scheduled Job Type", + "owner": "Administrator", + "permissions": [ + { + "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": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py new file mode 100644 index 0000000000..6733ddb014 --- /dev/null +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -0,0 +1,129 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals + +import frappe, json +from frappe.model.document import Document +from frappe.utils import now_datetime, get_datetime +from datetime import datetime +from croniter import croniter +from frappe.utils.background_jobs import enqueue + +CRON_MAP = { + "Yearly": "0 0 1 1 *", + "Annual": "0 0 1 1 *", + "Monthly": "0 0 1 * *", + "Monthly Long": "0 0 1 * *", + "Weekly": "0 0 * * 0", + "Weekly Long": "0 0 * * 0", + "Daily": "0 0 * * *", + "Daily Long": "0 0 * * *", + "Hourly": "0 * * * *", + "Hourly Long": "0 * * * *", + "All": "0/" + str((frappe.get_conf().scheduler_interval or 240) // 60) + " * * * *", +} + +class ScheduledJobType(Document): + def autoname(self): + self.name = '.'.join(self.method.split('.')[-2:]) + + def validate(self): + if self.queue != 'All': + # force logging for all events other than continuous ones (ALL) + self.create_log = 1 + + def enqueue(self): + # enqueue event if last execution is done + if self.is_event_due(): + self.update_last_execution() + frappe.flags.enqueued_jobs.append(self.method) + enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', + job_type=self.method) + + def is_event_due(self, current_time = None): + '''Return true if event is due based on time lapsed since last execution''' + # save last execution in expected execution time as per cron + self.last_execution = self.get_next_execution() + + # if the next scheduled event is before NOW, then its due! + return self.last_execution <= (current_time or now_datetime()) + + def get_next_execution(self): + if not self.cron_format: + self.cron_format = CRON_MAP[self.queue] + + return croniter(self.cron_format, + get_datetime(self.last_execution)).get_next(datetime) + + def execute(self): + try: + frappe.logger(__name__).info('Started Scheduled Job: {0} for {1}'.format(self.method, frappe.local.site)) + frappe.get_attr(self.method)() + frappe.db.commit() + frappe.logger(__name__).info('Completed Scheduled Job: {0} for {1}'.format(self.method, frappe.local.site)) + except Exception: + frappe.db.rollback() + frappe.log_error('{} failed'.format(self.method)) + frappe.logger(__name__).info('Failed Scheduled Job: {0} for {1}'.format(self.method, frappe.local.site)) + + + def update_last_execution(self): + self.db_set('last_execution', self.last_execution, update_modified=False) + frappe.db.commit() + + def get_queue_name(self): + return self.queue.replace(' ', '_').lower() + +@frappe.whitelist() +def execute_event(doc): + frappe.only_for('System Manager') + doc = json.loads(doc) + frappe.get_doc('Scheduled Job Type', doc.get('name')).execute() + +def run_scheduled_job(job_type): + '''This is a wrapper function that runs a hooks.scheduler_events method''' + frappe.get_doc('Scheduled Job Type', dict(method=job_type)).execute() + +def sync_jobs(): + frappe.reload_doc('core', 'doctype', 'scheduled_job_type') + all_events = [] + scheduler_events = frappe.get_hooks("scheduler_events") + insert_events(all_events, scheduler_events) + clear_events(all_events, scheduler_events) + +def insert_events(all_events, scheduler_events): + for event_type in scheduler_events: + events = scheduler_events.get(event_type) + if isinstance(events, dict): + insert_cron_event(events, all_events) + else: + # hourly, daily etc + insert_event_list(events, event_type, all_events) + +def insert_cron_event(events, all_events): + for cron_format in events: + for event in events.get(cron_format): + all_events.append(event) + insert_single_event('Cron', event, cron_format) + +def insert_event_list(events, event_type, all_events): + for event in events: + all_events.append(event) + queue = event_type.replace('_', ' ').title() + insert_single_event(queue, event) + +def insert_single_event(queue, event, cron_format = None): + if not frappe.db.exists('Scheduled Job Type', dict(method=event)): + frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = event, + cron_format = cron_format, + queue = queue + )).insert() + +def clear_events(all_events, scheduler_events): + for event in frappe.get_all('Scheduled Job Type', ('name', 'method')): + if event.method not in all_events: + frappe.db.delete_doc('Scheduled Job Type', event.name) diff --git a/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py new file mode 100644 index 0000000000..75af876367 --- /dev/null +++ b/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py @@ -0,0 +1,62 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +import frappe +import unittest +from frappe.utils import get_datetime + +from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs + +class TestScheduledJobType(unittest.TestCase): + def setUp(self): + if not frappe.get_all('Scheduled Job Type', limit=1): + frappe.db.rollback() + frappe.db.sql('truncate `tabScheduled Job Type`') + sync_jobs() + frappe.db.commit() + + def test_sync_jobs(self): + all_job = frappe.get_doc('Scheduled Job Type', + dict(method='frappe.email.queue.flush')) + self.assertEqual(all_job.queue, 'All') + + daily_job = frappe.get_doc('Scheduled Job Type', + dict(method='frappe.email.queue.clear_outbox')) + self.assertEqual(daily_job.queue, 'Daily') + + # check if cron jobs are synced + cron_job = frappe.get_doc('Scheduled Job Type', + dict(method='frappe.oauth.delete_oauth2_data')) + self.assertEqual(cron_job.queue, 'Cron') + self.assertEqual(cron_job.cron_format, '0/15 * * * *') + + def test_daily_job(self): + job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.email.queue.clear_outbox')) + job.db_set('last_execution', '2019-01-01 00:00:00') + self.assertTrue(job.is_event_due(get_datetime('2019-01-02 00:00:06'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-01 00:00:06'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-01 23:59:59'))) + + def test_weekly_job(self): + job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.utils.change_log.check_for_update')) + job.db_set('last_execution', '2019-01-01 00:00:00') + self.assertTrue(job.is_event_due(get_datetime('2019-01-06 00:00:01'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-02 00:00:06'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-05 23:59:59'))) + + def test_monthly_job(self): + job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.email.doctype.auto_email_report.auto_email_report.send_monthly')) + job.db_set('last_execution', '2019-01-01 00:00:00') + self.assertTrue(job.is_event_due(get_datetime('2019-02-01 00:00:01'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-15 00:00:06'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-31 23:59:59'))) + + def test_cron_job(self): + # runs every 15 mins + job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.oauth.delete_oauth2_data')) + job.db_set('last_execution', '2019-01-01 00:00:00') + self.assertTrue(job.is_event_due(get_datetime('2019-01-01 00:15:01'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-01 00:05:06'))) + self.assertFalse(job.is_event_due(get_datetime('2019-01-01 00:14:59'))) diff --git a/frappe/core/doctype/version/version.py b/frappe/core/doctype/version/version.py index 05cc102ab9..cb891afa0c 100644 --- a/frappe/core/doctype/version/version.py +++ b/frappe/core/doctype/version/version.py @@ -50,7 +50,7 @@ def get_diff(old, new, for_child=False): if df.fieldtype in no_value_fields and df.fieldtype not in table_fields: continue - old_value, new_value = old.get(df.fieldname), new.get(df.fieldname) + old_value, new_value = old.get(df.fieldname) or [], new.get(df.fieldname) or [] if df.fieldtype in table_fields: # make maps diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index f10f08664c..c05a0f3fe4 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -21,7 +21,6 @@ from frappe.desk.form import assign_to from frappe.utils.user import get_system_managers from frappe.utils.background_jobs import enqueue, get_jobs from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts -from frappe.utils.scheduler import log from frappe.utils.html_utils import clean_email_html from frappe.email.utils import get_port @@ -284,7 +283,7 @@ class EmailAccount(Document): except Exception: frappe.db.rollback() - log('email_account.receive') + frappe.log_error('email_account.receive') if self.use_imap: self.handle_bad_emails(email_server, uid, msg, frappe.get_traceback()) exceptions.append(frappe.get_traceback()) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 4f3e7994a5..b0d1756643 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -9,7 +9,6 @@ from frappe import throw, _ from frappe.website.website_generator import WebsiteGenerator from frappe.utils.verified_command import get_signed_params, verify_request from frappe.utils.background_jobs import enqueue -from frappe.utils.scheduler import log from frappe.email.queue import send from frappe.email.doctype.email_group.email_group import add_subscribers from frappe.utils import parse_addr @@ -213,7 +212,7 @@ def send_newsletter(newsletter): doc.db_set("email_sent", 0) frappe.db.commit() - log("send_newsletter") + frappe.log_error("send_newsletter") raise diff --git a/frappe/email/queue.py b/frappe/email/queue.py index f51451751d..792b47296a 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -12,7 +12,6 @@ from frappe.utils.verified_command import get_signed_params, verify_request from html2text import html2text from frappe.utils import get_url, nowdate, encode, now_datetime, add_days, split_emails, cstr, cint from rq.timeouts import JobTimeoutException -from frappe.utils.scheduler import log from six import text_type, string_types class EmailLimitCrossedError(frappe.ValidationError): pass @@ -469,7 +468,7 @@ def send_one(email, smtpserver=None, auto_commit=True, now=False, from_test=Fals else: # log to Error Log - log('frappe.email.queue.flush', text_type(e)) + frappe.log_error('frappe.email.queue.flush') def prepare_message(email, recipient, recipients_list): message = email.message diff --git a/frappe/email/receive.py b/frappe/email/receive.py index ee7075b570..ac48b3e070 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -12,7 +12,6 @@ import frappe from frappe import _, safe_decode, safe_encode from frappe.utils import (extract_email_id, convert_utc_to_user_timezone, now, cint, cstr, strip, markdown, parse_addr) -from frappe.utils.scheduler import log from frappe.core.doctype.file.file import get_random_filename, MaxFileSizeReachedError class EmailSizeExceededError(frappe.ValidationError): pass @@ -80,7 +79,7 @@ class EmailServer: except _socket.error: # log performs rollback and logs error in Error Log - log("receive.connect_pop") + frappe.log_error("receive.connect_pop") # Invalid mail server -- due to refusing connection frappe.msgprint(_('Invalid Mail Server. Please rectify and try again.')) @@ -255,7 +254,7 @@ class EmailServer: else: # log performs rollback and logs error in Error Log - log("receive.get_messages", self.make_error_msg(msg_num, incoming_mail)) + frappe.log_error("receive.get_messages", self.make_error_msg(msg_num, incoming_mail)) self.errors = True frappe.db.rollback() diff --git a/frappe/hooks.py b/frappe/hooks.py index b35387efe9..5406d0fc57 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -76,8 +76,7 @@ leaderboards = "frappe.desk.leaderboard.get_leaderboards" on_session_creation = [ "frappe.core.doctype.activity_log.feed.login_feed", - "frappe.core.doctype.user.user.notify_admin_access_to_system_manager", - "frappe.utils.scheduler.reset_enabled_scheduler_events", + "frappe.core.doctype.user.user.notify_admin_access_to_system_manager" ] on_logout = "frappe.core.doctype.session_default_settings.session_default_settings.clear_session_defaults" @@ -153,14 +152,18 @@ doc_events = { } scheduler_events = { + "cron": { + "0/15 * * * *": [ + "frappe.oauth.delete_oauth2_data", + "frappe.website.doctype.web_page.web_page.check_publish_status", + "frappe.twofactor.delete_all_barcodes_for_users" + ] + }, "all": [ "frappe.email.queue.flush", "frappe.email.doctype.email_account.email_account.pull", "frappe.email.doctype.email_account.email_account.notify_unreplied", - "frappe.oauth.delete_oauth2_data", "frappe.integrations.doctype.razorpay_settings.razorpay_settings.capture_payment", - "frappe.twofactor.delete_all_barcodes_for_users", - "frappe.website.doctype.web_page.web_page.check_publish_status", 'frappe.utils.global_search.sync_global_search' ], "hourly": [ diff --git a/frappe/migrate.py b/frappe/migrate.py index 6778a3f18f..043b6817d7 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -15,6 +15,7 @@ from frappe.desk.notifications import clear_notifications from frappe.website import render from frappe.core.doctype.language.language import sync_languages from frappe.modules.utils import sync_customizations +from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs from frappe.utils import global_search def migrate(verbose=True, rebuild_website=False, skip_failing=False): @@ -46,9 +47,11 @@ def migrate(verbose=True, rebuild_website=False, skip_failing=False): # run patches frappe.modules.patch_handler.run_all(skip_failing) + # sync frappe.model.sync.sync_all(verbose=verbose) frappe.translate.clear_cache() + sync_jobs() sync_fixtures() sync_customizations() sync_languages() diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 09db9bb68a..1c6f965d42 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -45,7 +45,7 @@ default_fields = ('doctype','name','owner','creation','modified','modified_by', 'parent','parentfield','parenttype','idx','docstatus') optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by", "_seen") table_fields = ('Table', 'Table MultiSelect') -core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'User', 'Role', 'Has Role', +core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'DocType Action','User', 'Role', 'Has Role', 'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form', 'Customize Form Field', 'Property Setter', 'Custom Field', 'Custom Script') diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 6c917b8d4d..1648c64a13 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -22,6 +22,8 @@ max_positive_value = { 'bigint': 2 ** 63 } +DOCTYPES_FOR_DOCTYPE = ('DocType', 'DocField', 'DocPerm', 'DocType Action') + _classes = {} def get_controller(doctype): @@ -255,7 +257,7 @@ class BaseDocument(object): def get_valid_columns(self): if self.doctype not in frappe.local.valid_columns: - if self.doctype in ("DocField", "DocPerm") and self.parent in ("DocType", "DocField", "DocPerm"): + if self.doctype in DOCTYPES_FOR_DOCTYPE: from frappe.model.meta import get_table_columns valid = get_table_columns(self.doctype) else: @@ -312,7 +314,7 @@ class BaseDocument(object): self.created_by = self.modified_by = frappe.session.user # if doctype is "DocType", don't insert null values as we don't know who is valid yet - d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm')) + d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in DOCTYPES_FOR_DOCTYPE) columns = list(d) try: @@ -347,7 +349,7 @@ class BaseDocument(object): self.db_insert() return - d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in ('DocType', 'DocField', 'DocPerm')) + d = self.get_valid_dict(convert_dates_to_str=True, ignore_nulls = self.doctype in DOCTYPES_FOR_DOCTYPE) # don't update name, as case might've been changed name = d['name'] diff --git a/frappe/model/document.py b/frappe/model/document.py index 7f04895308..c58e09ef5a 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -150,8 +150,8 @@ class Document(BaseDocument): super(Document, self).__init__(d) if self.name=="DocType" and self.doctype=="DocType": - from frappe.model.meta import doctype_table_fields - table_fields = doctype_table_fields + from frappe.model.meta import DOCTYPE_TABLE_FIELDS + table_fields = DOCTYPE_TABLE_FIELDS else: table_fields = self.meta.get_table_fields() diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 0b1011b119..cd342b77aa 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -151,7 +151,7 @@ class Meta(Document): if self.name!="DocType": self._table_fields = self.get('fields', {"fieldtype": ['in', table_fields]}) else: - self._table_fields = doctype_table_fields + self._table_fields = DOCTYPE_TABLE_FIELDS return self._table_fields @@ -165,7 +165,7 @@ class Meta(Document): def get_valid_columns(self): if not hasattr(self, "_valid_columns"): - if self.name in ("DocType", "DocField", "DocPerm", "Property Setter"): + if self.name in ("DocType", "DocField", "DocPerm", 'DocType Action',"Property Setter"): self._valid_columns = get_table_columns(self.name) else: self._valid_columns = self.default_fields + \ @@ -174,7 +174,7 @@ class Meta(Document): return self._valid_columns def get_table_field_doctype(self, fieldname): - return { "fields": "DocField", "permissions": "DocPerm"}.get(fieldname) + return { "fields": "DocField", "permissions": "DocPerm", "actions": "DocType Action"}.get(fieldname) def get_field(self, fieldname): '''Return docfield from meta''' @@ -441,9 +441,10 @@ class Meta(Document): def is_nested_set(self): return self.has_field('lft') and self.has_field('rgt') -doctype_table_fields = [ +DOCTYPE_TABLE_FIELDS = [ frappe._dict({"fieldname": "fields", "options": "DocField"}), - frappe._dict({"fieldname": "permissions", "options": "DocPerm"}) + frappe._dict({"fieldname": "permissions", "options": "DocPerm"}), + frappe._dict({"fieldname": "actions", "options": "DocType Action"}), ] ####### diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 18bf827c5f..070ab6bbc7 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -29,6 +29,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe # these need to go first at time of install for d in (("core", "docfield"), ("core", "docperm"), + ("core", "doctype_action"), ("core", "role"), ("core", "has_role"), ("core", "doctype"), diff --git a/frappe/patches.txt b/frappe/patches.txt index e107449dea..1a89641a6a 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -9,6 +9,7 @@ frappe.patches.v7_2.remove_in_filter frappe.patches.v11_0.drop_column_apply_user_permissions execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22 execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20 +execute:frappe.reload_doc('core', 'doctype', 'doctype_action', force=True) #2019-09-23 execute:frappe.reload_doc('core', 'doctype', 'custom_docperm') execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29 execute:frappe.reload_doc('core', 'doctype', 'comment') diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 5a983986d8..edf8860a01 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -111,6 +111,7 @@ frappe.ui.form.Form = class FrappeForm { $("body").attr("data-sidebar", 1); } this.setup_file_drop(); + this.setup_doctype_actions(); this.setup_done = true; } @@ -319,6 +320,24 @@ frappe.ui.form.Form = class FrappeForm { } } + // sets up the refresh event for custom buttons + // added via configuration + setup_doctype_actions() { + if (this.meta.actions) { + for (let action of this.meta.actions) { + frappe.ui.form.on(this.doctype, 'refresh', () => { + if (!this.is_new()) { + this.add_custom_button(action.label, () => { + frappe.xcall(action.method, {doc: this.doc}).then(() => { + frappe.msgprint({message:__('Event Executed'), alert:true}); + }); + }, action.group); + } + }); + } + } + } + switch_doc(docname) { // record switch if(this.docname != docname && (!this.meta.in_dialog || this.in_form) && !this.meta.istable) { diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 76140e442c..d06d890ac9 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -71,7 +71,7 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), else: ret = run_all_tests(app, verbose, profile, ui_tests, failfast=failfast) - frappe.db.commit() + if frappe.db: frappe.db.commit() # workaround! since there is no separate test db frappe.clear_cache() diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 1f8c7943c4..4e193354b0 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -2,11 +2,9 @@ from __future__ import unicode_literals from unittest import TestCase from dateutil.relativedelta import relativedelta -from frappe.utils.scheduler import (enqueue_applicable_events, restrict_scheduler_events_if_dormant, - get_enabled_scheduler_events) -from frappe import _dict +from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs from frappe.utils.background_jobs import enqueue -from frappe.utils import now_datetime, today, add_days, add_to_date +from frappe.utils.scheduler import enqueue_events import frappe import time @@ -17,60 +15,19 @@ def test_timeout(): class TestScheduler(TestCase): def setUp(self): - frappe.db.set_global('enabled_scheduler_events', "") - frappe.flags.ran_schedulers = [] - - def test_all_events(self): - last = now_datetime() - relativedelta(hours=2) - enqueue_applicable_events(frappe.local.site, now_datetime(), last) - self.assertTrue("all" in frappe.flags.ran_schedulers) - - def test_enabled_events(self): - frappe.flags.enabled_events = ["hourly", "hourly_long", "daily", "daily_long", - "weekly", "weekly_long", "monthly", "monthly_long"] - - # maintain last_event and next_event on the same day - last_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) - next_event = last_event + relativedelta(minutes=30) - - enqueue_applicable_events(frappe.local.site, next_event, last_event) - self.assertFalse("cron" in frappe.flags.ran_schedulers) - - # maintain last_event and next_event on the same day - last_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) - next_event = last_event + relativedelta(hours=2) - - frappe.flags.ran_schedulers = [] - enqueue_applicable_events(frappe.local.site, next_event, last_event) - self.assertTrue("all" in frappe.flags.ran_schedulers) - self.assertTrue("hourly" in frappe.flags.ran_schedulers) - - frappe.flags.enabled_events = None - - def test_enabled_events_day_change(self): - - # use flags instead of globals as this test fails intermittently - # the root cause has not been identified but the culprit seems cache - # since cache is mutable, it maybe be changed by a parallel process - frappe.flags.enabled_events = ["daily", "daily_long", "weekly", "weekly_long", - "monthly", "monthly_long"] - - # maintain last_event and next_event on different days - next_event = now_datetime().replace(hour=0, minute=0, second=0, microsecond=0) - last_event = next_event - relativedelta(hours=2) - - frappe.flags.ran_schedulers = [] - enqueue_applicable_events(frappe.local.site, next_event, last_event) - self.assertTrue("all" in frappe.flags.ran_schedulers) - self.assertFalse("hourly" in frappe.flags.ran_schedulers) - - frappe.flags.enabled_events = None - - + if not frappe.get_all('Scheduled Job Type', limit=1): + sync_jobs() + def test_enqueue_jobs(self): + frappe.db.sql('update `tabScheduled Job Type` set last_execution = "2010-01-01 00:00:00"') + enqueue_events(site = frappe.local.site) + self.assertTrue('frappe.email.queue.clear_outbox', frappe.flags.enqueued_jobs) + self.assertTrue('frappe.utils.change_log.check_for_update', frappe.flags.enqueued_jobs) + self.assertTrue('frappe.email.doctype.auto_email_report.auto_email_report.send_monthly', frappe.flags.enqueued_jobs) def test_job_timeout(self): + return job = enqueue(test_timeout, timeout=10) count = 5 while count > 0: @@ -80,6 +37,3 @@ class TestScheduler(TestCase): break self.assertTrue(job.is_failed) - - def tearDown(self): - frappe.flags.ran_schedulers = [] diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index ef345c67df..61e866e2f8 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -79,8 +79,6 @@ def run_doc_method(doctype, name, doc_method, **kwargs): def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True, retry=0): '''Executes job in a worker, performs commit/rollback and logs if there is any error''' - from frappe.utils.scheduler import log - if is_async: frappe.connect(site) if os.environ.get('CI'): @@ -115,12 +113,12 @@ def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True, is_async=is_async, retry=retry+1) else: - log(method_name, message=repr(locals())) + frappe.log_error(method_name) raise except: frappe.db.rollback() - log(method_name, message=repr(locals())) + frappe.log_error(method_name) raise else: diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index 68c3bc58a8..efd7fc6c12 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -10,38 +10,15 @@ Events: from __future__ import unicode_literals, print_function -import frappe -import json +import frappe, os, time import schedule -import time -import frappe.utils -import os +from frappe.utils import now_datetime, get_datetime from frappe.utils import get_sites -from datetime import datetime -from frappe.utils.background_jobs import enqueue, get_jobs, queue_timeout -from frappe.utils.data import get_datetime, now_datetime from frappe.core.doctype.user.user import STANDARD_USERS -from frappe.installer import update_site_config -from six import string_types -from croniter import croniter +from frappe.utils.background_jobs import get_jobs DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S' -cron_map = { - "yearly": "0 0 1 1 *", - "annual": "0 0 1 1 *", - "monthly": "0 0 1 * *", - "monthly_long": "0 0 1 * *", - "weekly": "0 0 * * 0", - "weekly_long": "0 0 * * 0", - "daily": "0 0 * * *", - "daily_long": "0 0 * * *", - "midnight": "0 0 * * *", - "hourly": "0 * * * *", - "hourly_long": "0 * * * *", - "all": "0/" + str((frappe.get_conf().scheduler_interval or 240) // 60) + " * * * *", -} - def start_scheduler(): '''Run enqueue_events_for_all_sites every 2 minutes (default). Specify scheduler_interval in seconds in common_site_config.json''' @@ -60,17 +37,16 @@ def enqueue_events_for_all_sites(): return with frappe.init_site(): - jobs_per_site = get_jobs() sites = get_sites() for site in sites: try: - enqueue_events_for_site(site=site, queued_jobs=jobs_per_site[site]) + enqueue_events_for_site(site=site) except: # it should try to enqueue other sites print(frappe.get_traceback()) -def enqueue_events_for_site(site, queued_jobs): +def enqueue_events_for_site(site): def log_and_raise(): frappe.logger(__name__).error('Exception in Enqueue Events for Site {0}'.format(site) + '\n' + frappe.get_traceback()) @@ -82,7 +58,7 @@ def enqueue_events_for_site(site, queued_jobs): if is_scheduler_inactive(): return - enqueue_events(site=site, queued_jobs=queued_jobs) + enqueue_events(site=site) frappe.logger(__name__).debug('Queued events for site {0}'.format(site)) except frappe.db.OperationalError as e: @@ -96,128 +72,13 @@ def enqueue_events_for_site(site, queued_jobs): finally: frappe.destroy() -def enqueue_events(site, queued_jobs): - nowtime = frappe.utils.now_datetime() - last = frappe.db.get_value('System Settings', 'System Settings', 'scheduler_last_event') - - # set scheduler last event - frappe.db.set_value('System Settings', 'System Settings', - 'scheduler_last_event', nowtime.strftime(DATETIME_FORMAT), - update_modified=False) - frappe.db.commit() - - out = [] - if last: - last = datetime.strptime(last, DATETIME_FORMAT) - out = enqueue_applicable_events(site, nowtime, last, queued_jobs) - - return '\n'.join(out) - -def enqueue_applicable_events(site, nowtime, last, queued_jobs=()): - nowtime_str = nowtime.strftime(DATETIME_FORMAT) - out = [] - - enabled_events = get_enabled_scheduler_events() - - def trigger_if_enabled(site, event, last, queued_jobs): - trigger(site, event, last, queued_jobs) - _log(event) - - def _log(event): - out.append("{time} - {event} - queued".format(time=nowtime_str, event=event)) - - for event in enabled_events: - trigger_if_enabled(site, event, last, queued_jobs) - - if "all" not in enabled_events: - trigger_if_enabled(site, "all", last, queued_jobs) - - return out - -def trigger(site, event, last=None, queued_jobs=(), now=False): - """Trigger method in hooks.scheduler_events.""" - - queue = 'long' if event.endswith('_long') else 'short' - timeout = queue_timeout[queue] - if not queued_jobs and not now: - queued_jobs = get_jobs(site=site, queue=queue) - - if frappe.flags.in_test: - frappe.flags.ran_schedulers.append(event) - - events_from_hooks = get_scheduler_events(event) - if not events_from_hooks: - return - - events = events_from_hooks - if not now: - events = [] - if event == "cron": - for e in events_from_hooks: - e = cron_map.get(e, e) - if croniter.is_valid(e): - if croniter(e, last).get_next(datetime) <= frappe.utils.now_datetime(): - events.extend(events_from_hooks[e]) - else: - frappe.log_error("Cron string " + e + " is not valid", "Error triggering cron job") - frappe.logger(__name__).error('Exception in Trigger Events for Site {0}, Cron String {1}'.format(site, e)) - - else: - if croniter(cron_map[event], last).get_next(datetime) <= frappe.utils.now_datetime(): - events.extend(events_from_hooks) - - for handler in events: - if not now: - if handler not in queued_jobs: - enqueue(handler, queue, timeout, event) - else: - scheduler_task(site=site, event=event, handler=handler, now=True) - -def get_scheduler_events(event): - '''Get scheduler events from hooks and integrations''' - scheduler_events = frappe.cache().get_value('scheduler_events') - if not scheduler_events: - scheduler_events = frappe.get_hooks("scheduler_events") - frappe.cache().set_value('scheduler_events', scheduler_events) - - return scheduler_events.get(event) or [] - -def log(method, message=None): - """log error in patch_log""" - message = frappe.utils.cstr(message) + "\n" if message else "" - message += frappe.get_traceback() - - if not (frappe.db and frappe.db._conn): - frappe.connect() - - frappe.db.rollback() - frappe.db.begin() - - d = frappe.new_doc("Error Log") - d.method = method - d.error = message - d.insert(ignore_permissions=True) - - frappe.db.commit() - - return message - -def get_enabled_scheduler_events(): - if 'enabled_events' in frappe.flags and frappe.flags.enabled_events: - return frappe.flags.enabled_events - - enabled_events = frappe.db.get_global("enabled_scheduler_events") - if frappe.flags.in_test: - # TEMP for debug: this test fails randomly - print('found enabled_scheduler_events {0}'.format(enabled_events)) - - if enabled_events: - if isinstance(enabled_events, string_types): - enabled_events = json.loads(enabled_events) - return enabled_events - - return ["all", "hourly", "hourly_long", "daily", "daily_long", - "weekly", "weekly_long", "monthly", "monthly_long", "cron"] +def enqueue_events(site): + frappe.flags.enqueued_jobs = [] + queued_jobs = get_jobs(key='job_type').get(site) or [] + for job_type in frappe.get_all('Scheduled Job Type', dict(stopped=0)): + if not job_type.method in queued_jobs: + # don't add it to queue if still pending + frappe.get_doc('Scheduled Job Type', job_type.name).enqueue() def is_scheduler_inactive(): if frappe.local.conf.maintenance_mode: @@ -229,6 +90,9 @@ def is_scheduler_inactive(): if is_scheduler_disabled(): return True + if is_dormant(): + return True + return False def is_scheduler_disabled(): @@ -246,90 +110,15 @@ def enable_scheduler(): def disable_scheduler(): toggle_scheduler(False) -def get_errors(from_date, to_date, limit): - errors = frappe.db.sql("""select modified, method, error from `tabError Log` - where date(modified) between %s and %s - and error not like '%%[Errno 110] Connection timed out%%' - order by modified limit %s""", (from_date, to_date, limit), as_dict=True) - return ["""

Time: {modified}

Method: {method}\n{error}
""".format(**e) - for e in errors] - -def get_error_report(from_date=None, to_date=None, limit=10): - from frappe.utils import get_url, now_datetime, add_days - - if not from_date: - from_date = add_days(now_datetime().date(), -1) - if not to_date: - to_date = add_days(now_datetime().date(), -1) - - errors = get_errors(from_date, to_date, limit) - - if errors: - return 1, """

Error Logs (max {limit}):

-

URL: {url}

{errors}""".format( - limit=limit, url=get_url(), errors="
".join(errors)) - else: - return 0, "

No error logs

" - -def scheduler_task(site, event, handler, now=False): - '''This is a wrapper function that runs a hooks.scheduler_events method''' - frappe.logger(__name__).info('running {handler} for {site} for event: {event}'.format(handler=handler, site=site, event=event)) - try: - if not now: - frappe.connect(site=site) - - frappe.flags.in_scheduler = True - frappe.get_attr(handler)() - - except Exception: - frappe.db.rollback() - traceback = log(handler, "Method: {event}, Handler: {handler}".format(event=event, handler=handler)) - frappe.logger(__name__).error(traceback) - raise - - else: - frappe.db.commit() - - frappe.logger(__name__).info('ran {handler} for {site} for event: {event}'.format(handler=handler, site=site, event=event)) - - -def reset_enabled_scheduler_events(login_manager): - if login_manager.info.user_type == "System User": - try: - if frappe.db.get_global('enabled_scheduler_events'): - # clear restricted events, someone logged in! - frappe.db.set_global('enabled_scheduler_events', None) - except frappe.db.InternalError as e: - if frappe.db.is_timedout(e): - frappe.log_error(frappe.get_traceback(), "Error in reset_enabled_scheduler_events") - else: - raise - else: - is_dormant = frappe.conf.get('dormant') - if is_dormant: - update_site_config('dormant', 'None') - - -def restrict_scheduler_events_if_dormant(): - if is_dormant(): - restrict_scheduler_events() - update_site_config('dormant', True) - -def restrict_scheduler_events(*args, **kwargs): - val = json.dumps(["hourly", "hourly_long", "daily", "daily_long", "weekly", "weekly_long", "monthly", "monthly_long", "cron"]) - frappe.db.set_global('enabled_scheduler_events', val) - def is_dormant(since = 345600): last_user_activity = get_last_active() if not last_user_activity: # no user has ever logged in, so not yet used return False - last_active = get_datetime(last_user_activity) - # Get now without tz info - now = now_datetime().replace(tzinfo=None) - time_since_last_active = now - last_active - if time_since_last_active.total_seconds() > since: # 4 days + + if now_datetime() - get_datetime(last_user_activity) > since: # 4 days return True + return False def get_last_active(): From 34b4b069ba44985a8244c59ec08276ba41ed82aa Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 24 Sep 2019 10:11:03 +0530 Subject: [PATCH 005/226] feat(scheduler): log scheduler events --- .../doctype_action/doctype_action.json | 27 +++++----- .../scheduled_job_type.json | 4 +- .../scheduled_job_type/scheduled_job_type.py | 25 +++++++-- .../system_settings/system_settings.json | 19 +++---- frappe/database/mariadb/framework_mariadb.sql | 24 +++++++++ .../database/postgres/framework_postgres.sql | 25 +++++++++ frappe/public/js/frappe/form/form.js | 11 ++-- frappe/public/js/frappe/utils/utils.js | 6 +-- frappe/utils/scheduler.py | 54 +++++++++++-------- 9 files changed, 141 insertions(+), 54 deletions(-) diff --git a/frappe/core/doctype/doctype_action/doctype_action.json b/frappe/core/doctype/doctype_action/doctype_action.json index 86757ea050..7a1b845af3 100644 --- a/frappe/core/doctype/doctype_action/doctype_action.json +++ b/frappe/core/doctype/doctype_action/doctype_action.json @@ -7,7 +7,7 @@ "field_order": [ "label", "action_type", - "method", + "action", "group" ], "fields": [ @@ -19,14 +19,6 @@ "label": "Label", "reqd": 1 }, - { - "columns": 6, - "fieldname": "method", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Method", - "reqd": 1 - }, { "fieldname": "group", "fieldtype": "Data", @@ -34,14 +26,25 @@ "label": "Group" }, { + "columns": 2, "fieldname": "action_type", - "fieldtype": "Data", + "fieldtype": "Select", + "in_list_view": 1, "label": "Action Type", - "options": "Server Action" + "options": "Server Action", + "reqd": 1 + }, + { + "columns": 4, + "fieldname": "action", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Action", + "reqd": 1 } ], "istable": 1, - "modified": "2019-09-23 21:34:39.971700", + "modified": "2019-09-24 09:11:39.860100", "modified_by": "Administrator", "module": "Core", "name": "DocType Action", 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 c8dac630e9..aea8611b6a 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -1,7 +1,9 @@ { "actions": [ { + "action": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event", "action_path": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event", + "action_type": "Server Action", "label": "Execute", "method": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event" } @@ -66,7 +68,7 @@ } ], "in_create": 1, - "modified": "2019-09-23 22:19:22.594874", + "modified": "2019-09-24 09:11:29.115423", "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 6733ddb014..5ebbf29a5f 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -39,6 +39,9 @@ class ScheduledJobType(Document): if self.is_event_due(): self.update_last_execution() frappe.flags.enqueued_jobs.append(self.method) + if frappe.flags.in_test: + self.execute() + else: enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', job_type=self.method) @@ -58,16 +61,30 @@ class ScheduledJobType(Document): get_datetime(self.last_execution)).get_next(datetime) def execute(self): + self.scheduler_log = None try: - frappe.logger(__name__).info('Started Scheduled Job: {0} for {1}'.format(self.method, frappe.local.site)) + self.log_status('Start') frappe.get_attr(self.method)() frappe.db.commit() - frappe.logger(__name__).info('Completed Scheduled Job: {0} for {1}'.format(self.method, frappe.local.site)) + self.log_status('Complete') except Exception: frappe.db.rollback() - frappe.log_error('{} failed'.format(self.method)) - frappe.logger(__name__).info('Failed Scheduled Job: {0} for {1}'.format(self.method, frappe.local.site)) + self.log_status('Failed') + def log_status(self, status): + # log file + frappe.logger(__name__).info('Scheduled Job {0}: {1} for {2}'.format(status, self.method, frappe.local.site)) + self.update_scheduler_log(status) + + def update_scheduler_log(self, status): + if not self.create_log: + return + if not self.scheduler_log: + self.scheduler_log = frappe.get_doc(dict(doctype = 'Scheduled Job Log', scheduled_job=self.name)).insert(ignore_permissions=True) + self.scheduler_log.db_set('status', status) + if status == 'Failed': + self.scheduler_log.db_set('details', frappe.get_traceback()) + frappe.db.commit() def update_last_execution(self): self.db_set('last_execution', self.last_execution, update_modified=False) diff --git a/frappe/core/doctype/system_settings/system_settings.json b/frappe/core/doctype/system_settings/system_settings.json index 55bc5d49db..9e8bc8c3fd 100644 --- a/frappe/core/doctype/system_settings/system_settings.json +++ b/frappe/core/doctype/system_settings/system_settings.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2014-04-17 16:53:52.640856", "doctype": "DocType", "document_type": "System", @@ -21,7 +22,7 @@ "backup_limit", "background_workers", "enable_scheduler", - "scheduler_last_event", + "dormant_days", "permissions", "apply_strict_user_permissions", "column_break_21", @@ -168,13 +169,6 @@ "hidden": 1, "label": "Enable Scheduled Jobs" }, - { - "fieldname": "scheduler_last_event", - "fieldtype": "Data", - "hidden": 1, - "label": "Scheduler Last Event", - "report_hide": 1 - }, { "collapsible": 1, "fieldname": "permissions", @@ -397,11 +391,18 @@ "fieldname": "allow_guests_to_upload_files", "fieldtype": "Check", "label": "Allow Guests to Upload Files" + }, + { + "default": "4", + "description": "Will run scheduled jobs only once a day for inactive sites. Default 4 days if set to 0.", + "fieldname": "dormant_days", + "fieldtype": "Int", + "label": "Run Jobs only Daily if Inactive For (Days)" } ], "icon": "fa fa-cog", "issingle": 1, - "modified": "2019-08-16 08:26:45.936626", + "modified": "2019-09-24 10:04:28.807388", "modified_by": "Administrator", "module": "Core", "name": "System Settings", diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index 7058ed0325..cc90938bae 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -105,6 +105,30 @@ CREATE TABLE `tabDocPerm` ( KEY `parent` (`parent`) ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci; +-- +-- Table structure for table `tabDocType Action` +-- + +| tabDocType Action | CREATE TABLE `tabDocType Action` ( + `name` varchar(140) COLLATE utf8mb4_unicode_ci NOT NULL, + `creation` datetime(6) DEFAULT NULL, + `modified` datetime(6) DEFAULT NULL, + `modified_by` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `owner` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `docstatus` int(1) NOT NULL DEFAULT 0, + `parent` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `parentfield` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `parenttype` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `idx` int(8) NOT NULL DEFAULT 0, + `label` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `group` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `action_type` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `action` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (`name`), + KEY `parent` (`parent`), + KEY `modified` (`modified`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED | + -- -- Table structure for table `tabDocType` -- diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index df59de92df..a0293b29f3 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -106,6 +106,31 @@ CREATE TABLE "tabDocPerm" ( create index on "tabDocPerm" ("parent"); +-- +-- Table structure for table "tabDocType Action" +-- + +DROP TABLE IF EXISTS "tabDocType Action"; +CREATE TABLE "tabDocType Action" ( + "name" varchar(255) NOT NULL, + "creation" timestamp(6) DEFAULT NULL, + "modified" timestamp(6) DEFAULT NULL, + "modified_by" varchar(255) DEFAULT NULL, + "owner" varchar(255) DEFAULT NULL, + "docstatus" smallint NOT NULL DEFAULT 0, + "parent" varchar(255) DEFAULT NULL, + "parentfield" varchar(255) DEFAULT NULL, + "parenttype" varchar(255) DEFAULT NULL, + "idx" bigint NOT NULL DEFAULT 0, + "label" varchar(140) DEFAULT NOT NULL, + "group" varchar(140) DEFAULT NULL, + "action_type" varchar(140) DEFAULT NOT NULL, + "action" varchar(140) DEFAULT NOT NULL, + PRIMARY KEY ("name") +) ; + +create index on "tabDocType Action" ("parent"); + -- -- Table structure for table "tabDocType" -- diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index edf8860a01..0c28b22f35 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -328,9 +328,14 @@ frappe.ui.form.Form = class FrappeForm { frappe.ui.form.on(this.doctype, 'refresh', () => { if (!this.is_new()) { this.add_custom_button(action.label, () => { - frappe.xcall(action.method, {doc: this.doc}).then(() => { - frappe.msgprint({message:__('Event Executed'), alert:true}); - }); + if (action.action_type==='Server Action') { + frappe.xcall(action.action, {doc: this.doc}).then(() => { + frappe.msgprint({ + message: __('{} Complete', [action.label]), + alert: true + }); + }); + } }, action.group); } }); diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 00b6f95f06..d4caa45a89 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -264,11 +264,11 @@ Object.assign(frappe.utils, { if(has_words(["Pending", "Review", "Medium", "Not Approved"], text)) { style = "warning"; colour = "orange"; - } else if(has_words(["Open", "Urgent", "High"], text)) { + } else if(has_words(["Open", "Urgent", "High", "Failed"], text)) { style = "danger"; colour = "red"; - } else if(has_words(["Closed", "Finished", "Converted", "Completed", "Confirmed", - "Approved", "Yes", "Active", "Available", "Paid"], text)) { + } else if(has_words(["Closed", "Finished", "Converted", "Completed", "Complete", "Confirmed", + "Approved", "Yes", "Active", "Available", "Paid", "Success"], text)) { style = "success"; colour = "green"; } else if(has_words(["Submitted"], text)) { diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index efd7fc6c12..afc2bec009 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -73,12 +73,13 @@ def enqueue_events_for_site(site): frappe.destroy() def enqueue_events(site): - frappe.flags.enqueued_jobs = [] - queued_jobs = get_jobs(key='job_type').get(site) or [] - for job_type in frappe.get_all('Scheduled Job Type', dict(stopped=0)): - if not job_type.method in queued_jobs: - # don't add it to queue if still pending - frappe.get_doc('Scheduled Job Type', job_type.name).enqueue() + if schedule_jobs_based_on_activity(): + frappe.flags.enqueued_jobs = [] + queued_jobs = get_jobs(key='job_type').get(site) or [] + for job_type in frappe.get_all('Scheduled Job Type', dict(stopped=0)): + if not job_type.method in queued_jobs: + # don't add it to queue if still pending + frappe.get_doc('Scheduled Job Type', job_type.name).enqueue() def is_scheduler_inactive(): if frappe.local.conf.maintenance_mode: @@ -90,9 +91,6 @@ def is_scheduler_inactive(): if is_scheduler_disabled(): return True - if is_dormant(): - return True - return False def is_scheduler_disabled(): @@ -110,19 +108,31 @@ def enable_scheduler(): def disable_scheduler(): toggle_scheduler(False) -def is_dormant(since = 345600): - last_user_activity = get_last_active() - if not last_user_activity: - # no user has ever logged in, so not yet used - return False - - if now_datetime() - get_datetime(last_user_activity) > since: # 4 days +def schedule_jobs_based_on_activity(): + '''Returns True for active sites defined by Activity Log + Returns True for inactive sites once in 24 hours''' + if is_dormant(): + # ensure last job is one day old + last_job = frappe.db.get_all('Scheduled Job Log', ('creation'), limit=1, order_by='creation desc') + if not last_job: + return True + else: + if (now_datetime() - get_datetime(last_job[0].creation)).seconds > 86400: + # one day is passed since jobs are run, so lets do this + return True + else: + # schedulers run in the last 24 hours, do nothing + return False + else: + # site active, lets run the jobs return True - return False +def is_dormant(): + last_activity_log = frappe.db.get_all('Activity Log', ('modified'), limit=1, order_by='modified desc') + since = (frappe.get_system_settings('dormant_days') or 4) * 86400 + if not last_activity_log: + return True + if (now_datetime() - get_datetime(last_activity_log[0].modified)).seconds > since: + return True -def get_last_active(): - return frappe.db.sql("""SELECT MAX(`last_active`) FROM `tabUser` - WHERE `user_type` = 'System User' AND `name` NOT IN ({standard_users})""" - .format(standard_users=", ".join(["%s"]*len(STANDARD_USERS))), - STANDARD_USERS)[0][0] + return False \ No newline at end of file From 3e4e6d4b3f48b86551d208cbc3ee84bbfd05679b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 24 Sep 2019 12:50:51 +0530 Subject: [PATCH 006/226] feat(doctype link): add links to doctype for link dashboard --- frappe/core/doctype/doctype/doctype.json | 16 ++++++- frappe/core/doctype/doctype_link/__init__.py | 0 .../doctype/doctype_link/doctype_link.json | 46 +++++++++++++++++++ .../core/doctype/doctype_link/doctype_link.py | 10 ++++ .../scheduled_job_type.json | 12 +++-- .../scheduled_job_type/scheduled_job_type.py | 28 +++++------ frappe/database/mariadb/framework_mariadb.sql | 27 ++++++++++- .../database/postgres/framework_postgres.sql | 26 +++++++++++ frappe/installer.py | 2 + frappe/model/__init__.py | 2 +- frappe/model/base_document.py | 2 +- frappe/model/meta.py | 43 ++++++++++++++++- frappe/model/sync.py | 1 + frappe/patches.txt | 1 + 14 files changed, 191 insertions(+), 25 deletions(-) create mode 100644 frappe/core/doctype/doctype_link/__init__.py create mode 100644 frappe/core/doctype/doctype_link/doctype_link.json create mode 100644 frappe/core/doctype/doctype_link/doctype_link.py diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json index 834ac9b60b..5c3fd8d302 100644 --- a/frappe/core/doctype/doctype/doctype.json +++ b/frappe/core/doctype/doctype/doctype.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_rename": 1, "autoname": "Prompt", "creation": "2013-02-18 13:36:19", @@ -59,6 +60,8 @@ "in_create", "actions_section", "actions", + "links_section", + "links", "web_view", "has_web_view", "allow_guest_to_view", @@ -467,11 +470,22 @@ "fieldtype": "Table", "label": "Actions", "options": "DocType Action" + }, + { + "fieldname": "links_section", + "fieldtype": "Section Break", + "label": "Links Section" + }, + { + "fieldname": "links", + "fieldtype": "Table", + "label": "Links", + "options": "DocType Link" } ], "icon": "fa fa-bolt", "idx": 6, - "modified": "2019-09-23 16:29:21.209832", + "modified": "2019-09-24 11:42:18.081499", "modified_by": "Administrator", "module": "Core", "name": "DocType", diff --git a/frappe/core/doctype/doctype_link/__init__.py b/frappe/core/doctype/doctype_link/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/core/doctype/doctype_link/doctype_link.json b/frappe/core/doctype/doctype_link/doctype_link.json new file mode 100644 index 0000000000..752b4bb5da --- /dev/null +++ b/frappe/core/doctype/doctype_link/doctype_link.json @@ -0,0 +1,46 @@ +{ + "actions": [], + "creation": "2019-09-24 11:41:25.291377", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "link_doctype", + "link_fieldname", + "group" + ], + "fields": [ + { + "fieldname": "link_doctype", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Link DocType", + "options": "DocType", + "reqd": 1 + }, + { + "fieldname": "link_fieldname", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Link Fieldname", + "reqd": 1 + }, + { + "fieldname": "group", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Group" + } + ], + "istable": 1, + "modified": "2019-09-24 11:41:25.291377", + "modified_by": "Administrator", + "module": "Core", + "name": "DocType Link", + "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/core/doctype/doctype_link/doctype_link.py b/frappe/core/doctype/doctype_link/doctype_link.py new file mode 100644 index 0000000000..efe8b09809 --- /dev/null +++ b/frappe/core/doctype/doctype_link/doctype_link.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 DocTypeLink(Document): + pass 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 aea8611b6a..ec68544ab5 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -2,10 +2,8 @@ "actions": [ { "action": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event", - "action_path": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event", "action_type": "Server Action", - "label": "Execute", - "method": "frappe.core.doctype.scheduled_job_type.scheduled_job_type.execute_event" + "label": "Execute" } ], "creation": "2019-09-23 14:34:09.205368", @@ -68,7 +66,13 @@ } ], "in_create": 1, - "modified": "2019-09-24 09:11:29.115423", + "links": [ + { + "link_doctype": "Scheduled Job Log", + "link_fieldname": "scheduled_job" + } + ], + "modified": "2019-09-24 11:45:34.748779", "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 5ebbf29a5f..517f57469b 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -11,20 +11,6 @@ from datetime import datetime from croniter import croniter from frappe.utils.background_jobs import enqueue -CRON_MAP = { - "Yearly": "0 0 1 1 *", - "Annual": "0 0 1 1 *", - "Monthly": "0 0 1 * *", - "Monthly Long": "0 0 1 * *", - "Weekly": "0 0 * * 0", - "Weekly Long": "0 0 * * 0", - "Daily": "0 0 * * *", - "Daily Long": "0 0 * * *", - "Hourly": "0 * * * *", - "Hourly Long": "0 * * * *", - "All": "0/" + str((frappe.get_conf().scheduler_interval or 240) // 60) + " * * * *", -} - class ScheduledJobType(Document): def autoname(self): self.name = '.'.join(self.method.split('.')[-2:]) @@ -54,6 +40,20 @@ class ScheduledJobType(Document): return self.last_execution <= (current_time or now_datetime()) def get_next_execution(self): + CRON_MAP = { + "Yearly": "0 0 1 1 *", + "Annual": "0 0 1 1 *", + "Monthly": "0 0 1 * *", + "Monthly Long": "0 0 1 * *", + "Weekly": "0 0 * * 0", + "Weekly Long": "0 0 * * 0", + "Daily": "0 0 * * *", + "Daily Long": "0 0 * * *", + "Hourly": "0 * * * *", + "Hourly Long": "0 * * * *", + "All": "0/" + str((frappe.get_conf().scheduler_interval or 240) // 60) + " * * * *", + } + if not self.cron_format: self.cron_format = CRON_MAP[self.queue] diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index cc90938bae..b1a769b189 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -109,7 +109,7 @@ CREATE TABLE `tabDocPerm` ( -- Table structure for table `tabDocType Action` -- -| tabDocType Action | CREATE TABLE `tabDocType Action` ( +CREATE TABLE `tabDocType Action` ( `name` varchar(140) COLLATE utf8mb4_unicode_ci NOT NULL, `creation` datetime(6) DEFAULT NULL, `modified` datetime(6) DEFAULT NULL, @@ -127,7 +127,30 @@ CREATE TABLE `tabDocPerm` ( PRIMARY KEY (`name`), KEY `parent` (`parent`), KEY `modified` (`modified`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED | +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED; + +-- +-- Table structure for table `tabDocType Action` +-- + +CREATE TABLE `tabDocType Link` ( + `name` varchar(140) COLLATE utf8mb4_unicode_ci NOT NULL, + `creation` datetime(6) DEFAULT NULL, + `modified` datetime(6) DEFAULT NULL, + `modified_by` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `owner` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `docstatus` int(1) NOT NULL DEFAULT 0, + `parent` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `parentfield` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `parenttype` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `idx` int(8) NOT NULL DEFAULT 0, + `group` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `link_doctype` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + `link_fieldname` varchar(140) COLLATE utf8mb4_unicode_ci DEFAULT NULL, + PRIMARY KEY (`name`), + KEY `parent` (`parent`), + KEY `modified` (`modified`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED; -- -- Table structure for table `tabDocType` diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index a0293b29f3..e49b461518 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -131,6 +131,32 @@ CREATE TABLE "tabDocType Action" ( create index on "tabDocType Action" ("parent"); +-- +-- Table structure for table "tabDocType Link" +-- + +DROP TABLE IF EXISTS "tabDocType Link"; +CREATE TABLE "tabDocType Link" ( + "name" varchar(255) NOT NULL, + "creation" timestamp(6) DEFAULT NULL, + "modified" timestamp(6) DEFAULT NULL, + "modified_by" varchar(255) DEFAULT NULL, + "owner" varchar(255) DEFAULT NULL, + "docstatus" smallint NOT NULL DEFAULT 0, + "parent" varchar(255) DEFAULT NULL, + "parentfield" varchar(255) DEFAULT NULL, + "parenttype" varchar(255) DEFAULT NULL, + "idx" bigint NOT NULL DEFAULT 0, + "label" varchar(140) DEFAULT NOT NULL, + "group" varchar(140) DEFAULT NULL, + "link_doctype" varchar(140) DEFAULT NOT NULL, + "link_fieldname" varchar(140) DEFAULT NOT NULL, + PRIMARY KEY ("name") +) ; + +create index on "tabDocType Link" ("parent"); + + -- -- Table structure for table "tabDocType" -- diff --git a/frappe/installer.py b/frappe/installer.py index 764a0b6780..f691a6cb22 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -18,6 +18,7 @@ from frappe.utils.fixtures import sync_fixtures from frappe.website import render from frappe.modules.utils import sync_customizations from frappe.database import setup_database +from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs def install_db(root_login="root", root_password=None, db_name=None, source_sql=None, admin_password=None, verbose=True, force=0, site_config=None, reinstall=False, @@ -91,6 +92,7 @@ def install_app(name, verbose=False, set_as_patched=True): for after_install in app_hooks.after_install or []: frappe.get_attr(after_install)() + sync_jobs() sync_fixtures(name) sync_customizations(name) diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 1c6f965d42..1fe92d7a67 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -45,7 +45,7 @@ default_fields = ('doctype','name','owner','creation','modified','modified_by', 'parent','parentfield','parenttype','idx','docstatus') optional_fields = ("_user_tags", "_comments", "_assign", "_liked_by", "_seen") table_fields = ('Table', 'Table MultiSelect') -core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'DocType Action','User', 'Role', 'Has Role', +core_doctypes_list = ('DocType', 'DocField', 'DocPerm', 'DocType Action', 'DocType Link', 'User', 'Role', 'Has Role', 'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form', 'Customize Form Field', 'Property Setter', 'Custom Field', 'Custom Script') diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 1648c64a13..a50bf9fdaf 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -22,7 +22,7 @@ max_positive_value = { 'bigint': 2 ** 63 } -DOCTYPES_FOR_DOCTYPE = ('DocType', 'DocField', 'DocPerm', 'DocType Action') +DOCTYPES_FOR_DOCTYPE = ('DocType', 'DocField', 'DocPerm', 'DocType Action', 'DocType Link') _classes = {} diff --git a/frappe/model/meta.py b/frappe/model/meta.py index cd342b77aa..97e526c4e0 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -165,7 +165,7 @@ class Meta(Document): def get_valid_columns(self): if not hasattr(self, "_valid_columns"): - if self.name in ("DocType", "DocField", "DocPerm", 'DocType Action',"Property Setter"): + if self.name in ("DocType", "DocField", "DocPerm", 'DocType Action', 'DocType Link', "Property Setter"): self._valid_columns = get_table_columns(self.name) else: self._valid_columns = self.default_fields + \ @@ -174,7 +174,12 @@ class Meta(Document): return self._valid_columns def get_table_field_doctype(self, fieldname): - return { "fields": "DocField", "permissions": "DocPerm", "actions": "DocType Action"}.get(fieldname) + return { + "fields": "DocField", + "permissions": "DocPerm", + "actions": "DocType Action", + 'links': 'DocType Link' + }.get(fieldname) def get_field(self, fieldname): '''Return docfield from meta''' @@ -419,11 +424,44 @@ class Meta(Document): except ImportError: pass + self.add_doctype_links(data) + for hook in frappe.get_hooks("override_doctype_dashboards", {}).get(self.name, []): data = frappe.get_attr(hook)(data=data) return data + def add_doctype_links(self, data): + '''add `links` child table in standard link dashboard format''' + if self.links: + if not data.transactions: + # init groups + data.transactions = [] + data.non_standard_fieldnames = {} + + for link in self.links: + link.added = False + for group in data.transactions: + # group found + if group.label == link.label: + if not link.link_doctype in group.items: + group.items.append(link.link_doctype) + link.added = True + + if not link.added: + # group not found, make a new group + data.transactions.append(dict( + label = link.group, + items = [link.link_doctype] + )) + + if link.link_fieldname != data.fieldname: + if data.fieldname: + data.non_standard_fieldnames[link.link_doctype] = link.link_fieldname + else: + data.fieldname = link.link_fieldname + + def get_row_template(self): return self.get_web_template(suffix='_row') @@ -445,6 +483,7 @@ DOCTYPE_TABLE_FIELDS = [ frappe._dict({"fieldname": "fields", "options": "DocField"}), frappe._dict({"fieldname": "permissions", "options": "DocPerm"}), frappe._dict({"fieldname": "actions", "options": "DocType Action"}), + frappe._dict({"fieldname": "links", "options": "DocType Link"}), ] ####### diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 070ab6bbc7..2d9a48390d 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -30,6 +30,7 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe for d in (("core", "docfield"), ("core", "docperm"), ("core", "doctype_action"), + ("core", "doctype_link"), ("core", "role"), ("core", "has_role"), ("core", "doctype"), diff --git a/frappe/patches.txt b/frappe/patches.txt index 1a89641a6a..7d7a3dc2ea 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -10,6 +10,7 @@ frappe.patches.v11_0.drop_column_apply_user_permissions execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22 execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20 execute:frappe.reload_doc('core', 'doctype', 'doctype_action', force=True) #2019-09-23 +execute:frappe.reload_doc('core', 'doctype', 'doctype_link', force=True) #2019-09-23 execute:frappe.reload_doc('core', 'doctype', 'custom_docperm') execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29 execute:frappe.reload_doc('core', 'doctype', 'comment') From 0035772f8fb7b7cd72af7bbde6b1099299554cb4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 24 Sep 2019 21:45:48 +0530 Subject: [PATCH 007/226] fix(tests) --- frappe/core/doctype/version/version.py | 2 +- frappe/database/postgres/framework_postgres.sql | 12 ++++++------ .../email/doctype/notification/test_notification.py | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/version/version.py b/frappe/core/doctype/version/version.py index cb891afa0c..05cc102ab9 100644 --- a/frappe/core/doctype/version/version.py +++ b/frappe/core/doctype/version/version.py @@ -50,7 +50,7 @@ def get_diff(old, new, for_child=False): if df.fieldtype in no_value_fields and df.fieldtype not in table_fields: continue - old_value, new_value = old.get(df.fieldname) or [], new.get(df.fieldname) or [] + old_value, new_value = old.get(df.fieldname), new.get(df.fieldname) if df.fieldtype in table_fields: # make maps diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index e49b461518..373a55279b 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -122,10 +122,10 @@ CREATE TABLE "tabDocType Action" ( "parentfield" varchar(255) DEFAULT NULL, "parenttype" varchar(255) DEFAULT NULL, "idx" bigint NOT NULL DEFAULT 0, - "label" varchar(140) DEFAULT NOT NULL, + "label" varchar(140) NOT NULL, "group" varchar(140) DEFAULT NULL, - "action_type" varchar(140) DEFAULT NOT NULL, - "action" varchar(140) DEFAULT NOT NULL, + "action_type" varchar(140) NOT NULL, + "action" varchar(140) NOT NULL, PRIMARY KEY ("name") ) ; @@ -147,10 +147,10 @@ CREATE TABLE "tabDocType Link" ( "parentfield" varchar(255) DEFAULT NULL, "parenttype" varchar(255) DEFAULT NULL, "idx" bigint NOT NULL DEFAULT 0, - "label" varchar(140) DEFAULT NOT NULL, + "label" varchar(140) NOT NULL, "group" varchar(140) DEFAULT NULL, - "link_doctype" varchar(140) DEFAULT NOT NULL, - "link_fieldname" varchar(140) DEFAULT NOT NULL, + "link_doctype" varchar(140) NOT NULL, + "link_fieldname" varchar(140) NOT NULL, PRIMARY KEY ("name") ) ; diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index 4d3c3167a5..b9bbde172d 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -136,7 +136,7 @@ class TestNotification(unittest.TestCase): "reference_name": event.name, "status": "Not Sent"})) frappe.set_user('Administrator') - frappe.utils.scheduler.trigger(frappe.local.site, "daily", now=True) + frappe.get_doc('Scheduled Job Type', dict(method='frappe.email.doctype.notification.notification.trigger_daily_alerts')).execute() # not today, so no alert self.assertFalse(frappe.db.get_value("Email Queue", {"reference_doctype": "Event", @@ -150,7 +150,7 @@ class TestNotification(unittest.TestCase): self.assertFalse(frappe.db.get_value("Email Queue", {"reference_doctype": "Event", "reference_name": event.name, "status": "Not Sent"})) - frappe.utils.scheduler.trigger(frappe.local.site, "daily", now=True) + frappe.get_doc('Scheduled Job Type', dict(method='frappe.email.doctype.notification.notification.trigger_daily_alerts')).execute() # today so show alert self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": "Event", From c583be6f33f4af37bac9e0ed0730b0e4e8afab86 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 24 Sep 2019 22:44:08 +0530 Subject: [PATCH 008/226] fix(scheduler): implement queue peeking --- .../scheduled_job_type/scheduled_job_type.py | 28 +++++++++++++------ .../database/postgres/framework_postgres.sql | 2 +- frappe/tests/test_scheduler.py | 21 +++++++++++++- frappe/utils/background_jobs.py | 15 +++++++--- 4 files changed, 51 insertions(+), 15 deletions(-) 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 517f57469b..609cfd06a1 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -9,7 +9,7 @@ from frappe.model.document import Document from frappe.utils import now_datetime, get_datetime from datetime import datetime from croniter import croniter -from frappe.utils.background_jobs import enqueue +from frappe.utils.background_jobs import enqueue, get_jobs class ScheduledJobType(Document): def autoname(self): @@ -24,12 +24,18 @@ class ScheduledJobType(Document): # enqueue event if last execution is done if self.is_event_due(): self.update_last_execution() - frappe.flags.enqueued_jobs.append(self.method) - if frappe.flags.in_test: - self.execute() - else: - enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', - job_type=self.method) + if frappe.flags.enqueued_jobs: + frappe.flags.enqueued_jobs.append(self.method) + + if frappe.flags.execute_job: + self.execute() + else: + if not self.is_job_in_queue(): + enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', + queue = self.get_queue_name(), job_type=self.method) + return True + else: + return False def is_event_due(self, current_time = None): '''Return true if event is due based on time lapsed since last execution''' @@ -39,6 +45,10 @@ class ScheduledJobType(Document): # if the next scheduled event is before NOW, then its due! return self.last_execution <= (current_time or now_datetime()) + def is_job_in_queue(self): + queued_jobs = get_jobs(site=frappe.local.site, key='job_type')[frappe.local.site] + return self.method in queued_jobs + def get_next_execution(self): CRON_MAP = { "Yearly": "0 0 1 1 *", @@ -91,7 +101,7 @@ class ScheduledJobType(Document): frappe.db.commit() def get_queue_name(self): - return self.queue.replace(' ', '_').lower() + return 'long' if ('Long' in self.queue) else 'default' @frappe.whitelist() def execute_event(doc): @@ -143,4 +153,4 @@ def insert_single_event(queue, event, cron_format = None): def clear_events(all_events, scheduler_events): for event in frappe.get_all('Scheduled Job Type', ('name', 'method')): if event.method not in all_events: - frappe.db.delete_doc('Scheduled Job Type', event.name) + frappe.delete_doc('Scheduled Job Type', event.name) diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index 373a55279b..cd2f02d8e4 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -147,7 +147,7 @@ CREATE TABLE "tabDocType Link" ( "parentfield" varchar(255) DEFAULT NULL, "parenttype" varchar(255) DEFAULT NULL, "idx" bigint NOT NULL DEFAULT 0, - "label" varchar(140) NOT NULL, + "label" varchar(140) DEFAULT NULL, "group" varchar(140) DEFAULT NULL, "link_doctype" varchar(140) NOT NULL, "link_fieldname" varchar(140) NOT NULL, diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 4e193354b0..c1b03f7251 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from unittest import TestCase from dateutil.relativedelta import relativedelta from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs -from frappe.utils.background_jobs import enqueue +from frappe.utils.background_jobs import enqueue, get_jobs from frappe.utils.scheduler import enqueue_events import frappe @@ -20,12 +20,31 @@ class TestScheduler(TestCase): def test_enqueue_jobs(self): frappe.db.sql('update `tabScheduled Job Type` set last_execution = "2010-01-01 00:00:00"') + + frappe.flags.execute_job = True enqueue_events(site = frappe.local.site) + frappe.flags.execute_job = False self.assertTrue('frappe.email.queue.clear_outbox', frappe.flags.enqueued_jobs) self.assertTrue('frappe.utils.change_log.check_for_update', frappe.flags.enqueued_jobs) self.assertTrue('frappe.email.doctype.auto_email_report.auto_email_report.send_monthly', frappe.flags.enqueued_jobs) + def test_queue_peeking(self): + if not frappe.db.exists('Scheduled Job Type', 'test_scheduler.test_timeout'): + job = frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = 'frappe.tests.test_scheduler.test_timeout', + last_execution = '2010-01-01 00:00:00', + queue = 'All' + )).insert() + else: + job = frappe.get_doc('Scheduled Job Type', 'test_scheduler.test_timeout') + + self.assertTrue(job.enqueue()) + print(get_jobs(site=frappe.local.site, key='job_type')) + self.assertFalse(job.enqueue()) + job.delete() + def test_job_timeout(self): return job = enqueue(test_timeout, timeout=10) diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index 61e866e2f8..7681e76646 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -160,18 +160,25 @@ def get_worker_name(queue): def get_jobs(site=None, queue=None, key='method'): '''Gets jobs per queue or per site or both''' jobs_per_site = defaultdict(list) + + def add_to_dict(job): + if key in job.kwargs: + jobs_per_site[job.kwargs['site']].append(job.kwargs[key]) + + elif key in job.kwargs.get('kwargs', {}): + # optional keyword arguments are stored in 'kwargs' of 'kwargs' + jobs_per_site[job.kwargs['site']].append(job.kwargs['kwargs'][key]) + for queue in get_queue_list(queue): q = get_queue(queue) for job in q.jobs: if job.kwargs.get('site'): if site is None: - # get jobs for all sites - jobs_per_site[job.kwargs['site']].append(job.kwargs[key]) + add_to_dict(job) elif job.kwargs['site'] == site: - # get jobs only for given site - jobs_per_site[site].append(job.kwargs[key]) + add_to_dict(job) else: print('No site found in job', job.__dict__) From e85cd6549caa4d391b902739d0d56a79fda71f89 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 25 Sep 2019 09:55:17 +0530 Subject: [PATCH 009/226] fix(tests): fix queue peeking test --- frappe/__init__.py | 2 ++ frappe/core/doctype/scheduled_job_type/scheduled_job_type.py | 4 ++-- frappe/tests/test_scheduler.py | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 5827541590..1ebaebce97 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1515,6 +1515,8 @@ def log_error(message=None, title=None): error = get_traceback() else: error = message + else: + error = get_traceback() return get_doc(dict(doctype='Error Log', error=as_unicode(error), method=title)).insert(ignore_permissions=True) 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 609cfd06a1..c08afa179a 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -34,8 +34,8 @@ class ScheduledJobType(Document): enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', queue = self.get_queue_name(), job_type=self.method) return True - else: - return False + + return False def is_event_due(self, current_time = None): '''Return true if event is due based on time lapsed since last execution''' diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index c1b03f7251..b8c46d376f 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -37,11 +37,14 @@ class TestScheduler(TestCase): last_execution = '2010-01-01 00:00:00', queue = 'All' )).insert() + frappe.db.commit() else: job = frappe.get_doc('Scheduled Job Type', 'test_scheduler.test_timeout') self.assertTrue(job.enqueue()) - print(get_jobs(site=frappe.local.site, key='job_type')) + job.db_set('last_execution', '2010-01-01 00:00:00') + frappe.db.commit() + time.sleep(1) # wait if job is not yet queued self.assertFalse(job.enqueue()) job.delete() From d6f14608f104d6f64386c3b3d2f2b167285d1112 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 25 Sep 2019 11:06:22 +0530 Subject: [PATCH 010/226] fix(minor): set execute function in a try catch block to detect if execution cannot even begin --- frappe/core/doctype/scheduled_job_type/scheduled_job_type.py | 5 ++++- frappe/utils/scheduler.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) 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 c08afa179a..7c6b2a0e0c 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -111,7 +111,10 @@ def execute_event(doc): def run_scheduled_job(job_type): '''This is a wrapper function that runs a hooks.scheduler_events method''' - frappe.get_doc('Scheduled Job Type', dict(method=job_type)).execute() + try: + frappe.get_doc('Scheduled Job Type', dict(method=job_type)).execute() + except Exception: + print(frappe.get_traceback()) def sync_jobs(): frappe.reload_doc('core', 'doctype', 'scheduled_job_type') diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index afc2bec009..4d9f782542 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -75,8 +75,8 @@ def enqueue_events_for_site(site): def enqueue_events(site): if schedule_jobs_based_on_activity(): frappe.flags.enqueued_jobs = [] - queued_jobs = get_jobs(key='job_type').get(site) or [] - for job_type in frappe.get_all('Scheduled Job Type', dict(stopped=0)): + queued_jobs = get_jobs(site=site, key='job_type').get(site) or [] + for job_type in frappe.get_all('Scheduled Job Type', ('name', 'method'), dict(stopped=0)): if not job_type.method in queued_jobs: # don't add it to queue if still pending frappe.get_doc('Scheduled Job Type', job_type.name).enqueue() From fea34e3f6beba9507f5ca74ca45d2c94ddd7fdf1 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 25 Sep 2019 12:24:29 +0530 Subject: [PATCH 011/226] fix(tests): test_scheduler --- .../scheduled_job_log/scheduled_job_log.json | 20 +++--- .../scheduled_job_type.json | 4 +- .../scheduled_job_type/scheduled_job_type.py | 7 +- frappe/database/database.py | 12 +++- frappe/tests/test_scheduler.py | 65 +++++++++++++++---- frappe/utils/scheduler.py | 18 ++--- 6 files changed, 90 insertions(+), 36 deletions(-) diff --git a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json index cfa2f27d1a..9e7f72a722 100644 --- a/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json +++ b/frappe/core/doctype/scheduled_job_log/scheduled_job_log.json @@ -1,11 +1,12 @@ { + "actions": [], "creation": "2019-09-23 14:36:36.935869", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", "field_order": [ "status", - "scheduled_job", + "scheduled_job_type", "details" ], "fields": [ @@ -20,7 +21,13 @@ "reqd": 1 }, { - "fieldname": "scheduled_job", + "fieldname": "details", + "fieldtype": "Code", + "label": "Details", + "read_only": 1 + }, + { + "fieldname": "scheduled_job_type", "fieldtype": "Link", "in_list_view": 1, "in_standard_filter": 1, @@ -28,15 +35,10 @@ "options": "Scheduled Job Type", "read_only": 1, "reqd": 1 - }, - { - "fieldname": "details", - "fieldtype": "Code", - "label": "Details", - "read_only": 1 } ], - "modified": "2019-09-23 14:36:36.935869", + "links": [], + "modified": "2019-09-25 11:55:10.646458", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Log", 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 ec68544ab5..d35b88e9de 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -69,10 +69,10 @@ "links": [ { "link_doctype": "Scheduled Job Log", - "link_fieldname": "scheduled_job" + "link_fieldname": "scheduled_job_type" } ], - "modified": "2019-09-24 11:45:34.748779", + "modified": "2019-09-25 11:54:58.013623", "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 7c6b2a0e0c..9325d62078 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -35,6 +35,10 @@ class ScheduledJobType(Document): queue = self.get_queue_name(), job_type=self.method) return True + else: + pass + #print('not yet due') + return False def is_event_due(self, current_time = None): @@ -90,7 +94,7 @@ class ScheduledJobType(Document): if not self.create_log: return if not self.scheduler_log: - self.scheduler_log = frappe.get_doc(dict(doctype = 'Scheduled Job Log', scheduled_job=self.name)).insert(ignore_permissions=True) + self.scheduler_log = frappe.get_doc(dict(doctype = 'Scheduled Job Log', scheduled_job_type=self.name)).insert(ignore_permissions=True) self.scheduler_log.db_set('status', status) if status == 'Failed': self.scheduler_log.db_set('details', frappe.get_traceback()) @@ -112,6 +116,7 @@ def execute_event(doc): def run_scheduled_job(job_type): '''This is a wrapper function that runs a hooks.scheduler_events method''' try: + print('executing job {}'.format(job_type)) frappe.get_doc('Scheduled Job Type', dict(method=job_type)).execute() except Exception: print(frappe.get_traceback()) diff --git a/frappe/database/database.py b/frappe/database/database.py index 1e6a85236e..5779c77e86 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -15,7 +15,7 @@ import frappe.model.meta from frappe import _ from time import time -from frappe.utils import now, getdate, cast_fieldtype +from frappe.utils import now, getdate, cast_fieldtype, get_datetime from frappe.utils.background_jobs import execute_job, get_queue from frappe.model.utils.link_count import flush_local_link_count from frappe.utils import cint @@ -940,6 +940,16 @@ class Database(object): else: frappe.throw(_('No conditions provided')) + def get_last_created(self, doctype): + last_record = self.get_all(doctype, ('creation'), limit=1, order_by='creation desc') + if last_record: + return get_datetime(last_record[0].creation) + else: + return None + + def clear_table(self, doctype): + self.sql('truncate `tab{}`'.format(doctype)) + def log_touched_tables(self, query, values=None): if values: query = frappe.safe_decode(self._cursor.mogrify(query, values)) diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index b8c46d376f..3617a3983b 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -4,15 +4,21 @@ from unittest import TestCase from dateutil.relativedelta import relativedelta from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs from frappe.utils.background_jobs import enqueue, get_jobs -from frappe.utils.scheduler import enqueue_events +from frappe.utils.scheduler import enqueue_events, is_dormant, schedule_jobs_based_on_activity +from frappe.utils import add_days, get_datetime import frappe import time def test_timeout(): - '''This function needs to be pickleable''' time.sleep(100) +def test_timeout_10(): + time.sleep(10) + +def test_method(): + pass + class TestScheduler(TestCase): def setUp(self): if not frappe.get_all('Scheduled Job Type', limit=1): @@ -30,24 +36,38 @@ class TestScheduler(TestCase): self.assertTrue('frappe.email.doctype.auto_email_report.auto_email_report.send_monthly', frappe.flags.enqueued_jobs) def test_queue_peeking(self): - if not frappe.db.exists('Scheduled Job Type', 'test_scheduler.test_timeout'): - job = frappe.get_doc(dict( - doctype = 'Scheduled Job Type', - method = 'frappe.tests.test_scheduler.test_timeout', - last_execution = '2010-01-01 00:00:00', - queue = 'All' - )).insert() - frappe.db.commit() - else: - job = frappe.get_doc('Scheduled Job Type', 'test_scheduler.test_timeout') - + job = get_test_job() self.assertTrue(job.enqueue()) job.db_set('last_execution', '2010-01-01 00:00:00') frappe.db.commit() - time.sleep(1) # wait if job is not yet queued + time.sleep(3) # wait if job is not yet queued self.assertFalse(job.enqueue()) job.delete() + def test_is_dormant(self): + self.assertTrue(is_dormant(check_time= get_datetime('2100-01-01 00:00:00'))) + self.assertTrue(is_dormant(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) + self.assertFalse(is_dormant(check_time = frappe.db.get_last_created('Activity Log'))) + + def test_once_a_day_for_dormant(self): + frappe.db.clear_table('Scheduled Job Log') + self.assertTrue(schedule_jobs_based_on_activity(check_time= get_datetime('2100-01-01 00:00:00'))) + self.assertTrue(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) + + # create a fake job executed 5 days from now + job = get_test_job(method='frappe.tests.test_scheduler.test_method', queue='Daily') + job.execute() + job_log = frappe.get_doc('Scheduled Job Log', dict(scheduled_job_type=job.name)) + job_log.db_set('creation', add_days(frappe.db.get_last_created('Activity Log'), 5)) + + # inactive site with recent job, don't run + self.assertFalse(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) + + # one more day has passed + self.assertTrue(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 6))) + + frappe.db.rollback() + def test_job_timeout(self): return job = enqueue(test_timeout, timeout=10) @@ -59,3 +79,20 @@ class TestScheduler(TestCase): break self.assertTrue(job.is_failed) + +def get_test_job(method='frappe.tests.test_scheduler.test_timeout_10', queue='All'): + if not frappe.db.exists('Scheduled Job Type', dict(method=method)): + job = frappe.get_doc(dict( + doctype = 'Scheduled Job Type', + method = method, + last_execution = '2010-01-01 00:00:00', + queue = queue + )).insert() + frappe.db.commit() + else: + job = frappe.get_doc('Scheduled Job Type', dict(method=method)) + job.db_set('last_execution', '2010-01-01 00:00:00') + job.db_set('queue', queue) + + return job + diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index 4d9f782542..fb606d6d3d 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -108,16 +108,16 @@ def enable_scheduler(): def disable_scheduler(): toggle_scheduler(False) -def schedule_jobs_based_on_activity(): +def schedule_jobs_based_on_activity(check_time=None): '''Returns True for active sites defined by Activity Log Returns True for inactive sites once in 24 hours''' - if is_dormant(): + if is_dormant(check_time=check_time): # ensure last job is one day old - last_job = frappe.db.get_all('Scheduled Job Log', ('creation'), limit=1, order_by='creation desc') - if not last_job: + last_job_timestamp = frappe.db.get_last_created('Scheduled Job Log') + if not last_job_timestamp: return True else: - if (now_datetime() - get_datetime(last_job[0].creation)).seconds > 86400: + if ((check_time or now_datetime()) - last_job_timestamp).total_seconds() >= 86400: # one day is passed since jobs are run, so lets do this return True else: @@ -127,12 +127,12 @@ def schedule_jobs_based_on_activity(): # site active, lets run the jobs return True -def is_dormant(): - last_activity_log = frappe.db.get_all('Activity Log', ('modified'), limit=1, order_by='modified desc') +def is_dormant(check_time=None): + last_activity_log_timestamp = frappe.db.get_last_created('Activity Log') since = (frappe.get_system_settings('dormant_days') or 4) * 86400 - if not last_activity_log: + if not last_activity_log_timestamp: return True - if (now_datetime() - get_datetime(last_activity_log[0].modified)).seconds > since: + if ((check_time or now_datetime()) - last_activity_log_timestamp).total_seconds() >= since: return True return False \ No newline at end of file From 463d1c5ec5312c355b280959b2d0865997df3dcb Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 26 Sep 2019 12:22:37 +0530 Subject: [PATCH 012/226] fix(major): upgrade redis-py and rq and try and fix scheduler tests --- .../doctype/scheduled_job_type/scheduled_job_type.py | 7 +++---- frappe/tests/test_scheduler.py | 11 +++++++++-- frappe/utils/background_jobs.py | 12 +++--------- frappe/utils/redis_wrapper.py | 5 +++++ requirements.txt | 4 ++-- 5 files changed, 22 insertions(+), 17 deletions(-) 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 9325d62078..dcdf810995 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -34,10 +34,10 @@ class ScheduledJobType(Document): enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', queue = self.get_queue_name(), job_type=self.method) return True - + else: + pass else: pass - #print('not yet due') return False @@ -111,12 +111,11 @@ class ScheduledJobType(Document): def execute_event(doc): frappe.only_for('System Manager') doc = json.loads(doc) - frappe.get_doc('Scheduled Job Type', doc.get('name')).execute() + frappe.get_doc('Scheduled Job Type', doc.get('name')).enqueue() def run_scheduled_job(job_type): '''This is a wrapper function that runs a hooks.scheduler_events method''' try: - print('executing job {}'.format(job_type)) frappe.get_doc('Scheduled Job Type', dict(method=job_type)).execute() except Exception: print(frappe.get_traceback()) diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 3617a3983b..4f4c918576 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -37,10 +37,17 @@ class TestScheduler(TestCase): def test_queue_peeking(self): job = get_test_job() + self.assertTrue(job.enqueue()) job.db_set('last_execution', '2010-01-01 00:00:00') frappe.db.commit() - time.sleep(3) # wait if job is not yet queued + + # 1 job in queue + self.assertTrue(job.enqueue()) + job.db_set('last_execution', '2010-01-01 00:00:00') + frappe.db.commit() + + # 2nd job not loaded self.assertFalse(job.enqueue()) job.delete() @@ -88,11 +95,11 @@ def get_test_job(method='frappe.tests.test_scheduler.test_timeout_10', queue='Al last_execution = '2010-01-01 00:00:00', queue = queue )).insert() - frappe.db.commit() else: job = frappe.get_doc('Scheduled Job Type', dict(method=method)) job.db_set('last_execution', '2010-01-01 00:00:00') job.db_set('queue', queue) + frappe.db.commit() return job diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index 7681e76646..c1ac7581dc 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -119,6 +119,8 @@ def execute_job(site, method, event, job_name, kwargs, user=None, is_async=True, except: frappe.db.rollback() frappe.log_error(method_name) + frappe.db.commit() + print(frappe.get_traceback()) raise else: @@ -140,8 +142,6 @@ def start_worker(queue=None, quiet = False): with Connection(redis_connection): queues = get_queue_list(queue) logging_level = "INFO" - if quiet: - logging_level = "WARNING" Worker(queues, name=get_worker_name(queue)).work(logging_level = logging_level) def get_worker_name(queue): @@ -203,13 +203,7 @@ def get_queue_list(queue_list=None): def get_queue(queue, is_async=True): '''Returns a Queue object tied to a redis connection''' validate_queue(queue) - - kwargs = { - 'connection': get_redis_conn(), - 'async': is_async - } - - return Queue(queue, **kwargs) + return Queue(queue, connection=get_redis_conn(), is_async=is_async) def validate_queue(queue, default_queue_list=None): if not default_queue_list: diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index cb92ced5c6..204efc9d1e 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -141,6 +141,9 @@ class RedisWrapper(redis.Redis): return super(RedisWrapper, self).llen(self.make_key(key)) def hset(self, name, key, value, shared=False): + if key is None: + return + _name = self.make_key(name, shared=shared) # set in local @@ -164,6 +167,8 @@ class RedisWrapper(redis.Redis): if not _name in frappe.local.cache: frappe.local.cache[_name] = {} + if not key: return None + if key in frappe.local.cache[_name]: return frappe.local.cache[_name][key] diff --git a/requirements.txt b/requirements.txt index 84788c863e..a7b09b797d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ werkzeug semantic_version rauth>=0.6.2 requests -redis==2.10.6 +redis>=3.0 selenium babel==2.6.0 ipython @@ -26,7 +26,7 @@ bleach==2.1.4 bleach-whitelist Pillow beautifulsoup4 -rq==0.12.0 +rq>=1.1.0 schedule cryptography pyopenssl From 63e14f6ee2a80a1f55d6464c4974b56cc0f5951b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 26 Sep 2019 12:37:47 +0530 Subject: [PATCH 013/226] fix(tests): strict redis --- frappe/twofactor.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/twofactor.py b/frappe/twofactor.py index a539532f25..e60113215b 100644 --- a/frappe/twofactor.py +++ b/frappe/twofactor.py @@ -248,9 +248,7 @@ def get_link_for_qrcode(user, totp_uri): key = frappe.generate_hash(length=20) key_user = "{}_user".format(key) key_uri = "{}_uri".format(key) - lifespan = int(frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image')) - if lifespan<=0: - lifespan = 240 + lifespan = int(frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image')) or 240 frappe.cache().set_value(key_uri, totp_uri, expires_in_sec=lifespan) frappe.cache().set_value(key_user, user, expires_in_sec=lifespan) return get_url('/qrcode?k={}'.format(key)) @@ -387,7 +385,7 @@ def should_remove_barcode_image(barcode): '''Check if it's time to delete barcode image from server. ''' if isinstance(barcode, string_types): barcode = frappe.get_doc('File', barcode) - lifespan = frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image') + lifespan = frappe.db.get_value('System Settings', 'System Settings', 'lifespan_qrcode_image') or 240 if time_diff_in_seconds(get_datetime(), barcode.creation) > int(lifespan): return True return False From 74e2e051623ad0ec4d599169933f9fa00d095098 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 26 Sep 2019 14:00:55 +0530 Subject: [PATCH 014/226] fix(test): two_factor --- frappe/tests/test_twofactor.py | 4 ++-- frappe/utils/redis_wrapper.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py index 27129d9832..57c98d2aee 100644 --- a/frappe/tests/test_twofactor.py +++ b/frappe/tests/test_twofactor.py @@ -157,8 +157,8 @@ def create_http_request(): '''Get http request object.''' set_request(method='POST', path='login') enable_2fa() - frappe.form_dict['usr'] = 'test@erpnext.com' - frappe.form_dict['pwd'] = 'test' + frappe.form_dict['usr'] = 'test@example.com' + frappe.form_dict['pwd'] = 'Eastern_43A1W' frappe.local.form_dict['cmd'] = 'login' http_requests = HTTPRequest() return http_requests diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index 204efc9d1e..4af59bceb2 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -43,7 +43,7 @@ class RedisWrapper(redis.Redis): try: if expires_in_sec: - self.setex(key, pickle.dumps(val), expires_in_sec) + self.setex(key, expires_in_sec, pickle.dumps(val)) else: self.set(key, pickle.dumps(val)) From 2415eac7708d50f98cbb7af9ffd0806a4027e05e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 26 Sep 2019 15:59:32 +0530 Subject: [PATCH 015/226] fix(minor): postgres compatibility --- frappe/tests/test_scheduler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 4f4c918576..0ce7265fd7 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -25,7 +25,7 @@ class TestScheduler(TestCase): sync_jobs() def test_enqueue_jobs(self): - frappe.db.sql('update `tabScheduled Job Type` set last_execution = "2010-01-01 00:00:00"') + frappe.db.sql("update `tabScheduled Job Type` set last_execution = '2010-01-01 00:00:00'") frappe.flags.execute_job = True enqueue_events(site = frappe.local.site) From a050312b1a35bf04c4c0e274b5a50b76ff8e48e5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 27 Sep 2019 12:13:45 +0530 Subject: [PATCH 016/226] fix(linting): added .codacy.yml to ignore .sql files --- .codacy.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .codacy.yml diff --git a/.codacy.yml b/.codacy.yml new file mode 100644 index 0000000000..944b90d2ac --- /dev/null +++ b/.codacy.yml @@ -0,0 +1,2 @@ +exclude_paths: + - '*.sql' \ No newline at end of file From a93fcd3de6a2dd8f1337f5b62c12f109afa461ed Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 27 Sep 2019 12:46:07 +0530 Subject: [PATCH 017/226] fix(minor): rename "queue" to "frequency" --- .codacy.yml | 2 +- .../scheduled_job_type.json | 24 +++++++++---------- .../scheduled_job_type/scheduled_job_type.py | 18 ++++++-------- .../test_scheduled_job_type.py | 6 ++--- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.codacy.yml b/.codacy.yml index 944b90d2ac..4754a63e7e 100644 --- a/.codacy.yml +++ b/.codacy.yml @@ -1,2 +1,2 @@ exclude_paths: - - '*.sql' \ No newline at end of file + - '**.sql' \ No newline at end of file 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 d35b88e9de..1aafdb47b0 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -13,7 +13,7 @@ "field_order": [ "stopped", "method", - "queue", + "frequency", "cron_format", "last_execution", "create_log" @@ -27,16 +27,6 @@ "read_only": 1, "reqd": 1 }, - { - "fieldname": "queue", - "fieldtype": "Select", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Queue", - "options": "All\nHourly\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", - "read_only": 1, - "reqd": 1 - }, { "default": "0", "fieldname": "stopped", @@ -63,6 +53,16 @@ "fieldtype": "Data", "label": "Cron Format", "read_only": 1 + }, + { + "fieldname": "frequency", + "fieldtype": "Select", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Frequency", + "options": "All\nHourly\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", + "read_only": 1, + "reqd": 1 } ], "in_create": 1, @@ -72,7 +72,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2019-09-25 11:54:58.013623", + "modified": "2019-09-27 12:19:23.259989", "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 dcdf810995..38123cea33 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -16,7 +16,7 @@ class ScheduledJobType(Document): self.name = '.'.join(self.method.split('.')[-2:]) def validate(self): - if self.queue != 'All': + if self.frequency != 'All': # force logging for all events other than continuous ones (ALL) self.create_log = 1 @@ -34,10 +34,6 @@ class ScheduledJobType(Document): enqueue('frappe.core.doctype.scheduled_job_type.scheduled_job_type.run_scheduled_job', queue = self.get_queue_name(), job_type=self.method) return True - else: - pass - else: - pass return False @@ -69,7 +65,7 @@ class ScheduledJobType(Document): } if not self.cron_format: - self.cron_format = CRON_MAP[self.queue] + self.cron_format = CRON_MAP[self.frequency] return croniter(self.cron_format, get_datetime(self.last_execution)).get_next(datetime) @@ -105,7 +101,7 @@ class ScheduledJobType(Document): frappe.db.commit() def get_queue_name(self): - return 'long' if ('Long' in self.queue) else 'default' + return 'long' if ('Long' in self.frequency) else 'default' @frappe.whitelist() def execute_event(doc): @@ -145,16 +141,16 @@ def insert_cron_event(events, all_events): def insert_event_list(events, event_type, all_events): for event in events: all_events.append(event) - queue = event_type.replace('_', ' ').title() - insert_single_event(queue, event) + frequency = event_type.replace('_', ' ').title() + insert_single_event(frequency, event) -def insert_single_event(queue, event, cron_format = None): +def insert_single_event(frequency, event, cron_format = None): if not frappe.db.exists('Scheduled Job Type', dict(method=event)): frappe.get_doc(dict( doctype = 'Scheduled Job Type', method = event, cron_format = cron_format, - queue = queue + frequency = frequency )).insert() def clear_events(all_events, scheduler_events): diff --git a/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py index 75af876367..6a4530f6ff 100644 --- a/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py @@ -20,16 +20,16 @@ class TestScheduledJobType(unittest.TestCase): def test_sync_jobs(self): all_job = frappe.get_doc('Scheduled Job Type', dict(method='frappe.email.queue.flush')) - self.assertEqual(all_job.queue, 'All') + self.assertEqual(all_job.frequency, 'All') daily_job = frappe.get_doc('Scheduled Job Type', dict(method='frappe.email.queue.clear_outbox')) - self.assertEqual(daily_job.queue, 'Daily') + self.assertEqual(daily_job.frequency, 'Daily') # check if cron jobs are synced cron_job = frappe.get_doc('Scheduled Job Type', dict(method='frappe.oauth.delete_oauth2_data')) - self.assertEqual(cron_job.queue, 'Cron') + self.assertEqual(cron_job.frequency, 'Cron') self.assertEqual(cron_job.cron_format, '0/15 * * * *') def test_daily_job(self): From 2c54347076d9e1f4c983149618df75c2a77690e0 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 27 Sep 2019 13:13:06 +0530 Subject: [PATCH 018/226] fix(minor): rename "queue" to "frequency" --- frappe/tests/test_scheduler.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py index 0ce7265fd7..e554fd23be 100644 --- a/frappe/tests/test_scheduler.py +++ b/frappe/tests/test_scheduler.py @@ -62,7 +62,7 @@ class TestScheduler(TestCase): self.assertTrue(schedule_jobs_based_on_activity(check_time = add_days(frappe.db.get_last_created('Activity Log'), 5))) # create a fake job executed 5 days from now - job = get_test_job(method='frappe.tests.test_scheduler.test_method', queue='Daily') + job = get_test_job(method='frappe.tests.test_scheduler.test_method', frequency='Daily') job.execute() job_log = frappe.get_doc('Scheduled Job Log', dict(scheduled_job_type=job.name)) job_log.db_set('creation', add_days(frappe.db.get_last_created('Activity Log'), 5)) @@ -87,18 +87,18 @@ class TestScheduler(TestCase): self.assertTrue(job.is_failed) -def get_test_job(method='frappe.tests.test_scheduler.test_timeout_10', queue='All'): +def get_test_job(method='frappe.tests.test_scheduler.test_timeout_10', frequency='All'): if not frappe.db.exists('Scheduled Job Type', dict(method=method)): job = frappe.get_doc(dict( doctype = 'Scheduled Job Type', method = method, last_execution = '2010-01-01 00:00:00', - queue = queue + frequency = frequency )).insert() else: job = frappe.get_doc('Scheduled Job Type', dict(method=method)) job.db_set('last_execution', '2010-01-01 00:00:00') - job.db_set('queue', queue) + job.db_set('frequency', frequency) frappe.db.commit() return job From 8d4610504a243cd5bc55a9bd753ff919b5e0d031 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 6 Nov 2019 10:01:31 +0530 Subject: [PATCH 019/226] fix(notifications): login, logout notifications --- frappe/desk/notifications.py | 24 ++++++++++++++++-------- frappe/tests/test_api.py | 21 +++++++++++---------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 84d515050c..0216ab83af 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -11,15 +11,19 @@ import json @frappe.whitelist() @frappe.read_only() def get_notifications(): + out = { + "open_count_doctype": {}, + "targets": {}, + } if (frappe.flags.in_install or not frappe.db.get_single_value('System Settings', 'setup_complete')): - return { - "open_count_doctype": {}, - "targets": {}, - } + return out config = get_notification_config() + if not config: + return out + groups = list(config.get("for_doctype")) + list(config.get("for_module")) cache = frappe.cache() @@ -31,10 +35,10 @@ def get_notifications(): if count is not None: notification_count[name] = count - return { - "open_count_doctype": get_notifications_for_doctypes(config, notification_count), - "targets": get_notifications_for_targets(config, notification_percent), - } + out['open_count_doctype'] = get_notifications_for_doctypes(config, notification_count) + out['targets'] = get_notifications_for_targets(config, notification_percent) + + return out def get_notifications_for_doctypes(config, notification_count): """Notifications for DocTypes""" @@ -118,6 +122,10 @@ def clear_notifications(user=None): return cache = frappe.cache() config = get_notification_config() + + if not config: + return + for_doctype = list(config.get('for_doctype')) if config.get('for_doctype') else [] for_module = list(config.get('for_module')) if config.get('for_module') else [] groups = for_doctype + for_module diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py index 232b2be4a8..19ea9a0124 100644 --- a/frappe/tests/test_api.py +++ b/frappe/tests/test_api.py @@ -5,13 +5,14 @@ from __future__ import unicode_literals import unittest, frappe, os from frappe.core.doctype.user.user import generate_keys from frappe.frappeclient import FrappeClient +from frappe.utils.data import get_url import requests import base64 class TestAPI(unittest.TestCase): def test_insert_many(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title in ('Sing','a','song','of','sixpence')") frappe.db.commit() @@ -30,7 +31,7 @@ class TestAPI(unittest.TestCase): self.assertTrue(frappe.db.get_value('Note', {'title': 'sixpence'})) def test_create_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title = 'test_create'") frappe.db.commit() @@ -39,13 +40,13 @@ class TestAPI(unittest.TestCase): self.assertTrue(frappe.db.get_value('Note', {'title': 'test_create'})) def test_list_docs(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) doc_list = server.get_list("Note") self.assertTrue(len(doc_list)) def test_get_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title = 'get_this'") frappe.db.commit() @@ -56,7 +57,7 @@ class TestAPI(unittest.TestCase): self.assertTrue(doc) def test_update_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title in ('Sing','sing')") frappe.db.commit() @@ -68,7 +69,7 @@ class TestAPI(unittest.TestCase): self.assertTrue(doc["title"] == changed_title) def test_delete_doc(self): - server = FrappeClient(frappe.get_site_config().host_name, "Administrator", "admin", verify=False) + server = FrappeClient(get_url(), "Administrator", "admin", verify=False) frappe.db.sql("delete from `tabNote` where title = 'delete'") frappe.db.commit() @@ -90,21 +91,21 @@ class TestAPI(unittest.TestCase): api_key = frappe.db.get_value("User", "Administrator", "api_key") header = {"Authorization": "token {}:{}".format(api_key, generated_secret)} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 200) self.assertEqual("Administrator", res.json()["message"]) self.assertEqual(keys['api_secret'], generated_secret) header = {"Authorization": "Basic {}".format(base64.b64encode(frappe.safe_encode("{}:{}".format(api_key, generated_secret))).decode())} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 200) self.assertEqual("Administrator", res.json()["message"]) # Valid api key, invalid api secret api_secret = "ksk&93nxoe3os" header = {"Authorization": "token {}:{}".format(api_key, api_secret)} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 403) @@ -112,5 +113,5 @@ class TestAPI(unittest.TestCase): api_key = "@3djdk3kld" api_secret = "ksk&93nxoe3os" header = {"Authorization": "token {}:{}".format(api_key, api_secret)} - res = requests.post(frappe.get_site_config().host_name + "/api/method/frappe.auth.get_logged_user", headers=header) + res = requests.post(get_url() + "/api/method/frappe.auth.get_logged_user", headers=header) self.assertEqual(res.status_code, 401) From d1e461623199a4918752bf524f3bfb83d4fdcf74 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 7 Nov 2019 12:34:38 +0530 Subject: [PATCH 020/226] fix(test): the test event has hanged frequency --- .../core/doctype/scheduled_job_type/test_scheduled_job_type.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py index 6a4530f6ff..ec1e70ad6a 100644 --- a/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/test_scheduled_job_type.py @@ -40,7 +40,7 @@ class TestScheduledJobType(unittest.TestCase): self.assertFalse(job.is_event_due(get_datetime('2019-01-01 23:59:59'))) def test_weekly_job(self): - job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.utils.change_log.check_for_update')) + job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.social.doctype.energy_point_log.energy_point_log.send_weekly_summary')) job.db_set('last_execution', '2019-01-01 00:00:00') self.assertTrue(job.is_event_due(get_datetime('2019-01-06 00:00:01'))) self.assertFalse(job.is_event_due(get_datetime('2019-01-02 00:00:06'))) From 0c77540ed4fad1f138d73ac3518e6367092ec0d6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 7 Nov 2019 15:07:56 +0530 Subject: [PATCH 021/226] fix(ux): added dropdown in print layout to avoid linebreak and fix for login --- frappe/desk/notifications.py | 2 ++ .../frappe/form/templates/print_layout.html | 25 +++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 0216ab83af..b142047059 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -147,6 +147,8 @@ def delete_notification_count_for(doctype): def clear_doctype_notifications(doc, method=None, *args, **kwargs): config = get_notification_config() + if not config: + return if isinstance(doc, string_types): doctype = doc # assuming doctype name was passed directly else: diff --git a/frappe/public/js/frappe/form/templates/print_layout.html b/frappe/public/js/frappe/form/templates/print_layout.html index 9bdba0d99d..e4197aa0a2 100644 --- a/frappe/public/js/frappe/form/templates/print_layout.html +++ b/frappe/public/js/frappe/form/templates/print_layout.html @@ -15,18 +15,27 @@
- - {%= __("Print") %} - - {%= __("Settings...") %} - - - {%= __("Customize...") %} + + {%= __("Full Page") %} {%= __("PDF") %} + + {%= __("Print") %}
From da2d1d7bb1483a947b865a7613783d9c8a69d32f Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Sun, 10 Nov 2019 10:22:16 +0530 Subject: [PATCH 022/226] fix: add index on child table --- .../doctype/global_search_doctype/global_search_doctype.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/global_search_doctype/global_search_doctype.py b/frappe/desk/doctype/global_search_doctype/global_search_doctype.py index 4c9a948278..bf3b4d3040 100644 --- a/frappe/desk/doctype/global_search_doctype/global_search_doctype.py +++ b/frappe/desk/doctype/global_search_doctype/global_search_doctype.py @@ -3,8 +3,10 @@ # For license information, please see license.txt from __future__ import unicode_literals -# import frappe +import frappe from frappe.model.document import Document class GlobalSearchDocType(Document): - pass + + def on_doctype_update(): + frappe.db.add_index("Global Search DocType", ["document_type"]) From 9c3132753c35f50de6b88a677453790b684da7c6 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 8 Nov 2019 22:20:23 +0530 Subject: [PATCH 023/226] feat: Child Table pagination --- frappe/public/js/frappe/form/form.js | 6 +- frappe/public/js/frappe/form/grid.js | 252 +++++++++++------- .../public/js/frappe/form/grid_pagination.js | 127 +++++++++ frappe/public/less/form_grid.less | 26 ++ 4 files changed, 313 insertions(+), 98 deletions(-) create mode 100644 frappe/public/js/frappe/form/grid_pagination.js diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 5a983986d8..d565435a83 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -328,7 +328,11 @@ frappe.ui.form.Form = class FrappeForm { } } // reset visible columns, since column headings can change in different docs - this.grids.forEach(grid_obj => grid_obj.grid.visible_columns = null); + this.grids.forEach(grid_obj => { + grid_obj.grid.visible_columns = null + // reset page number to 1 + grid_obj.grid.grid_pagination.go_to_page(1); + }); frappe.ui.form.close_grid_form(); this.docname = docname; } diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 90e0f90be7..dcbfac33a8 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -2,6 +2,7 @@ // MIT License. See license.txt import GridRow from "./grid_row"; +import GridPagination from './grid_pagination' frappe.ui.form.get_open_grid_form = function() { return $(".grid-row-open").data("grid_row"); @@ -63,25 +64,37 @@ export default class Grid {
-
+
+ style="margin-right: 4px;" + data-action="delete_rows"> + ${__("Delete")} + + + ${__("Add Row")} +
-
+
+
+
@@ -92,9 +105,21 @@ export default class Grid { .appendTo(this.parent) .attr("data-fieldname", this.df.fieldname); + frappe.utils.bind_actions_with_object(this.wrapper, this); + this.form_grid = this.wrapper.find('.form-grid'); - this.wrapper.find(".grid-add-row").click(function() { + this.grid_pagination = new GridPagination({ + grid: this, + wrapper: this.wrapper, + }) + + this.wrapper.find(".grid-add-row").click( () => { + if (this.data.length == this.grid_pagination.page_length*this.grid_pagination.total_pages) { + this.grid_pagination.go_to_page(this.grid_pagination.total_pages + 1); + } else { + this.grid_pagination.go_to_page(this.grid_pagination.total_pages); + } me.add_new_row(null, null, true); me.set_focus_on_row(); @@ -103,7 +128,8 @@ export default class Grid { this.custom_buttons = {}; this.grid_buttons = this.wrapper.find('.grid-buttons'); - this.remove_rows_button = this.grid_buttons.find('.grid-remove-rows') + this.remove_rows_button = this.grid_buttons.find('.grid-remove-rows'); + this.remove_all_rows_button = this.grid_buttons.find('.grid-remove-all-rows'); this.setup_allow_bulk_edit(); this.setup_check(); @@ -113,10 +139,9 @@ export default class Grid { } setup_check() { - var me = this; - this.wrapper.on('click', '.grid-row-check', function(e) { - var $check = $(this); + this.wrapper.on('click', '.grid-row-check', (e) => { + var $check = $(e.currentTarget); if($check.parents('.grid-heading-row:first').length!==0) { // select all? var checked = $check.prop('checked'); @@ -124,56 +149,74 @@ export default class Grid { .find('.grid-row-check').prop('checked', checked); // set all - (me.grid_rows || []).forEach(function(row) { row.doc.__checked = checked ? 1 : 0; }); + let result_length = this.grid_pagination.get_result_length(); + let page_index = this.grid_pagination.page_index; + let page_length = this.grid_pagination.page_length; + for (var ri = (page_index-1)*page_length; ri < result_length; ri++) { + this.grid_rows[ri].doc.__checked = checked ? 1: 0; + } } else { var docname = $check.parents('.grid-row:first').attr('data-name'); - me.grid_rows_by_docname[docname].select($check.prop('checked')); + this.grid_rows_by_docname[docname].select($check.prop('checked')); } - me.refresh_remove_rows_button(); + this.refresh_remove_rows_button(); }); - this.remove_rows_button.on('click', function() { - var dirty = false; - - let tasks = []; - me.get_selected_children().forEach((doc) => { - tasks.push(() => { - if (!me.frm) { - me.df.data = me.get_data(); - me.df.data = me.df.data.filter((row)=> row.idx != doc.idx); - } - me.grid_rows_by_docname[doc.name].remove(); - dirty = true; - }); - tasks.push(() => frappe.timeout(0.1)); - }); - - if (!me.frm) { - tasks.push(() => { - // reorder idx of df.data - me.df.data.forEach((row, index) => row.idx = index + 1); - }); - } - - tasks.push(() => { - if (dirty) me.refresh(); - }); - - frappe.run_serially(tasks); - }); } + + delete_rows() { + var dirty = false; + + let tasks = []; + + this.get_selected_children().forEach((doc) => { + tasks.push(() => { + if (!this.frm) { + this.df.data = this.get_data(); + this.df.data = this.df.data.filter((row)=> row.idx != doc.idx); + } + this.grid_rows_by_docname[doc.name].remove(); + dirty = true; + }); + tasks.push(() => frappe.timeout(0.1)); + }); + + if (!this.frm) { + tasks.push(() => { + // reorder idx of df.data + this.df.data.forEach((row, index) => row.idx = index + 1); + }); + } + + tasks.push(() => { + if (dirty) this.refresh(); + }); + + frappe.run_serially(tasks); + } + + delete_all_rows() { + this.frm.doc[this.df.fieldname] = []; + this.refresh(); + } + select_row(name) { this.grid_rows_by_docname[name].select(); } + remove_all() { this.grid_rows.forEach(row => { row.remove(); }); } + refresh_remove_rows_button() { this.remove_rows_button.toggleClass('hidden', this.wrapper.find('.grid-body .grid-row-check:checked:first').length ? false : true); + this.remove_all_rows_button.toggleClass('hidden', + this.wrapper.find('.grid-body .grid-row-check:checked:first').length ? false : true); } + get_selected() { return (this.grid_rows || []).map(function(row) { return row.doc.__checked ? row.doc.name : null; }) .filter(function(d) { return d; }); @@ -195,10 +238,11 @@ export default class Grid { } } refresh(force) { + this.data = this.get_data(); + !this.wrapper && this.make(); var me = this, - $rows = $(me.parent).find(".rows"), - data = this.get_data(); + $rows = $(me.parent).find(".rows"); this.setup_fields(); @@ -220,36 +264,13 @@ export default class Grid { this.grid_rows = []; } - this.truncate_rows(data); + this.truncate_rows(); this.grid_rows_by_docname = {}; - for(var ri=0; ri < data.length; ri++) { - var d = data[ri]; - - if(d.idx===undefined) { - d.idx = ri + 1; - } - - if(this.grid_rows[ri]) { - var grid_row = this.grid_rows[ri]; - grid_row.doc = d; - grid_row.refresh(); - } else { - var grid_row = new GridRow({ - parent: $rows, - parent_df: this.df, - docfields: this.docfields, - doc: d, - frm: this.frm, - grid: this - }); - this.grid_rows.push(grid_row); - } - - this.grid_rows_by_docname[d.name] = grid_row; - } - - this.wrapper.find(".grid-empty").toggleClass("hidden", Boolean(data.length)); + this.grid_pagination.update_page_numbers(); + this.render_result_rows($rows, false); + this.grid_pagination.check_page_number(); + this.wrapper.find(".grid-empty").toggleClass("hidden", Boolean(this.data.length)); // toolbar this.setup_toolbar(); @@ -267,18 +288,55 @@ export default class Grid { // frappe.utils.scroll_to(_scroll_y); // red if mandatory - this.form_grid.toggleClass('error', !!(this.df.reqd && !(data && data.length))); + this.form_grid.toggleClass('error', !!(this.df.reqd && !(this.data && this.data.length))); this.refresh_remove_rows_button(); this.wrapper.trigger('change'); } + + + render_result_rows($rows, append_row) { + + let result_length = this.grid_pagination.get_result_length(); + let page_index = this.grid_pagination.page_index; + let page_length = this.grid_pagination.page_length; + + for (var ri = (page_index-1)*page_length; ri < result_length; ri++) { + var d = this.data[ri]; + if (!d) { + return; + } + if (d.idx===undefined) { + d.idx = ri + 1; + } + if (this.grid_rows[ri] && !append_row) { + var grid_row = this.grid_rows[ri]; + grid_row.doc = d; + grid_row.refresh(); + } else { + var grid_row = new GridRow({ + parent: $rows, + parent_df: this.df, + docfields: this.docfields, + doc: d, + frm: this.frm, + grid: this + }); + this.grid_rows[ri] = grid_row; + } + + this.grid_rows_by_docname[d.name] = grid_row; + } + } + setup_toolbar() { - if(this.is_editable()) { + + if (this.is_editable()) { this.wrapper.find(".grid-footer").toggle(true); // show, hide buttons to add rows - if(this.cannot_add_rows || (this.df && this.df.cannot_add_rows)) { + if (this.cannot_add_rows || (this.df && this.df.cannot_add_rows)) { // add 'hidden' to buttons this.wrapper.find(".grid-add-row, .grid-add-multiple-rows") .addClass('hidden'); @@ -286,24 +344,23 @@ export default class Grid { // show buttons this.wrapper.find(".grid-add-row").removeClass('hidden'); - if(this.multiple_set) { + if (this.multiple_set) { this.wrapper.find(".grid-add-multiple-rows").removeClass('hidden'); } } - - } else { + } else if (this.grid_rows.length < this.grid_pagination.page_length ) { this.wrapper.find(".grid-footer").toggle(false); } } - truncate_rows(data) { - if(this.grid_rows.length > data.length) { + truncate_rows() { + if (this.grid_rows.length > this.data.length) { // remove extra rows - for(var i=data.length; i < this.grid_rows.length; i++) { + for(var i=this.data.length; i < this.grid_rows.length; i++) { var grid_row = this.grid_rows[i]; grid_row.wrapper.remove(); } - this.grid_rows.splice(data.length); + this.grid_rows.splice(this.data.length); } } setup_fields() { @@ -349,14 +406,14 @@ export default class Grid { } // prevent drag behaviour if _sortable property is "false" let idx = $(event.dragged).closest('.grid-row').attr('data-idx'); - let doc = this.get_data()[idx - 1]; + let doc = this.data[idx%this.grid_pagination.page_length]; if (doc && doc._sortable === false) { return false; } }, onUpdate: (event) => { let idx = $(event.item).closest('.grid-row').attr('data-idx'); - let doc = this.get_data()[idx - 1]; + let doc = this.data[idx%this.grid_pagination.page_length]; this.renumber_based_on_dom(); this.frm.script_manager.trigger(this.df.fieldname + "_move", this.df.options, doc.name); this.refresh(); @@ -370,9 +427,10 @@ export default class Grid { var data = this.frm ? this.frm.doc[this.df.fieldname] || [] : this.df.data || this.get_modal_data(); - data.sort(function(a, b) { return a.idx - b.idx}); + // data.sort(function(a, b) { return a.idx - b.idx}); return data; } + get_modal_data() { return this.df.get_data() ? this.df.get_data().filter(data => { if (!this.deleted_docs || !in_list(this.deleted_docs, data.name)) { @@ -380,6 +438,7 @@ export default class Grid { } }) : []; } + set_column_disp(fieldname, show) { if($.isArray(fieldname)) { var me = this; @@ -395,6 +454,7 @@ export default class Grid { this.refresh(true); } + set_editable_grid_column_disp(fieldname, show) { //Hide columns for editable grids if (this.meta.editable_grid && this.grid_rows) { @@ -516,20 +576,18 @@ export default class Grid { renumber_based_on_dom() { // renumber based on dom let me = this; - let $rows = $(me.parent).find(".rows"); - - me.grid_rows = []; - me.frm.doc[me.df.fieldname] = []; - - $rows.find(".grid-row").each(function(i, item) { + let $rows = $(this.parent).find(".rows"); + $rows.find(".grid-row").each( (i, item) => { let $item = $(item); - let d = locals[me.doctype][$item.attr('data-name')]; - d.idx = i + 1; + let index = (this.grid_pagination.page_index-1)*this.grid_pagination.page_length+i; + let d = locals[this.doctype][$item.attr('data-name')]; + d.idx = index + 1; $item.attr('data-idx', d.idx); - me.frm.doc[me.df.fieldname].push(d); - me.grid_rows.push(me.grid_rows_by_docname[d.name]); + this.frm.doc[this.df.fieldname][index] = (d); + this.data[index] = d; + this.grid_rows[index]=(this.grid_rows_by_docname[d.name]); }); } diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js new file mode 100644 index 0000000000..6d9be0a060 --- /dev/null +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -0,0 +1,127 @@ +export default class GridPagination { + + constructor(opts) { + $.extend(this, opts); + this.setup_pagination(); + } + + setup_pagination() { + this.page_length = 10; + this.page_index = 1; + this.total_pages = Math.ceil(this.grid.data.length/this.page_length); + this.pages_to_skip = 3; + + this.render_pagination(); + } + + render_pagination() { + if (this.grid.data.length <= this.page_length) { + this.wrapper.find('.grid-pagination').html(''); + } else { + let $pagination_template = this.get_pagination_html(); + this.wrapper.find('.grid-pagination').html($pagination_template); + this.prev_page_button = this.wrapper.find('.prev-page'); + this.next_page_button = this.wrapper.find('.next-page'); + this.$page_number = this.wrapper.find('.current-page-number'); + this.$total_pages = this.wrapper.find('.total-page-number'); + this.first_page_button = this.wrapper.find('.first-page'); + this.last_page_button = this.wrapper.find('.last-page'); + + this.bind_pagination_events(); + } + } + + bind_pagination_events() { + this.prev_page_button.on('click', () => { + this.render_prev_page(); + }); + + this.next_page_button.on('click', () => { + this.render_next_page(); + }); + + this.first_page_button.on('click', () => { + this.go_to_page(1); + }); + + this.last_page_button.on('click', () => { + this.go_to_page(this.total_pages); + }); + } + + + update_page_numbers() { + let total_pages = Math.ceil(this.grid.data.length/this.page_length); + if (this.total_pages !== total_pages) { + this.total_pages = total_pages; + this.render_pagination(); + } + } + + check_page_number() { + if (this.page_index > this.total_pages && this.page_index > 1) { + console.log('true greater', this.page_index); + this.go_to_page(this.page_index-1); + } + } + + get_pagination_html() { + let page_text_html = `
+ ${__(this.page_index)} + ${__('of')} + ${__(this.total_pages)} +
`; + + return $(` + ‹ + ${page_text_html} + › + `); + } + + render_next_page() { + if (this.page_index*this.page_length < this.grid.data.length) { + this.page_index++; + this.go_to_page(); + } + } + + render_prev_page() { + if (this.page_index > 1) { + this.page_index--; + this.go_to_page(); + } + } + + go_to_page(index) { + if (!index) { + index = this.page_index; + } else { + this.page_index = index; + } + let $rows = $(this.grid.parent).find(".rows").empty(); + this.grid.render_result_rows($rows, true); + if (this.$page_number) { + this.$page_number.text(index); + } + + this.update_page_numbers(); + // if (this.page_index > this.total_pages) { + // this.total_pages++; + // this.$total_pages.text(this.total_pages); + // } + } + + get_result_length() { + return this.grid.data.length < this.page_index*this.page_length + ? this.grid.data.length + : this.page_index*this.page_length; + } + +} \ No newline at end of file diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less index 7b498c1e26..f41b60d4cb 100644 --- a/frappe/public/less/form_grid.less +++ b/frappe/public/less/form_grid.less @@ -268,6 +268,32 @@ border-top: 0px; } +.grid-pagination { + padding: 0; +} + +.page-text { + display: inline-block; +} + +.prev-page, .next-page { + font-size: 14px; +} + +a.prev-page { + padding-left: 15px; + text-decoration: none; +} + +a.next-page { + padding-right: 15px; + text-decoration: none; +} + +.page-number { + padding: 0 3px; +} + .grid-footer-toolbar { padding: 10px 15px; border-top: 1px solid @border-color; From e455fd5b52a998e2350bf3b4924e29742e7dad15 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 11 Nov 2019 12:52:14 +0530 Subject: [PATCH 024/226] fix: code formatting --- frappe/public/js/frappe/form/grid.js | 221 ++++++++++-------- .../public/js/frappe/form/grid_pagination.js | 5 - 2 files changed, 121 insertions(+), 105 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index dcbfac33a8..ea50f6895f 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -48,8 +48,8 @@ export default class Grid { return false; } } + make() { - var me = this; let template = `
@@ -83,7 +83,9 @@ export default class Grid { ${__("Add Multiple")} -
@@ -103,28 +105,13 @@ export default class Grid { this.wrapper = $(template) .appendTo(this.parent) - .attr("data-fieldname", this.df.fieldname); + .attr('data-fieldname', this.df.fieldname); frappe.utils.bind_actions_with_object(this.wrapper, this); this.form_grid = this.wrapper.find('.form-grid'); - this.grid_pagination = new GridPagination({ - grid: this, - wrapper: this.wrapper, - }) - - this.wrapper.find(".grid-add-row").click( () => { - if (this.data.length == this.grid_pagination.page_length*this.grid_pagination.total_pages) { - this.grid_pagination.go_to_page(this.grid_pagination.total_pages + 1); - } else { - this.grid_pagination.go_to_page(this.grid_pagination.total_pages); - } - me.add_new_row(null, null, true); - me.set_focus_on_row(); - - return false; - }); + this.setup_grid_pagination(); this.custom_buttons = {}; this.grid_buttons = this.wrapper.find('.grid-buttons'); @@ -138,11 +125,18 @@ export default class Grid { } } + setup_grid_pagination() { + this.grid_pagination = new GridPagination({ + grid: this, + wrapper: this.wrapper, + }); + } + setup_check() { this.wrapper.on('click', '.grid-row-check', (e) => { var $check = $(e.currentTarget); - if($check.parents('.grid-heading-row:first').length!==0) { + if ($check.parents('.grid-heading-row:first').length !== 0) { // select all? var checked = $check.prop('checked'); $check.parents('.form-grid:first') @@ -169,11 +163,11 @@ export default class Grid { let tasks = []; - this.get_selected_children().forEach((doc) => { + this.get_selected_children().forEach(doc => { tasks.push(() => { if (!this.frm) { this.df.data = this.get_data(); - this.df.data = this.df.data.filter((row)=> row.idx != doc.idx); + this.df.data = this.df.data.filter(row => row.idx != doc.idx); } this.grid_rows_by_docname[doc.name].remove(); dirty = true; @@ -218,16 +212,18 @@ export default class Grid { } get_selected() { - return (this.grid_rows || []).map(function(row) { return row.doc.__checked ? row.doc.name : null; }) - .filter(function(d) { return d; }); + return (this.grid_rows || []).map(row => { return row.doc.__checked ? row.doc.name : null; }) + .filter(d => { return d; }); } + get_selected_children() { - return (this.grid_rows || []).map(function(row) { return row.doc.__checked ? row.doc : null; }) - .filter(function(d) { return d; }); + return (this.grid_rows || []).map(row => { return row.doc.__checked ? row.doc : null; }) + .filter(d => { return d; }); } + make_head() { // labels - if(!this.header_row) { + if (!this.header_row) { this.header_row = new GridRow({ parent: $(this.parent).find(".grid-heading-row"), parent_df: this.df, @@ -237,16 +233,16 @@ export default class Grid { }); } } + refresh(force) { this.data = this.get_data(); !this.wrapper && this.make(); - var me = this, - $rows = $(me.parent).find(".rows"); + let $rows = $(this.parent).find('.rows'); this.setup_fields(); - if(this.frm) { + if (this.frm) { this.display_status = frappe.perm.get_field_display_status(this.df, this.frm.doc, this.perm); } else { @@ -260,7 +256,7 @@ export default class Grid { var _scroll_y = $(document).scrollTop(); this.make_head(); - if(!this.grid_rows) { + if (!this.grid_rows) { this.grid_rows = []; } @@ -270,14 +266,14 @@ export default class Grid { this.grid_pagination.update_page_numbers(); this.render_result_rows($rows, false); this.grid_pagination.check_page_number(); - this.wrapper.find(".grid-empty").toggleClass("hidden", Boolean(this.data.length)); + this.wrapper.find('.grid-empty').toggleClass('hidden', Boolean(this.data.length)); // toolbar this.setup_toolbar(); this.toggle_checkboxes(this.display_status !== 'Read'); // sortable - if(this.frm && this.is_sortable() && !this.sortable_setup_done) { + if (this.frm && this.is_sortable() && !this.sortable_setup_done) { this.make_sortable($rows); this.sortable_setup_done = true; } @@ -333,38 +329,39 @@ export default class Grid { setup_toolbar() { if (this.is_editable()) { - this.wrapper.find(".grid-footer").toggle(true); + this.wrapper.find('.grid-footer').toggle(true); // show, hide buttons to add rows if (this.cannot_add_rows || (this.df && this.df.cannot_add_rows)) { // add 'hidden' to buttons - this.wrapper.find(".grid-add-row, .grid-add-multiple-rows") + this.wrapper.find('.grid-add-row, .grid-add-multiple-rows') .addClass('hidden'); } else { // show buttons - this.wrapper.find(".grid-add-row").removeClass('hidden'); + this.wrapper.find('.grid-add-row').removeClass('hidden'); if (this.multiple_set) { - this.wrapper.find(".grid-add-multiple-rows").removeClass('hidden'); + this.wrapper.find('.grid-add-multiple-rows').removeClass('hidden'); } } - } else if (this.grid_rows.length < this.grid_pagination.page_length ) { - this.wrapper.find(".grid-footer").toggle(false); + } else if (this.grid_rows.length < this.page_length ) { + this.wrapper.find('.grid-footer').toggle(false); } } + truncate_rows() { if (this.grid_rows.length > this.data.length) { // remove extra rows - for(var i=this.data.length; i < this.grid_rows.length; i++) { + for (var i=this.data.length; i < this.grid_rows.length; i++) { var grid_row = this.grid_rows[i]; grid_row.wrapper.remove(); } this.grid_rows.splice(this.data.length); } } + setup_fields() { - var me = this; // reset docfield if (this.frm && this.frm.docname) { // use doc specific docfield object @@ -377,21 +374,23 @@ export default class Grid { } } - if(this.doctype && this.frm) { + if (this.doctype && this.frm) { this.docfields = frappe.meta.get_docfields(this.doctype, this.frm.docname); } else { // fields given in docfield this.docfields = this.df.fields; } - this.docfields.forEach(function(df) { - me.fields_map[df.fieldname] = df; + this.docfields.forEach(df => { + this.fields_map[df.fieldname] = df; }); } + refresh_row(docname) { this.grid_rows_by_docname[docname] && this.grid_rows_by_docname[docname].refresh(); } + make_sortable($rows) { new Sortable($rows.get(0), { group: {name: this.df.fieldname}, @@ -406,14 +405,14 @@ export default class Grid { } // prevent drag behaviour if _sortable property is "false" let idx = $(event.dragged).closest('.grid-row').attr('data-idx'); - let doc = this.data[idx%this.grid_pagination.page_length]; + let doc = this.data[idx%this.page_length]; if (doc && doc._sortable === false) { return false; } }, onUpdate: (event) => { let idx = $(event.item).closest('.grid-row').attr('data-idx'); - let doc = this.data[idx%this.grid_pagination.page_length]; + let doc = this.data[idx%this.page_length]; this.renumber_based_on_dom(); this.frm.script_manager.trigger(this.df.fieldname + "_move", this.df.options, doc.name); this.refresh(); @@ -423,6 +422,7 @@ export default class Grid { $(this.frm.wrapper).trigger("grid-make-sortable", [this.frm]); } + get_data() { var data = this.frm ? this.frm.doc[this.df.fieldname] || [] @@ -441,10 +441,9 @@ export default class Grid { set_column_disp(fieldname, show) { if($.isArray(fieldname)) { - var me = this; for(var i=0, l=fieldname.length; i { + row.columns_list.forEach( column => { //Hide the column specified if (column.df.fieldname == fieldname) { if (show) { @@ -493,27 +492,33 @@ export default class Grid { this.refresh(); } + toggle_reqd(fieldname, reqd) { this.get_docfield(fieldname).reqd = reqd; this.refresh(); } + toggle_enable(fieldname, enable) { this.get_docfield(fieldname).read_only = enable ? 0 : 1; this.refresh(); } + toggle_display(fieldname, show) { this.get_docfield(fieldname).hidden = show ? 0 : 1; this.refresh(); } + toggle_checkboxes(enable) { this.wrapper.find(".grid-row-check").prop('disabled', !enable) } + get_docfield(fieldname) { return frappe.meta.get_docfield(this.doctype, fieldname, this.frm ? this.frm.docname : null); } + get_row(key) { - if(typeof key == 'number') { - if(key < 0) { + if (typeof key == 'number') { + if (key < 0) { return this.grid_rows[this.grid_rows.length + key]; } else { return this.grid_rows[key]; @@ -522,9 +527,11 @@ export default class Grid { return this.grid_rows_by_docname[key]; } } + get_grid_row(key) { return this.get_row(key); } + get_field(fieldname) { // Note: workaround for get_query if(!this.fieldinfo[fieldname]) @@ -532,16 +539,29 @@ export default class Grid { } return this.fieldinfo[fieldname]; } + set_value(fieldname, value, doc) { if(this.display_status!=="None" && this.grid_rows_by_docname[doc.name]) { this.grid_rows_by_docname[doc.name].refresh_field(fieldname, value); } } + + add_row() { + let total_pages = this.grid_pagination.total_pages; + if (this.data.length == this.page_length*total_pages) { + this.grid_pagination.go_to_page(total_pages + 1); + } else { + this.grid_pagination.go_to_page(total_pages); + } + this.add_new_row(null, null, true); + this.set_focus_on_row(); + } + add_new_row(idx, callback, show, copy_doc) { - if(this.is_editable()) { - if(this.frm) { + if (this.is_editable()) { + if (this.frm) { var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx); - if(copy_doc) { + if (copy_doc) { d = this.duplicate_row(d, copy_doc); } d.__unedited = true; @@ -555,13 +575,13 @@ export default class Grid { this.refresh(); } - if(show) { - if(idx) { + if (show) { + if (idx) { // always open inserted rows this.wrapper.find("[data-idx='"+idx+"']").data("grid_row") .toggle_view(true, callback); } else { - if(!this.allow_on_grid_editing()) { + if (!this.allow_on_grid_editing()) { // open last row only if on-grid-editing is disabled this.wrapper.find(".grid-row:last").data("grid_row") .toggle_view(true, callback); @@ -575,12 +595,11 @@ export default class Grid { renumber_based_on_dom() { // renumber based on dom - let me = this; let $rows = $(this.parent).find(".rows"); $rows.find(".grid-row").each( (i, item) => { let $item = $(item); - let index = (this.grid_pagination.page_index-1)*this.grid_pagination.page_length+i; + let index = (this.page_index-1)*this.page_length+i; let d = locals[this.doctype][$item.attr('data-name')]; d.idx = index + 1; $item.attr('data-idx', d.idx); @@ -603,12 +622,11 @@ export default class Grid { } set_focus_on_row(idx) { - var me = this; if(!idx) { - idx = me.grid_rows.length - 1; + idx = this.grid_rows.length - 1; } - setTimeout(function() { - me.grid_rows[idx].row + setTimeout(() => { + this.grid_rows[idx].row .find('input[type="Text"],textarea,select').filter(':visible:first').focus(); }, 100); } @@ -621,21 +639,20 @@ export default class Grid { this.visible_columns = []; - for(var ci in fields) { + for (var ci in fields) { var _df = fields[ci]; // get docfield if from fieldname df = this.fields_map[_df.fieldname]; - if(!df.hidden + if (!df.hidden && (this.editable_fields || df.in_list_view) && (this.frm && this.frm.get_perm(df.permlevel, "read") || !this.frm) && !in_list(frappe.model.layout_fields, df.fieldtype)) { - if(df.columns) { + if (df.columns) { df.colsize=df.columns; - } - else { + } else { var colsize = 2; switch(df.fieldtype) { case "Text": @@ -654,7 +671,7 @@ export default class Grid { } total_colsize += df.colsize; - if(total_colsize > 11) + if (total_colsize > 11) return false; this.visible_columns.push([df, df.colsize]); } @@ -662,11 +679,11 @@ export default class Grid { // redistribute if total-col size is less than 12 var passes = 0; - while(total_colsize < 11 && passes < 12) { - for(var i in this.visible_columns) { + while (total_colsize < 11 && passes < 12) { + for (var i in this.visible_columns) { var df = this.visible_columns[i][0]; var colsize = this.visible_columns[i][1]; - if(colsize > 1 && colsize < 11 + if (colsize > 1 && colsize < 11 && !in_list(frappe.model.std_fields_list, df.fieldname)) { if (passes < 3 && ["Int", "Currency", "Float", "Check", "Percent"].indexOf(df.fieldtype)!==-1) { @@ -678,7 +695,7 @@ export default class Grid { total_colsize++; } - if(total_colsize > 10) + if (total_colsize > 10) break; } passes++; @@ -689,18 +706,20 @@ export default class Grid { is_editable() { return this.display_status=="Write" && !this.static_rows; } + is_sortable() { return this.sortable_status || this.is_editable(); } + only_sortable(status) { - if(status===undefined ? true : status) { + if (status===undefined ? true : status) { this.sortable_status = true; this.static_rows = true; } } + set_multiple_add(link, qty) { - if(this.multiple_set) return; - var me = this; + if (this.multiple_set) return; var link_field = frappe.meta.get_docfield(this.df.options, link); var btn = $(this.wrapper).find(".grid-add-multiple-rows"); @@ -708,27 +727,27 @@ export default class Grid { btn.removeClass('hidden'); // open link selector on click - btn.on("click", function() { + btn.on("click", () => { new frappe.ui.form.LinkSelector({ doctype: link_field.options, fieldname: link, qty_fieldname: qty, - target: me, + target: this, txt: "" }); return false; }); this.multiple_set = true; } + setup_allow_bulk_edit() { - var me = this; if(this.frm && this.frm.get_docfield(this.df.fieldname).allow_bulk_edit) { // download - me.setup_download(); + this.setup_download(); // upload frappe.flags.no_socketio = true; - $(this.wrapper).find(".grid-upload").removeClass('hidden').on("click", function() { + $(this.wrapper).find(".grid-upload").removeClass('hidden').on("click", () => { new frappe.ui.FileUploader({ as_dataurl: true, allow_multiple: false, @@ -737,29 +756,29 @@ export default class Grid { // row #2 contains fieldnames; var fieldnames = data[2]; - me.frm.clear_table(me.df.fieldname); - $.each(data, function(i, row) { + this.frm.clear_table(this.df.fieldname); + $.each(data, (i, row) => { if(i > 6) { var blank_row = true; $.each(row, function(ci, value) { - if(value) { + if (value) { blank_row = false; return false; } }); - if(!blank_row) { - var d = me.frm.add_child(me.df.fieldname); - $.each(row, function(ci, value) { + if (!blank_row) { + var d = this.frm.add_child(this.df.fieldname); + $.each(row, (ci, value) => { var fieldname = fieldnames[ci]; - var df = frappe.meta.get_docfield(me.df.options, fieldname); + var df = frappe.meta.get_docfield(this.df.options, fieldname); // convert date formatting - if(df.fieldtype==="Date" && value) { + if (df.fieldtype==="Date" && value) { value = frappe.datetime.user_to_str(value); } - if(df.fieldtype==="Int" || df.fieldtype==="Check") { + if (df.fieldtype==="Int" || df.fieldtype==="Check") { value = cint(value); } @@ -769,7 +788,7 @@ export default class Grid { } }); - me.frm.refresh_field(me.df.fieldname); + this.frm.refresh_field(this.df.fieldname); frappe.msgprint({message:__('Table updated'), title:__('Success'), indicator:'green'}) } }); @@ -777,10 +796,10 @@ export default class Grid { }); } } + setup_download() { - var me = this; - let title = me.df.label || frappe.model.unscrub(me.df.fieldname); - $(this.wrapper).find(".grid-download").removeClass('hidden').on("click", function() { + let title = this.df.label || frappe.model.unscrub(this.df.fieldname); + $(this.wrapper).find(".grid-download").removeClass('hidden').on("click", () => { var data = []; var docfields = []; data.push([__("Bulk Edit {0}", [title])]); @@ -790,7 +809,7 @@ export default class Grid { data.push([__("The CSV format is case sensitive")]); data.push([__("Do not edit headers which are preset in the template")]); data.push(["------"]); - $.each(frappe.get_meta(me.df.options).fields, function(i, df) { + $.each(frappe.get_meta(this.df.options).fields, (i, df) => { // don't include the read-only field in the template if(frappe.model.is_value_type(df.fieldtype)) { data[1].push(df.label); @@ -805,13 +824,13 @@ export default class Grid { }); // add data - $.each(me.frm.doc[me.df.fieldname] || [], function(i, d) { + $.each(this.frm.doc[this.df.fieldname] || [], (i, d) => { var row = []; - $.each(data[2], function(i, fieldname) { + $.each(data[2], (i, fieldname) => { var value = d[fieldname]; // format date - if(docfields[i].fieldtype==="Date" && value) { + if (docfields[i].fieldtype==="Date" && value) { value = frappe.datetime.str_to_user(value); } @@ -824,10 +843,11 @@ export default class Grid { return false; }); } + add_custom_button(label, click) { // add / unhide a custom button var btn = this.custom_buttons[label]; - if(!btn) { + if (!btn) { btn = $('') .css('margin-right', '4px') .prependTo(this.grid_buttons) @@ -837,6 +857,7 @@ export default class Grid { btn.removeClass('hidden'); } } + clear_custom_buttons() { // hide all custom buttons this.grid_buttons.find('.btn-custom').addClass('hidden'); diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index 6d9be0a060..2b29c5664e 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -60,7 +60,6 @@ export default class GridPagination { check_page_number() { if (this.page_index > this.total_pages && this.page_index > 1) { - console.log('true greater', this.page_index); this.go_to_page(this.page_index-1); } } @@ -112,10 +111,6 @@ export default class GridPagination { } this.update_page_numbers(); - // if (this.page_index > this.total_pages) { - // this.total_pages++; - // this.$total_pages.text(this.total_pages); - // } } get_result_length() { From 5772bfc7825154bbf448412edec6a7b7a05fb135 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 11 Nov 2019 14:59:37 +0530 Subject: [PATCH 025/226] fix: add multiple goes to last page --- frappe/public/js/frappe/form/grid.js | 24 ++++++++++--------- .../public/js/frappe/form/grid_pagination.js | 10 ++++++++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index ea50f6895f..f2ac4ad459 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -84,8 +84,7 @@ export default class Grid {
@@ -111,6 +110,8 @@ export default class Grid { this.form_grid = this.wrapper.find('.form-grid'); + this.setup_add_row(); + this.setup_grid_pagination(); this.custom_buttons = {}; @@ -546,19 +547,18 @@ export default class Grid { } } - add_row() { - let total_pages = this.grid_pagination.total_pages; - if (this.data.length == this.page_length*total_pages) { - this.grid_pagination.go_to_page(total_pages + 1); - } else { - this.grid_pagination.go_to_page(total_pages); - } - this.add_new_row(null, null, true); - this.set_focus_on_row(); + setup_add_row() { + this.wrapper.find(".grid-add-row").click(() => { + this.add_new_row(null, null, true); + this.set_focus_on_row(); + + return false; + }); } add_new_row(idx, callback, show, copy_doc) { if (this.is_editable()) { + this.grid_pagination.go_to_last_page(); if (this.frm) { var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx); if (copy_doc) { @@ -720,6 +720,7 @@ export default class Grid { set_multiple_add(link, qty) { if (this.multiple_set) return; + var link_field = frappe.meta.get_docfield(this.df.options, link); var btn = $(this.wrapper).find(".grid-add-multiple-rows"); @@ -735,6 +736,7 @@ export default class Grid { target: this, txt: "" }); + this.grid_pagination.go_to_last_page(); return false; }); this.multiple_set = true; diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index 2b29c5664e..7e615b60ab 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -113,6 +113,16 @@ export default class GridPagination { this.update_page_numbers(); } + go_to_last_page() { + let total_pages = this.total_pages; + let page_length = this.page_length; + if (this.grid.data.length == page_length*total_pages) { + this.go_to_page(total_pages + 1); + } else { + this.go_to_page(total_pages); + } + } + get_result_length() { return this.grid.data.length < this.page_index*this.page_length ? this.grid.data.length From 998ebf9d07afe7e98fca5cc204216934781fd8b1 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 11 Nov 2019 19:51:12 +0530 Subject: [PATCH 026/226] fix: change page length to 20 --- frappe/public/js/frappe/form/grid_pagination.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index 7e615b60ab..bf1fdc7320 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -6,7 +6,7 @@ export default class GridPagination { } setup_pagination() { - this.page_length = 10; + this.page_length = 20; this.page_index = 1; this.total_pages = Math.ceil(this.grid.data.length/this.page_length); this.pages_to_skip = 3; From 1cb2d36be0e7dc495eee22b5faf677fcb32b42aa Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 12 Nov 2019 11:10:40 +0530 Subject: [PATCH 027/226] fix: codacy --- frappe/public/js/frappe/form/grid.js | 24 ++++++++++++------- .../public/js/frappe/form/grid_pagination.js | 1 - 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index f2ac4ad459..63b3cc9a7c 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -2,7 +2,7 @@ // MIT License. See license.txt import GridRow from "./grid_row"; -import GridPagination from './grid_pagination' +import GridPagination from './grid_pagination'; frappe.ui.form.get_open_grid_form = function() { return $(".grid-row-open").data("grid_row"); @@ -213,13 +213,19 @@ export default class Grid { } get_selected() { - return (this.grid_rows || []).map(row => { return row.doc.__checked ? row.doc.name : null; }) - .filter(d => { return d; }); + return (this.grid_rows || []).map(row => { + return row.doc.__checked ? row.doc.name : null; + }).filter(d => { + return d; + }); } get_selected_children() { - return (this.grid_rows || []).map(row => { return row.doc.__checked ? row.doc : null; }) - .filter(d => { return d; }); + return (this.grid_rows || []).map(row => { + return row.doc.__checked ? row.doc : null; + }).filter(d => { + return d; + }); } make_head() { @@ -654,7 +660,7 @@ export default class Grid { df.colsize=df.columns; } else { var colsize = 2; - switch(df.fieldtype) { + switch (df.fieldtype) { case "Text": case "Small Text": colsize = 3; break; case "Check": colsize = 1; @@ -743,7 +749,7 @@ export default class Grid { } setup_allow_bulk_edit() { - if(this.frm && this.frm.get_docfield(this.df.fieldname).allow_bulk_edit) { + if (this.frm && this.frm.get_docfield(this.df.fieldname).allow_bulk_edit) { // download this.setup_download(); @@ -791,7 +797,7 @@ export default class Grid { }); this.frm.refresh_field(this.df.fieldname); - frappe.msgprint({message:__('Table updated'), title:__('Success'), indicator:'green'}) + frappe.msgprint({message: __('Table updated'), title: __('Success'), indicator: 'green'}); } }); return false; @@ -813,7 +819,7 @@ export default class Grid { data.push(["------"]); $.each(frappe.get_meta(this.df.options).fields, (i, df) => { // don't include the read-only field in the template - if(frappe.model.is_value_type(df.fieldtype)) { + if (frappe.model.is_value_type(df.fieldtype)) { data[1].push(df.label); data[2].push(df.fieldname); let description = (df.description || "") + ' '; diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index bf1fdc7320..dd9390e347 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -9,7 +9,6 @@ export default class GridPagination { this.page_length = 20; this.page_index = 1; this.total_pages = Math.ceil(this.grid.data.length/this.page_length); - this.pages_to_skip = 3; this.render_pagination(); } From babcf7d25b6d64de031077b60c8cb7a5e9ebea67 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 12 Nov 2019 16:07:19 +0530 Subject: [PATCH 028/226] chore: trimmed requirements by pipreqs --- requirements.txt | 130 ++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 68 deletions(-) diff --git a/requirements.txt b/requirements.txt index 84788c863e..41f2a405e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,68 +1,62 @@ -boto3 -chardet -dropbox==9.1.0 -gunicorn -jinja2 -markdown2==2.3.5 -PyMySQL -maxminddb-geolite2 -python-dateutil -pytz -six -werkzeug -semantic_version -rauth>=0.6.2 -requests -redis==2.10.6 -selenium -babel==2.6.0 -ipython -html2text==2016.9.19 -email_reply_parser -click==7.0 -num2words==0.5.5 -watchdog==0.8.0 -bleach==2.1.4 -bleach-whitelist -Pillow -beautifulsoup4 -rq==0.12.0 -schedule -cryptography -pyopenssl -ndg-httpsclient -pyasn1 -zxcvbn-python -unittest-xml-reporting -oauthlib -requests-oauthlib -pdfkit -PyJWT -PyPDF2 -openpyxl -pyotp -pyqrcode -pypng -premailer -croniter -googlemaps==3.1.1 -braintree -future -passlib -google-api-python-client -google-auth -google-auth-httplib2 -google-auth-oauthlib -faker -stripe -coverage -urllib3 -GitPython==2.1.11 -psycopg2==2.7.5 -psycopg2-binary==2.7.5 -sqlparse==0.2.4 -Pygments==2.2.0 -frontmatter -PyYAML==3.13 -xlrd -RestrictedPython==5.0 \ No newline at end of file +setuptools==40.8.0 +urllib3==1.25.6 +Jinja2==2.10.3 +semantic_version==2.8.2 +pip==19.2.3 +chardet==3.0.4 +Click==7.0 +six==1.12.0 +requests==2.22.0 +ipython==7.9.0 +Image==1.5.27 +Pillow==6.2.1 +PyPDF2==1.26.0 +RestrictedPython==5.0 +google_api_python_client==1.7.11 +Babel==2.7.0 +bleach==3.1.0 +bleach_whitelist==0.0.10 +boto3==1.10.15 +botocore==1.13.15 +braintree==3.57.1 +beautifulsoup4==4.8.1 +coverage==4.5.4 +croniter==0.3.30 +cryptography==2.8 +pycups==1.9.74 +python_dateutil==2.8.1 +dropbox==9.4.0 +email_reply_parser==0.5.9 +Faker==2.0.3 +python_frontmatter==0.4.5 +protobuf==3.10.0 +html2text==2019.9.26 +PyJWT==1.7.1 +python_ldap==3.2.0 +ldap3==2.6.1 +markdown2==2.3.8 +num2words==0.5.10 +oauthlib==3.1.0 +openpyxl==3.0.0 +passlib==1.7.1 +future==0.18.2 +pdfkit==0.6.1 +premailer==3.6.1 +psycopg2==2.8.4 +Pygments==2.4.2 +pymysql==0.9.3 +pyotp==2.3.0 +pyqrcode==1.2.1 +pytz==2019.3 +rauth==0.7.3 +redis==3.3.11 +rq==1.1.0 +schedule==0.6.0 +selenium==3.141.0 +sqlparse==0.3.0 +stripe==2.40.0 +watchdog==0.9.0 +Werkzeug==0.16.0 +xlrd==1.2.0 +xmlrunner==1.7.7 +zxcvbn==4.4.28 From 355c5fb3709aec446adf57571dd4a542fa269499 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 12 Nov 2019 19:05:08 +0530 Subject: [PATCH 029/226] fix: add cups dependency perf: conditional config for database --- .travis.yml | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index df66db88a7..ffd05eae03 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,16 @@ matrix: env: DB=mariadb TYPE=server script: bench --site test_site run-tests --coverage +before_install: + # install wkhtmltopdf + - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz + - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp + - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf + - sudo chmod o+x /usr/local/bin/wkhtmltopdf + + # install cups + - sudo apt-get install libcups2-dev + install: - cd ~ - source ./.nvm/nvm.sh @@ -52,23 +62,20 @@ install: - mkdir ~/frappe-bench/sites/test_site - cp $TRAVIS_BUILD_DIR/.travis/$DB.json ~/frappe-bench/sites/test_site/site_config.json - - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" + - if: env(DB) = "mariadb" + - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" + - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" - - mysql -u root -e "CREATE DATABASE test_frappe" - - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'" - - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'" + - mysql -u root -e "CREATE DATABASE test_frappe" + - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'" + - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'" - - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" - - mysql -u root -e "FLUSH PRIVILEGES" + - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" + - mysql -u root -e "FLUSH PRIVILEGES" - - psql -c "CREATE DATABASE test_frappe" -U postgres - - psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres - - - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz - - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp - - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf - - sudo chmod o+x /usr/local/bin/wkhtmltopdf + - if: env(DB) = "postgres" + - psql -c "CREATE DATABASE test_frappe" -U postgres + - psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres - cd ./frappe-bench From e86aff147ac0cf4accb74216cc5d6f422cbb2a0a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 06:46:56 +0000 Subject: [PATCH 030/226] chore(deps): [security] bump tar from 2.2.1 to 2.2.2 Bumps [tar](https://github.com/npm/node-tar) from 2.2.1 to 2.2.2. **This update includes a security fix.** - [Release notes](https://github.com/npm/node-tar/releases) - [Commits](https://github.com/npm/node-tar/compare/v2.2.1...v2.2.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 255 +++++++++++++++++++++++++++++------------------------- 1 file changed, 136 insertions(+), 119 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0838f3f255..7a59102a1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,12 +255,17 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.1: +ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== @@ -628,10 +633,10 @@ camelcase@^3.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= -camelcase@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-api@^3.0.0: version "3.0.0" @@ -738,14 +743,14 @@ cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== +cliui@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" + integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA== dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" + string-width "^3.1.0" + strip-ansi "^5.2.0" + wrap-ansi "^5.1.0" clone@^2.1.1, clone@^2.1.2: version "2.1.2" @@ -953,15 +958,6 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk= - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1253,7 +1249,7 @@ debug@~4.1.0: dependencies: ms "^2.1.1" -decamelize@^1.1.1, decamelize@^1.1.2: +decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= @@ -1373,6 +1369,11 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + emojis-list@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" @@ -1516,19 +1517,6 @@ execa@0.10.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - integrity sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - executable@4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c" @@ -1722,12 +1710,12 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== dependencies: - locate-path "^2.0.0" + locate-path "^3.0.0" for-in@^1.0.2: version "1.0.2" @@ -1803,7 +1791,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fstream@^1.0.0, fstream@^1.0.2: +fstream@^1.0.0, fstream@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045" integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg== @@ -1856,6 +1844,11 @@ get-caller-file@^1.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== +get-caller-file@^2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-pixels@^3.2.3: version "3.3.2" resolved "https://registry.yarnpkg.com/get-pixels/-/get-pixels-3.3.2.tgz#3f62fb8811932c69f262bba07cba72b692b4ff03" @@ -1942,9 +1935,9 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@~7.1.1: path-is-absolute "^1.0.0" glob@^7.1.3: - version "7.1.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A== + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -1989,7 +1982,12 @@ globule@^1.0.0: lodash "~4.17.10" minimatch "~3.0.2" -graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.1.2: + version "4.2.3" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" + integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + +graceful-fs@^4.1.6: version "4.1.15" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00" integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA== @@ -2249,7 +2247,12 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.3, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: +inherits@2, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= @@ -2766,12 +2769,12 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== dependencies: - p-locate "^2.0.0" + p-locate "^3.0.0" path-exists "^3.0.0" lodash.camelcase@^4.3.0: @@ -2900,13 +2903,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y= - dependencies: - mimic-fn "^1.0.0" - meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -3000,11 +2996,6 @@ mime@^1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== - minimatch@^3.0.4, minimatch@~3.0.2: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -3347,15 +3338,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA== - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-tmpdir@^1.0.0, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -3374,19 +3356,19 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== +p-limit@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" + integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== dependencies: - p-try "^1.0.0" + p-try "^2.0.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== dependencies: - p-limit "^1.1.0" + p-limit "^2.0.0" p-map@^1.1.1: version "1.2.0" @@ -3398,10 +3380,10 @@ p-queue@^2.4.2: resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34" integrity sha512-n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng== -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== parchment@quilljs/parchment#487850f7eb030a6c4e750ba809e58b09444e0bdb: version "2.0.0-dev" @@ -4283,6 +4265,11 @@ require-main-filename@^1.0.1: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + reserved-words@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" @@ -4337,9 +4324,9 @@ rgba-regex@^1.0.0: integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= rimraf@2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== + version "2.7.1" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" + integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== dependencies: glob "^7.1.3" @@ -4572,12 +4559,12 @@ shebang-regex@^1.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= -showdown@^1.8.6: - version "1.9.0" - resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.0.tgz#d49d2a0b6db21b7c2e96ef855f7b3b2a28ef46f4" - integrity sha512-x7xDCRIaOlicbC57nMhGfKamu+ghwsdVkHMttyn+DelwzuHOx4OHCVL/UW/2QOLH7BxfCcCCVVUix3boKXJKXQ== +showdown@^1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/showdown/-/showdown-1.9.1.tgz#134e148e75cd4623e09c21b0511977d79b5ad0ef" + integrity sha512-9cGuS382HcvExtf5AHk7Cb4pAeQQ+h0eTr33V1mu+crYWV4KvWAw6el92bDrqGEk5d46Ai/fhbEUwqJ/mTCNEA== dependencies: - yargs "^10.0.3" + yargs "^14.2" signal-exit@^3.0.0: version "3.0.2" @@ -4825,7 +4812,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2": version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -4833,6 +4820,15 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^3.0.0, string-width@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -4854,6 +4850,13 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -4962,12 +4965,12 @@ symbol-observable@1.0.1: integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= tar@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" - integrity sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE= + version "2.2.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" - fstream "^1.0.2" + fstream "^1.0.12" inherits "2" terser@^3.14.1: @@ -5296,6 +5299,15 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" + integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q== + dependencies: + ansi-styles "^3.2.0" + string-width "^3.0.0" + strip-ansi "^5.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -5318,11 +5330,24 @@ y18n@^3.2.1: resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= +y18n@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" + integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +yargs-parser@^15.0.0: + version "15.0.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.0.tgz#cdd7a97490ec836195f59f3f4dbe5ea9e8f75f08" + integrity sha512-xLTUnCMc4JhxrPEPUYD5IBR1mWCK/aT6+RJ/K29JY2y1vD+FhtgKK0AXRWvI262q3QSffAQuTouFIKUuHX89wQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a" @@ -5330,30 +5355,22 @@ yargs-parser@^5.0.0: dependencies: camelcase "^3.0.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - integrity sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ== +yargs@^14.2: + version "14.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.0.tgz#f116a9242c4ed8668790b40759b4906c276e76c3" + integrity sha512-/is78VKbKs70bVZH7w4YaZea6xcJWOAwkhbR0CFuZBmYtfTYF0xjGJF43AYd8g2Uii1yJwmS5GR2vBmrc32sbg== dependencies: - camelcase "^4.1.0" - -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - integrity sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig== - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" + cliui "^5.0.0" + decamelize "^1.2.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^2.0.0" + string-width "^3.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" + y18n "^4.0.0" + yargs-parser "^15.0.0" yargs@^7.0.0: version "7.1.0" From 5bd5eb8911eb37cb7a16c5a56c6072e1cb536512 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 11 Nov 2019 23:25:05 +0530 Subject: [PATCH 031/226] chore: moved set_request function to frappe.utils --- frappe/utils/__init__.py | 6 ++++++ frappe/utils/global_search.py | 2 +- frappe/website/doctype/blog_post/test_blog_post.py | 2 +- frappe/website/doctype/web_page/test_web_page.py | 2 +- .../doctype/website_route_meta/test_website_route_meta.py | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 29c9387248..22a87f612f 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -679,3 +679,9 @@ def create_batch(iterable, batch_size): total_count = len(iterable) for i in range(0, total_count, batch_size): yield iterable[i:min(i + batch_size, total_count)] + +def set_request(**kwargs): + from werkzeug.test import EnvironBuilder + from werkzeug.wrappers import Request + builder = EnvironBuilder(**kwargs) + frappe.local.request = Request(builder.get_environ()) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 447466770d..ff23a09c1a 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -302,7 +302,7 @@ def get_routes_to_index(): def add_route_to_global_search(route): from frappe.website.render import render_page - from frappe.tests.test_website import set_request + from frappe.utils import set_request frappe.set_user('Guest') frappe.local.no_cache = True diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 8278125723..aecc813e9d 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe import unittest -from frappe.tests.test_website import set_request +from frappe.utils import set_request from frappe.website.render import render from frappe.utils import random_string diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index 38daebe5e8..b1600a338f 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -3,7 +3,7 @@ import unittest import frappe from frappe.website.router import resolve_route import frappe.website.render -from frappe.tests import set_request +from frappe.utils import set_request test_records = frappe.get_test_records('Web Page') diff --git a/frappe/website/doctype/website_route_meta/test_website_route_meta.py b/frappe/website/doctype/website_route_meta/test_website_route_meta.py index 90e40972ef..c02dc398bf 100644 --- a/frappe/website/doctype/website_route_meta/test_website_route_meta.py +++ b/frappe/website/doctype/website_route_meta/test_website_route_meta.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe import unittest -from frappe.tests.test_website import set_request +from frappe.utils import set_request from frappe.website.render import render class TestWebsiteRouteMeta(unittest.TestCase): From cbd89842ee67f9955d21fab523ba1edf7e9341a9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 12 Nov 2019 12:45:38 +0530 Subject: [PATCH 032/226] chore: dropped legacy test runner --- frappe/core/doctype/test_runner/__init__.py | 0 .../doctype/test_runner/_test_test_runner.js | 23 --- .../core/doctype/test_runner/test_runner.js | 87 ---------- .../core/doctype/test_runner/test_runner.json | 152 ------------------ .../core/doctype/test_runner/test_runner.py | 36 ----- frappe/patches.txt | 1 + 6 files changed, 1 insertion(+), 298 deletions(-) delete mode 100644 frappe/core/doctype/test_runner/__init__.py delete mode 100644 frappe/core/doctype/test_runner/_test_test_runner.js delete mode 100644 frappe/core/doctype/test_runner/test_runner.js delete mode 100644 frappe/core/doctype/test_runner/test_runner.json delete mode 100644 frappe/core/doctype/test_runner/test_runner.py diff --git a/frappe/core/doctype/test_runner/__init__.py b/frappe/core/doctype/test_runner/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/core/doctype/test_runner/_test_test_runner.js b/frappe/core/doctype/test_runner/_test_test_runner.js deleted file mode 100644 index 0b0bd9a98b..0000000000 --- a/frappe/core/doctype/test_runner/_test_test_runner.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Test Runner", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially('Test Runner', [ - // insert a new Test Runner - () => frappe.tests.make([ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/frappe/core/doctype/test_runner/test_runner.js b/frappe/core/doctype/test_runner/test_runner.js deleted file mode 100644 index d08a3626a3..0000000000 --- a/frappe/core/doctype/test_runner/test_runner.js +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright (c) 2017, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Test Runner', { - refresh: (frm) => { - frm.disable_save(); - frm.page.set_primary_action(__("Run Tests"), () => { - return new Promise(resolve => { - let wrapper = $(frm.fields_dict.output.wrapper).empty(); - $("

Loading...

").appendTo(wrapper); - - // all tests - frappe.call({ - method: 'frappe.core.doctype.test_runner.test_runner.get_test_js', - args: { test_path: frm.doc.module_path } - }).always((data) => { - $("
").appendTo(wrapper.empty()); - frm.events.run_tests(frm, data.message); - resolve(); - }); - }); - }); - - }, - run_tests: function(frm, files) { - frappe.flags.in_test = true; - let require_list = [ - "assets/frappe/js/lib/jquery/qunit.js", - "assets/frappe/js/lib/jquery/qunit.css" - ].concat(); - - frappe.require(require_list, () => { - files.forEach((f) => { - frappe.dom.eval(f.script); - }); - - QUnit.config.notrycatch = true; - - window.onerror = function(msg, url, lineNo, columnNo, error) { - console.log(error.stack); // eslint-disable-line - $('
').appendTo($('body')); - }; - - QUnit.testDone(function(details) { - // var result = { - // "Module name": details.module, - // "Test name": details.name, - // "Assertions": { - // "Total": details.total, - // "Passed": details.passed, - // "Failed": details.failed - // }, - // "Skipped": details.skipped, - // "Todo": details.todo, - // "Runtime": details.runtime - // }; - - // eslint-disable-next-line - // console.log(JSON.stringify(result, null, 2)); - - details.assertions.map(a => { - // eslint-disable-next-line - console.log(`${a.result ? '✔' : '✗'} ${a.message}`); - }); - - }); - QUnit.load(); - - QUnit.done(({ total, failed, passed, runtime }) => { - // flag for selenium that test is done - - console.log( `Total: ${total}, Failed: ${failed}, Passed: ${passed}, Runtime: ${runtime}` ); // eslint-disable-line - - if(failed) { - console.log('Tests Failed'); // eslint-disable-line - } else { - console.log('Tests Passed'); // eslint-disable-line - } - frappe.set_route('Form', 'Test Runner', 'Test Runner'); - - $('
').appendTo($('body')); - - }); - }); - - } -}); diff --git a/frappe/core/doctype/test_runner/test_runner.json b/frappe/core/doctype/test_runner/test_runner.json deleted file mode 100644 index ccc1361dc9..0000000000 --- a/frappe/core/doctype/test_runner/test_runner.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "beta": 0, - "creation": "2017-06-26 10:57:19.976624", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "module_path", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Module Path", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "app", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "App", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "output", - "fieldtype": "HTML", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Output", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 1, - "istable": 0, - "max_attachments": 0, - "modified": "2017-07-19 03:22:33.221169", - "modified_by": "Administrator", - "module": "Core", - "name": "Test Runner", - "name_case": "", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 0, - "role": "Administrator", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 -} \ No newline at end of file diff --git a/frappe/core/doctype/test_runner/test_runner.py b/frappe/core/doctype/test_runner/test_runner.py deleted file mode 100644 index 2961e9f38b..0000000000 --- a/frappe/core/doctype/test_runner/test_runner.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2017, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe, os -from frappe.model.document import Document - -class TestRunner(Document): - pass - -@frappe.whitelist() -def get_test_js(test_path=None): - '''Get test + data for app, example: app/tests/ui/test_name.js''' - if not test_path: - test_path = frappe.db.get_single_value('Test Runner', 'module_path') - test_js = [] - - # split - app, test_path = test_path.split(os.path.sep, 1) - - # now full path - test_path = frappe.get_app_path(app, test_path) - - def add_file(path): - with open(path, 'r') as fileobj: - test_js.append(dict( - script = fileobj.read() - )) - - # add test_lib.js - add_file(frappe.get_app_path('frappe', 'tests', 'ui', 'data', 'test_lib.js')) - add_file(test_path) - - return test_js - diff --git a/frappe/patches.txt b/frappe/patches.txt index 621a2107df..bd8e8378c1 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -255,3 +255,4 @@ frappe.patches.v12_0.set_default_incoming_email_port frappe.patches.v12_0.update_global_search execute:frappe.reload_doc('desk', 'doctype', 'notification_settings') frappe.patches.v12_0.setup_tags +execute:frappe.delete_doc("Test Runner") \ No newline at end of file From ae48dfe2b4fdb2a03f3e8f1028546cb5f8839d04 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 13 Nov 2019 15:01:05 +0530 Subject: [PATCH 033/226] chore: dropped legacy selenium dependant tests selenium TestDriver deprecated --ui-tests flag in `bench run-tests` deprecated --- frappe/commands/utils.py | 21 -- frappe/test_runner.py | 18 +- frappe/tests/test_frappeoauth2client.py | 85 ----- frappe/tests/ui/__init__.py | 0 frappe/tests/ui/data/test_lib.js | 249 --------------- frappe/tests/ui/test_calendar_view.js | 79 ----- frappe/tests/ui/test_control_geolocation.js | 39 --- frappe/tests/ui/test_control_html.js | 57 ---- .../ui/test_kanban/test_kanban_column.js | 31 -- .../ui/test_kanban/test_kanban_creation.js | 34 -- .../ui/test_kanban/test_kanban_filters.js | 27 -- .../tests/ui/test_kanban/test_kanban_view.js | 29 -- frappe/tests/ui/test_linked_with.js | 19 -- frappe/tests/ui/test_list/test_list_filter.js | 39 --- frappe/tests/ui/test_list/test_list_paging.js | 25 -- frappe/tests/ui/test_list_count.js | 33 -- frappe/tests/ui/test_module_view.js | 41 --- frappe/tests/ui/test_number_format.js | 38 --- .../tests/ui/test_social_login_key_buttons.py | 33 -- frappe/tests/ui/test_test_runner.py | 84 ----- frappe/tests/ui/test_todo.py | 50 --- frappe/tests/ui/tests.txt | 20 -- frappe/utils/selenium_testdriver.py | 299 ------------------ requirements.txt | 1 - 24 files changed, 3 insertions(+), 1348 deletions(-) delete mode 100644 frappe/tests/test_frappeoauth2client.py delete mode 100644 frappe/tests/ui/__init__.py delete mode 100644 frappe/tests/ui/data/test_lib.js delete mode 100644 frappe/tests/ui/test_calendar_view.js delete mode 100644 frappe/tests/ui/test_control_geolocation.js delete mode 100644 frappe/tests/ui/test_control_html.js delete mode 100644 frappe/tests/ui/test_kanban/test_kanban_column.js delete mode 100644 frappe/tests/ui/test_kanban/test_kanban_creation.js delete mode 100644 frappe/tests/ui/test_kanban/test_kanban_filters.js delete mode 100644 frappe/tests/ui/test_kanban/test_kanban_view.js delete mode 100644 frappe/tests/ui/test_linked_with.js delete mode 100644 frappe/tests/ui/test_list/test_list_filter.js delete mode 100644 frappe/tests/ui/test_list/test_list_paging.js delete mode 100644 frappe/tests/ui/test_list_count.js delete mode 100644 frappe/tests/ui/test_module_view.js delete mode 100644 frappe/tests/ui/test_number_format.js delete mode 100644 frappe/tests/ui/test_social_login_key_buttons.py delete mode 100644 frappe/tests/ui/test_test_runner.py delete mode 100644 frappe/tests/ui/test_todo.py delete mode 100644 frappe/tests/ui/tests.txt delete mode 100644 frappe/utils/selenium_testdriver.py diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 9a408430e7..d29f0a9c97 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -507,26 +507,6 @@ def run_ui_tests(context, app, headless=False): formatted_command = command.format(site_env=site_env, password_env=password_env, run_or_open=run_or_open) frappe.commands.popen(formatted_command, cwd=app_base_path, raise_err=True) -@click.command('run-setup-wizard-ui-test') -@click.option('--app', help="App to run tests on, leave blank for all apps") -@click.option('--profile', is_flag=True, default=False) -@pass_context -def run_setup_wizard_ui_test(context, app=None, profile=False): - "Run setup wizard UI test" - import frappe.test_runner - - site = get_site(context) - frappe.init(site=site) - frappe.connect() - - ret = frappe.test_runner.run_setup_wizard_ui_test(app=app, verbose=context.verbose, - profile=profile) - if len(ret.failures) == 0 and len(ret.errors) == 0: - ret = 0 - - if os.environ.get('CI'): - sys.exit(ret) - @click.command('serve') @click.option('--port', default=8000) @click.option('--profile', is_flag=True, default=False) @@ -752,7 +732,6 @@ commands = [ reset_perms, run_tests, run_ui_tests, - run_setup_wizard_ui_test, serve, set_config, show_config, diff --git a/frappe/test_runner.py b/frappe/test_runner.py index 76140e442c..be2e909dd0 100644 --- a/frappe/test_runner.py +++ b/frappe/test_runner.py @@ -36,6 +36,9 @@ def main(app=None, module=None, doctype=None, verbose=False, tests=(), with open(frappe.get_app_path(app, doctype_list_path), 'r') as f: doctype = f.read().strip().splitlines() + if ui_tests: + print("Selenium testing has been deprecated\nUse bench --site {site_name} run-ui-tests for Cypress tests") + xmloutput_fh = None if junit_xml_output: xmloutput_fh = open(junit_xml_output, 'w') @@ -170,21 +173,6 @@ def run_tests_for_module(module, verbose=False, tests=(), profile=False): return _run_unittest(module, verbose=verbose, tests=tests, profile=profile) -def run_setup_wizard_ui_test(app=None, verbose=False, profile=False): - '''Run setup wizard UI test using test_test_runner''' - frappe.flags.run_setup_wizard_ui_test = 1 - return run_ui_tests(app=app, test=None, verbose=verbose, profile=profile) - -def run_ui_tests(app=None, test=None, test_list=None, verbose=False, profile=False): - '''Run a single unit test for UI using test_test_runner''' - module = importlib.import_module('frappe.tests.ui.test_test_runner') - frappe.flags.ui_test_app = app - if test_list: - frappe.flags.ui_test_list = test_list - else: - frappe.flags.ui_test_path = test - return _run_unittest(module, verbose=verbose, tests=(), profile=profile) - def _run_unittest(modules, verbose=False, tests=(), profile=False): test_suite = unittest.TestSuite() diff --git a/frappe/tests/test_frappeoauth2client.py b/frappe/tests/test_frappeoauth2client.py deleted file mode 100644 index ebf09adf6d..0000000000 --- a/frappe/tests/test_frappeoauth2client.py +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -from __future__ import unicode_literals - -import unittest, frappe, requests, time -from frappe.test_runner import make_test_records -from frappe.utils.selenium_testdriver import TestDriver -from six.moves.urllib.parse import urlparse -from frappe.frappeclient import FrappeOAuth2Client - -class TestFrappeOAuth2Client(unittest.TestCase): - def setUp(self): - self.driver = TestDriver() - make_test_records("OAuth Client") - make_test_records("User") - self.client_id = frappe.get_all("OAuth Client", fields=["*"])[0].get("client_id") - - # Set Frappe server URL reqired for id_token generation - try: - frappe_login_key = frappe.get_doc("Social Login Key", "frappe") - except frappe.DoesNotExistError: - frappe_login_key = frappe.new_doc("Social Login Key") - frappe_login_key.get_social_login_provider("Frappe", initialize=True) - frappe_login_key.base_url = "http://localhost:8000" - frappe_login_key.save() - - def test_insert_note(self): - - # Go to Authorize url - self.driver.get( - "api/method/frappe.integrations.oauth2.authorize?client_id=" + - self.client_id + - "&scope=all%20openid&response_type=code&redirect_uri=http%3A%2F%2Flocalhost" - ) - - time.sleep(2) - - # Login - username = self.driver.find("#login_email")[0] - username.send_keys("test@example.com") - - password = self.driver.find("#login_password")[0] - password.send_keys("Eastern_43A1W") - - sign_in = self.driver.find(".btn-login")[0] - sign_in.submit() - - time.sleep(2) - - # Allow access to resource - allow = self.driver.find("#allow")[0] - allow.click() - - time.sleep(2) - - # Get authorization code from redirected URL - auth_code = urlparse(self.driver.driver.current_url).query.split("=")[1] - - payload = "grant_type=authorization_code&code=" - payload += auth_code - payload += "&redirect_uri=http%3A%2F%2Flocalhost&client_id=" - payload += self.client_id - - headers = {'content-type':'application/x-www-form-urlencoded'} - - # Request for bearer token - token_response = requests.post( frappe.get_site_config().host_name + - "/api/method/frappe.integrations.oauth2.get_token", data=payload, headers=headers) - - # Parse bearer token json - bearer_token = token_response.json() - client = FrappeOAuth2Client(frappe.get_site_config().host_name, bearer_token.get("access_token")) - - notes = [ - {"doctype": "Note", "title": "Sing", "public": True}, - {"doctype": "Note", "title": "a", "public": True}, - {"doctype": "Note", "title": "Song", "public": True}, - {"doctype": "Note", "title": "of", "public": True}, - {"doctype": "Note", "title": "sixpence", "public": True} - ] - - for note in notes: - client.insert(note) - - self.assertTrue(len(frappe.get_all("Note")) == 5) diff --git a/frappe/tests/ui/__init__.py b/frappe/tests/ui/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/tests/ui/data/test_lib.js b/frappe/tests/ui/data/test_lib.js deleted file mode 100644 index 0fbbc2b748..0000000000 --- a/frappe/tests/ui/data/test_lib.js +++ /dev/null @@ -1,249 +0,0 @@ -frappe.tests = { - data: {}, - make: function(doctype, data) { - let dialog_is_active = () => { - return ( - cur_dialog && (!cur_frm || cur_frm.doc.doctype != doctype) - ); - }; - return frappe.run_serially([ - () => frappe.set_route('List', doctype), - () => frappe.new_doc(doctype), - () => { - if (frappe.quick_entry) { - frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(); - return frappe.timeout(1); - } else { - let root_node; - if (cur_tree) { - for (const key in cur_tree.nodes) { - if (cur_tree.nodes[key].parent_label && cur_tree.nodes[key].expandable) { - root_node = cur_tree.nodes[key].label; - break; - } - } - } - if (root_node){ - frappe.tests.open_add_child_dialog(root_node); - return frappe.timeout(1); - } - } - }, - () => { - if(dialog_is_active()) { - return frappe.tests.set_dialog_values(cur_dialog, data); - } else { - return frappe.tests.set_form_values(cur_frm, data); - } - }, - - () => { - if(dialog_is_active()) { - return cur_dialog.get_primary_btn().click(); - } else { - return frappe.quick_entry ? frappe.quick_entry.insert() : cur_frm.save(); - } - } - ]); - }, - open_add_child_dialog: (root_node) => { - frappe.tests.click_link(root_node); - frappe.timeout(1); - frappe.tests.click_button('Add Child'); - }, - set_form_values: (frm, data) => { - let tasks = []; - - data.forEach(item => { - for (let key in item) { - let task = () => { - let value = item[key]; - if ($.isArray(value)) { - return frappe.tests.set_grid_values(frm, key, value); - } else { - // single value - return frm.set_value(key, value); - } - }; - tasks.push(task); - tasks.push(frappe.after_ajax); - tasks.push(() => frappe.timeout(0.4)); - } - }); - - // set values - return frappe.run_serially(tasks); - - }, - set_dialog_values: (dialog, data) => { - let tasks = []; - - data.forEach(item => { - for (let key in item) { - let task = () => { - let value = item[key]; - return dialog.set_value(key, value); - }; - tasks.push(task); - tasks.push(frappe.after_ajax); - tasks.push(() => frappe.timeout(0.4)); - } - }); - - return frappe.run_serially(tasks); - }, - set_grid_values: (frm, key, value) => { - // set value in grid - let grid = frm.get_field(key).grid; - grid.remove_all(); - - let grid_row_tasks = []; - - // build tasks for each row - value.forEach(d => { - grid_row_tasks.push(() => { - - let grid_value_tasks = []; - grid_value_tasks.push(() => grid.add_new_row()); - grid_value_tasks.push(() => grid.get_row(-1).toggle_view(true)); - grid_value_tasks.push(() => frappe.timeout(0.5)); - - // build tasks to set each row value - d.forEach(child_value => { - for (let child_key in child_value) { - grid_value_tasks.push(() => { - let grid_row = grid.get_row(-1); - return frappe.model.set_value(grid_row.doc.doctype, - grid_row.doc.name, child_key, child_value[child_key]); - }); - grid_value_tasks.push(frappe.after_ajax); - grid_value_tasks.push(() => frappe.timeout(0.4)); - } - }); - - return frappe.run_serially(grid_value_tasks); - }); - }); - return frappe.run_serially(grid_row_tasks); - }, - setup_doctype: (doctype, data) => { - return frappe.run_serially([ - () => frappe.set_route('List', doctype), - () => frappe.timeout(1), - () => { - frappe.tests.data[doctype] = []; - let expected = Object.keys(data); - cur_list.data.forEach((d) => { - frappe.tests.data[doctype].push(d.name); - if(expected.indexOf(d.name) !== -1) { - expected[expected.indexOf(d.name)] = null; - } - }); - - let tasks = []; - - expected.forEach(function(d) { - if(d) { - tasks.push(() => frappe.tests.make(doctype, - data[d])); - } - }); - - return frappe.run_serially(tasks); - }]); - }, - click_page_head_item: (text) => { - // Method to items present on the page header like New, Save, Delete etc. - let possible_texts = ["New", "Delete", "Save", "Yes"]; - return frappe.run_serially([ - () => { - if (text == "Menu"){ - $(`span.menu-btn-group-label:contains('Menu'):visible`).click(); - } else if (text == "Refresh") { - $(`.btn-secondary:contains('Refresh'):visible`).click(); - } else if (possible_texts.includes(text)) { - $(`.btn-primary:contains("${text}"):visible`).click(); - } - }, - () => frappe.timeout(1) - ]); - }, - click_dropdown_item: (text) => { - // Method to click dropdown elements - return frappe.run_serially([ - () => { - let li = $(`.dropdown-menu li:contains("${text}"):visible`).get(0); - $(li).find(`a`).click(); - }, - () => frappe.timeout(1) - ]); - }, - click_desktop_icon: (text) => { - // Method to click the desktop icons on the Desk, by their name - return frappe.run_serially([ - () => $("#icon-grid > div > div.app-icon[title="+text+"]").click(), - () => frappe.timeout(1) - ]); - }, - is_visible: (text, tag='a') => { - // Method to check the visibility of an element - return $(`${tag}:contains("${text}")`).is(`:visible`); - }, - /** - * Clicks a button on a form. - * @param {String} text - The button's text - * @return {frappe.timeout} - * @throws will throw an exception if a matching visible button is not found - */ - click_button: function(text) { - let element = $(`.btn:contains("${text}"):visible`); - if(!element.length) { - throw `did not find any button containing ${text}`; - } - element.click(); - return frappe.timeout(0.5); - }, - /** - * Clicks a link on a form. - * @param {String} text - The text of the link to be clicked - * @return {frappe.timeout} - * @throws will throw an exception if a link with the given text is not found - */ - click_link: function(text) { - let element = $(`a:contains("${text}"):visible`); - if(!element.length) { - throw `did not find any link containing ${text}`; - } - element.get(0).click(); - return frappe.timeout(0.5); - }, - /** - * Sets the given control to the value given. - * @param {String} fieldname - The Doctype's field name - * @param {String} value - The value the control should be changed to - * @return {frappe.timeout} - * @throws will throw an exception if the field is not found or is not visible - */ - set_control: function(fieldname, value) { - let control = $(`.form-control[data-fieldname="${fieldname}"]:visible`); - if(!control.length) { - throw `did not find any control with fieldname ${fieldname}`; - } - control.val(value).trigger('change'); - return frappe.timeout(0.5); - }, - /** - * Checks if given field is disabled. - * @param {String} fieldname - The Doctype field name - * @return {Boolean} true if condition is met - * @throws will throw an exception if the field is not found or is not a form control - */ - is_disabled_field: function(fieldname){ - let control = $(`.form-control[data-fieldname="${fieldname}"]:disabled`); - if(!control.length) { - throw `did not find any control with fieldname ${fieldname}`; - } else { - return true; - } - } -}; \ No newline at end of file diff --git a/frappe/tests/ui/test_calendar_view.js b/frappe/tests/ui/test_calendar_view.js deleted file mode 100644 index 914f6174da..0000000000 --- a/frappe/tests/ui/test_calendar_view.js +++ /dev/null @@ -1,79 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Calendar View Tests", function(assert) { - assert.expect(3); - let done = assert.async(); - let random_text = frappe.utils.get_random(3); - let today = frappe.datetime.get_today()+" 16:20:35"; //arbitrary value taken to prevent cases like 12a for 12:00am and 12h to 24h conversion - let visible_time = () => { - // Method to return the start-time (hours) of the event visible - return $('.fc-time').text().split('p')[0]; // 'p' because the arbitrary time is pm - }; - let event_title_text = () => { - // Method to return the title of the event visible - return $('.fc-title:visible').text(); - }; - - frappe.run_serially([ - // create 2 events, one private, one public - () => frappe.tests.make("Event", [ - {subject: random_text + ':Pri'}, - {starts_on: today}, - {event_type: 'Private'} - ]), - - () => frappe.timeout(1), - - () => frappe.tests.make("Event", [ - {subject: random_text + ':Pub'}, - {starts_on: today}, - {event_type: 'Public'} - ]), - - () => frappe.timeout(1), - - // Goto Calendar view - () => frappe.set_route(["List", "Event", "Calendar"]), - - // clear filter - () => cur_list.filter_area.remove('event_type'), - () => frappe.timeout(2), - // Check if event is created - () => { - // Check if the event exists and if its title matches with the one created - assert.ok(event_title_text().includes(random_text + ':Pri'), - "Event title verified"); - }, - - // check filter - () => cur_list.filter_area.add('Event', 'event_type', '=', 'Public'), - () => frappe.timeout(1), - () => { - // private event should be hidden - assert.notOk(event_title_text().includes(random_text + ':Pri'), - "Event title verified"); - }, - - // Delete event - // Goto Calendar view - () => frappe.set_route(["List", "Event", "Calendar"]), - () => frappe.timeout(1), - // delete event - () => frappe.click_link(random_text + ':Pub'), - () => { - frappe.tests.click_page_head_item('Menu'); - frappe.tests.click_dropdown_item('Delete'); - }, - () => frappe.timeout(0.5), - () => frappe.click_button('Yes'), - () => frappe.timeout(2), - () => frappe.set_route(["List", "Event", "Calendar"]), - () => frappe.click_button("Refresh"), - () => frappe.timeout(1), - - // Check if event is deleted - () => assert.notOk(event_title_text().includes(random_text + ':Pub'), - "Event deleted"), - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_control_geolocation.js b/frappe/tests/ui/test_control_geolocation.js deleted file mode 100644 index 0e3bedda26..0000000000 --- a/frappe/tests/ui/test_control_geolocation.js +++ /dev/null @@ -1,39 +0,0 @@ -QUnit.module('controls'); - -QUnit.test("Test ControlGeolocation", function(assert) { - assert.expect(1); - - const random_name = frappe.utils.get_random(3).toLowerCase(); - - let done = assert.async(); - - // geolocation alert dialog suppressed (only secure origins or localhost allowed) - window.alert = function() { - console.log.apply(console, arguments); //eslint-disable-line - }; - - frappe.run_serially([ - () => { - return frappe.tests.make('Custom Field', [ - {dt: 'ToDo'}, - {fieldtype: 'Geolocation'}, - {label: random_name}, - ]); - }, - () => frappe.set_route('List', 'ToDo'), - () => frappe.new_doc('ToDo'), - () => { - if (frappe.quick_entry) - { - frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(); - return frappe.timeout(1); - } - }, - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}"]`); - - return assert.ok(control.data('fieldtype') === 'Geolocation'); - }, - () => done() - ]); -}); diff --git a/frappe/tests/ui/test_control_html.js b/frappe/tests/ui/test_control_html.js deleted file mode 100644 index 0cb70cc4fd..0000000000 --- a/frappe/tests/ui/test_control_html.js +++ /dev/null @@ -1,57 +0,0 @@ -QUnit.module('controls'); - -QUnit.test("Test ControlHTML", function(assert) { - assert.expect(3); - const random_name = frappe.utils.get_random(3).toLowerCase(); - - let done = assert.async(); - - frappe.run_serially([ - () => { - return frappe.tests.make('Custom Field', [ - {dt: 'ToDo'}, - {fieldtype: 'HTML'}, - {label: random_name}, - {options: '

Test

'} - ]); - }, - () => { - return frappe.tests.make('Custom Field', [ - {dt: 'ToDo'}, - {fieldtype: 'HTML'}, - {label: random_name + "_template"}, - {options: '

Test {{ doc.status }}

'} - ]); - }, - () => frappe.set_route('List', 'ToDo'), - () => frappe.new_doc('ToDo'), - () => { - if (frappe.quick_entry) - { - frappe.quick_entry.dialog.$wrapper.find('.edit-full').click(); - return frappe.timeout(1); - } - }, - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}"]`)[0]; - - return assert.ok(control.innerHTML === '

Test

'); - }, - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}_template"]`)[0]; - // refresh input must be called independently - cur_frm.get_field(`${random_name}_template`).refresh_input(); - - return assert.ok(control.innerHTML === '

Test Open

'); - }, - () => frappe.tests.set_control("status", "Closed"), - () => frappe.timeout(1), - () => { - const control = $(`.frappe-control[data-fieldname="${random_name}_template"]`)[0]; - // refresh input must be called independently - cur_frm.get_field(`${random_name}_template`).refresh_input(); - return assert.ok(control.innerHTML === '

Test Closed

'); - }, - () => done() - ]); -}); diff --git a/frappe/tests/ui/test_kanban/test_kanban_column.js b/frappe/tests/ui/test_kanban/test_kanban_column.js deleted file mode 100644 index 0c4593a8dd..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_column.js +++ /dev/null @@ -1,31 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Setting column colour [Kanban view]", function(assert) { - assert.expect(3); - let done = assert.async(); - function get_column(name, colour) { - return ('.kanban-column:contains('+name+')>div>div>ul>li>div.'+colour); - } - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "Kanban", "Kanban test"), - () => frappe.timeout(1), - () => assert.deepEqual(["List", "ToDo", "Kanban", "Kanban test"], frappe.get_route(), - "Kanban view opened successfully."), - () => { - // set colour for columns - $(get_column('High', "red")).click(); - $(get_column('Medium', "green")).click(); - $(get_column('Low', "yellow")).click(); - }, - () => frappe.timeout(1), - () => { - //check if different colours are set - assert.equal($('.red > span')[0].innerText, 'High', - "Colour is set for kanban column."); - assert.equal($('.green > span')[0].innerText, 'Medium', - "Different colour is set for other column."); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_kanban/test_kanban_creation.js b/frappe/tests/ui/test_kanban/test_kanban_creation.js deleted file mode 100644 index 3e1afbefdf..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_creation.js +++ /dev/null @@ -1,34 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Creation [Kanban view]", function(assert) { - assert.expect(2); - let done = assert.async(); - - const board_name = 'Kanban test'; - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "List"), - // wait for cur_list to initialize - () => cur_list.init(), - // click kanban in side bar - () => frappe.tests.click_link('Kanban'), - () => frappe.tests.click_link('New Kanban Board'), - () => frappe.timeout(0.5), - // create new kanban - () => { - assert.equal(cur_dialog.title, 'New Kanban Board', - "Dialog for new kanban opened."); - cur_dialog.set_value('board_name', board_name); - cur_dialog.set_value('field_name', 'Priority'); - }, - () => frappe.timeout(0.5), - () => cur_dialog.get_primary_btn().click(), - () => frappe.timeout(1), - () => frappe.set_route("List", "Kanban Board", "List"), - () => frappe.timeout(0.5), - // check in kanban list if new kanban is created - () => assert.equal(cur_list.data[0].name, board_name, - "Added kanban is visible in kanban list."), - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_kanban/test_kanban_filters.js b/frappe/tests/ui/test_kanban/test_kanban_filters.js deleted file mode 100644 index 5e9af9f0fa..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_filters.js +++ /dev/null @@ -1,27 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Filters [Kanban view]", function(assert) { - assert.expect(3); - let done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "Kanban", "Kanban test"), - () => frappe.timeout(1), - () => { - assert.deepEqual(["List", "ToDo", "Kanban", "Kanban test"], frappe.get_route(), - "Kanban view opened successfully."); - }, - // set filter values - () => cur_list.filter_area.add('ToDo', 'priority', '=', 'Low'), - () => frappe.timeout(1), - () => cur_list.page.btn_secondary.click(), - () => frappe.timeout(1), - () => { - assert.equal(cur_list.data[0].priority, 'Low', - 'visible element has low priority'); - let non_low_items = cur_list.data.filter(d => d.priority != 'Low'); - assert.equal(non_low_items.length, 0, 'No item without low priority'); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_kanban/test_kanban_view.js b/frappe/tests/ui/test_kanban/test_kanban_view.js deleted file mode 100644 index 4ed9597cf0..0000000000 --- a/frappe/tests/ui/test_kanban/test_kanban_view.js +++ /dev/null @@ -1,29 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test: Kanban view", function(assert) { - assert.expect(4); - let done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route("List", "ToDo", "List"), - // calculate number of element in list - () => frappe.timeout(1), - () => frappe.set_route("List", "ToDo", "Kanban", "Kanban test"), - () => frappe.timeout(2), - () => { - assert.equal('Kanban', cur_list.view_name, - "Current view is kanban."); - assert.equal("Kanban test", cur_list.page_title, - "Kanban view opened successfully."); - // check if all elements are visible in kanban view - const $high_priority_cards = - $('.kanban-column[data-column-value="High"] .kanban-card-wrapper'); - const $low_priority_cards = - $('.kanban-column[data-column-value="Low"] .kanban-card-wrapper'); - - assert.equal($high_priority_cards.length, 1); - assert.equal($low_priority_cards.length, 1); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_linked_with.js b/frappe/tests/ui/test_linked_with.js deleted file mode 100644 index aeaced2d19..0000000000 --- a/frappe/tests/ui/test_linked_with.js +++ /dev/null @@ -1,19 +0,0 @@ -QUnit.module('form'); - -QUnit.test("Test Linked With", function(assert) { - assert.expect(2); - const done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route('Form', 'Module Def', 'Contacts'), - () => frappe.tests.click_page_head_item('Menu'), - () => frappe.tests.click_dropdown_item('Links'), - () => frappe.timeout(4), - () => { - assert.equal(cur_dialog.title, 'Linked With', 'Linked with dialog is opened'); - const link_tables_count = cur_dialog.$wrapper.find('.list-item-table').length; - assert.equal(link_tables_count, 2, 'Two DocTypes are linked with Contacts'); - }, - done - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_list/test_list_filter.js b/frappe/tests/ui/test_list/test_list_filter.js deleted file mode 100644 index 059122f0c0..0000000000 --- a/frappe/tests/ui/test_list/test_list_filter.js +++ /dev/null @@ -1,39 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test list filters", function(assert) { - assert.expect(3); - let done = assert.async(); - - frappe.run_serially([ - () => { - return frappe.tests.make('ToDo', [ - {description: 'low priority'}, - {priority: 'Low'} - ]); - }, - () => { - return frappe.tests.make('ToDo', [ - {description: 'high priority'}, - {priority: 'High'} - ]); - }, - () => frappe.set_route('List', 'ToDo', 'List'), - () => frappe.timeout(0.5), - () => { - assert.deepEqual(['List', 'ToDo', 'List'], frappe.get_route(), - "List opened successfully."); - //set filter values - return frappe.set_control('priority', 'Low'); - }, - () => frappe.timeout(0.5), - () => cur_list.page.btn_secondary.click(), - () => frappe.timeout(1), - () => { - assert.equal(cur_list.data[0].priority, 'Low', - 'visible element has low priority'); - let non_low_items = cur_list.data.filter(d => d.priority != 'Low'); - assert.equal(non_low_items.length, 0, 'no item without low priority'); - }, - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_list/test_list_paging.js b/frappe/tests/ui/test_list/test_list_paging.js deleted file mode 100644 index b760a11370..0000000000 --- a/frappe/tests/ui/test_list/test_list_paging.js +++ /dev/null @@ -1,25 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test paging in list view", function(assert) { - assert.expect(5); - let done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route('List', 'DocType'), - () => frappe.timeout(0.5), - () => assert.deepEqual(['List', 'DocType', 'List'], frappe.get_route(), - "List opened successfully."), - //check elements less then page length [20 in this case] - () => assert.equal(cur_list.data.length, 20, 'show 20 items'), - () => frappe.click_button('More'), - () => frappe.timeout(2), - () => assert.equal(cur_list.data.length, 40, 'show more items'), - () => frappe.tests.click_button('100'), - () => frappe.timeout(2), - () => assert.ok(cur_list.data.length > 40, 'show 100 items'), - () => frappe.tests.click_button('20'), - () => frappe.timeout(2), - () => assert.equal(cur_list.data.length, 20, 'show 20 items again'), - () => done() - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_list_count.js b/frappe/tests/ui/test_list_count.js deleted file mode 100644 index 31f73964d2..0000000000 --- a/frappe/tests/ui/test_list_count.js +++ /dev/null @@ -1,33 +0,0 @@ -QUnit.module('Setup'); - -QUnit.test("Test List Count", function(assert) { - assert.expect(3); - const done = assert.async(); - - frappe.run_serially([ - () => frappe.set_route('List', 'DocType'), - () => frappe.timeout(0.5), - () => { - let count = $('.list-count').text().split(' ')[0]; - assert.equal(cur_list.data.length, count, "Correct Count"); - }, - - () => frappe.timeout(1), - () => cur_list.filter_area.add('Doctype', 'module', '=', 'Desk'), - () => frappe.click_button('Refresh'), - () => { - let count = $('.list-count').text().split(' ')[0]; - assert.equal(cur_list.data.length, count, "Correct Count"); - }, - - () => cur_list.filter_area.clear(), - () => frappe.timeout(1), - () => { - cur_list.filter_area.add('DocField', 'fieldname', 'like', 'owner'); - let count = $('.list-count').text().split(' ')[0]; - assert.equal(cur_list.data.length, count, "Correct Count"); - }, - - done - ]); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_module_view.js b/frappe/tests/ui/test_module_view.js deleted file mode 100644 index 7340945b29..0000000000 --- a/frappe/tests/ui/test_module_view.js +++ /dev/null @@ -1,41 +0,0 @@ -QUnit.module('views'); - -QUnit.test("Test modules view", function(assert) { - assert.expect(4); - let done = assert.async(); - - frappe.run_serially([ - - //click Document Share Report in Permissions section [Report] - () => frappe.set_route("modules", "Setup"), - () => frappe.timeout(0.5), - () => frappe.click_link('Document Share Report'), - () => assert.deepEqual(frappe.get_route(), ["List", "DocShare", "Report", "Document Share Report"], - 'document share report'), - - //click Print Setting in Printing section [Form] - () => frappe.set_route("modules", "Setup"), - () => frappe.timeout(0.5), - () => frappe.click_link('Print Settings'), - () => assert.deepEqual(frappe.get_route(), ["Form", "Print Settings"], - 'print settings'), - - //click Workflow Action in Workflow section [List] - () => frappe.set_route("modules", "Setup"), - () => frappe.timeout(0.5), - () => frappe.click_link('Workflow Action'), - () => assert.deepEqual(frappe.get_route(), ["List", "Workflow Action", "List"], - 'workflow action'), - - //click Workflow Action in Workflow section [List] - () => frappe.set_route("modules"), - () => frappe.timeout(0.5), - () => frappe.click_link('Tools'), - () => frappe.timeout(0.5), - () => frappe.click_link('To Do'), - () => assert.deepEqual(frappe.get_route(), ["List", "ToDo", "List"], - 'todo list'), - - () => done() - ]); -}); diff --git a/frappe/tests/ui/test_number_format.js b/frappe/tests/ui/test_number_format.js deleted file mode 100644 index 2bca7d92f6..0000000000 --- a/frappe/tests/ui/test_number_format.js +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -// MIT License. See license.txt - -QUnit.module("Number Formatting"); - -QUnit.test("#,###.##", function(assert) { - assert.equal(format_number(100, "#,###.##"), "100.00"); - assert.equal(format_number(1000, "#,###.##"), "1,000.00"); - assert.equal(format_number(10000, "#,###.##"), "10,000.00"); - assert.equal(format_number(1000000, "#,###.##"), "1,000,000.00"); - assert.equal(format_number(1000000.345, "#,###.##"), "1,000,000.35"); -}); - -QUnit.test("#,##,###.##", function(assert) { - assert.equal(format_number(100, "#,##,###.##"), "100.00"); - assert.equal(format_number(1000, "#,##,###.##"), "1,000.00"); - assert.equal(format_number(10000, "#,##,###.##"), "10,000.00"); - assert.equal(format_number(1000000, "#,##,###.##"), "10,00,000.00"); - assert.equal(format_number(1000000.341, "#,##,###.##"), "10,00,000.34"); - assert.equal(format_number(10000000.341, "#,##,###.##"), "1,00,00,000.34"); -}); - -QUnit.test("#.###,##", function(assert) { - assert.equal(format_number(100, "#.###,##"), "100,00"); - assert.equal(format_number(1000, "#.###,##"), "1.000,00"); - assert.equal(format_number(10000, "#.###,##"), "10.000,00"); - assert.equal(format_number(1000000, "#.###,##"), "1.000.000,00"); - assert.equal(format_number(1000000.345, "#.###,##"), "1.000.000,35"); -}); - -QUnit.test("#.###", function(assert) { - assert.equal(format_number(100, "#.###"), "100"); - assert.equal(format_number(1000, "#.###"), "1.000"); - assert.equal(format_number(10000, "#.###"), "10.000"); - assert.equal(format_number(-100000, "#.###"), "-100.000"); - assert.equal(format_number(1000000, "#.###"), "1.000.000"); - assert.equal(format_number(1000000.345, "#.###"), "1.000.000"); -}); \ No newline at end of file diff --git a/frappe/tests/ui/test_social_login_key_buttons.py b/frappe/tests/ui/test_social_login_key_buttons.py deleted file mode 100644 index 376d4139e4..0000000000 --- a/frappe/tests/ui/test_social_login_key_buttons.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -from __future__ import unicode_literals - -import unittest, frappe, time -from frappe.utils.selenium_testdriver import TestDriver - -class TestSocialLoginKeyButtons(unittest.TestCase): - def setUp(self): - try: - frappe_login_key = frappe.get_doc("Social Login Key", "frappe") - except frappe.DoesNotExistError: - frappe_login_key = frappe.new_doc("Social Login Key") - frappe_login_key.get_social_login_provider("Frappe", initialize=True) - frappe_login_key.base_url = "http://localhost:8000" - frappe_login_key.enable_social_login = 1 - frappe_login_key.client_id = "test_client_id" - frappe_login_key.client_secret = "test_client_secret" - frappe_login_key.save() - - self.driver = TestDriver() - - def test_login_buttons(self): - - # Go to Login Page - self.driver.get("login") - - time.sleep(2) - frappe_social_login = self.driver.find(".btn-frappe") - self.assertTrue(len(frappe_social_login) > 0) - - def tearDown(self): - self.driver.close() diff --git a/frappe/tests/ui/test_test_runner.py b/frappe/tests/ui/test_test_runner.py deleted file mode 100644 index 8b207cd02d..0000000000 --- a/frappe/tests/ui/test_test_runner.py +++ /dev/null @@ -1,84 +0,0 @@ -from __future__ import print_function, unicode_literals -from frappe.utils.selenium_testdriver import TestDriver -import unittest, os, frappe, time - -class TestTestRunner(unittest.TestCase): - def test_test_runner(self): - if frappe.flags.run_setup_wizard_ui_test: - for setup_wizard_test in frappe.get_hooks("setup_wizard_test"): - passed = frappe.get_attr(setup_wizard_test)() - self.assertTrue(passed) - return - - driver = TestDriver() - frappe.db.set_default('in_selenium', '1') - driver.login() - for test in get_tests(): - if test.startswith('#'): - continue - - timeout = 60 - passed = False - if '#' in test: - test, comment = test.split('#') - test = test.strip() - if comment.strip()=='long': - timeout = 300 - - print('Running {0}...'.format(test)) - - frappe.db.set_value('Test Runner', None, 'module_path', test) - frappe.db.commit() - driver.refresh() - driver.set_route('Form', 'Test Runner') - try: - driver.click_primary_action() - driver.wait_for('#frappe-qunit-done', timeout=timeout) - console = driver.get_console() - passed = 'Tests Passed' in console - finally: - console = driver.get_console() - passed = 'Test Passed' in console - if frappe.flags.tests_verbose or not passed: - for line in console: - print(line) - print('-' * 40) - else: - self.assertTrue(passed) - time.sleep(1) - frappe.db.set_default('in_selenium', None) - driver.close() - -def get_tests(): - '''Get tests base on flag''' - frappe.db.set_value('Test Runner', None, 'app', frappe.flags.ui_test_app or '') - - if frappe.flags.ui_test_list: - # list of tests - return get_tests_for(test_list=frappe.flags.ui_test_list) - elif frappe.flags.ui_test_path: - # specific test - return (frappe.flags.ui_test_path,) - elif frappe.flags.ui_test_app: - # specific app - return get_tests_for(frappe.flags.ui_test_app) - else: - # all apps - tests = [] - for app in frappe.get_installed_apps(): - tests.extend(get_tests_for(app)) - return tests - -def get_tests_for(app=None, test_list=None): - tests = [] - if test_list: - # Get all tests from a particular txt file - app, test_list = test_list.split(os.path.sep, 1) - tests_path = frappe.get_app_path(app, test_list) - else: - # Get all tests for a particular app - tests_path = frappe.get_app_path(app, 'tests', 'ui', 'tests.txt') - if os.path.exists(tests_path): - with open(tests_path, 'r') as fileobj: - tests = fileobj.read().strip().splitlines() - return tests diff --git a/frappe/tests/ui/test_todo.py b/frappe/tests/ui/test_todo.py deleted file mode 100644 index bb367e7851..0000000000 --- a/frappe/tests/ui/test_todo.py +++ /dev/null @@ -1,50 +0,0 @@ -from __future__ import print_function, unicode_literals -from frappe.utils.selenium_testdriver import TestDriver -import unittest -import time, os - -class TestToDo(unittest.TestCase): - def setUp(self): - self.driver = TestDriver() - - def test_todo(self): - self.driver.login() - - # list view - self.driver.set_route('List', 'ToDo') - - time.sleep(2) - - # new - self.driver.click_primary_action() - - time.sleep(2) - - # set input - self.driver.set_text_editor('description', 'hello') - - # save - self.driver.click_modal_primary_action() - - time.sleep(2) - - # refresh - self.driver.click_secondary_action() - - time.sleep(2) - - result_list = self.driver.get_visible_element('.result-list') - first_element_text = (result_list - .find_element_by_css_selector('.list-item') - .find_element_by_css_selector('.list-id').text) - - # if os.environ.get('CI'): - # # we don't run this test in Travis as it always fails - # # reinforcing why we use Unit Testing instead of integration - # # testing - # return - - self.assertTrue('hello' in first_element_text) - - def tearDown(self): - self.driver.close() diff --git a/frappe/tests/ui/tests.txt b/frappe/tests/ui/tests.txt deleted file mode 100644 index 2fcbf64851..0000000000 --- a/frappe/tests/ui/tests.txt +++ /dev/null @@ -1,20 +0,0 @@ -frappe/tests/ui/test_number_format.js -frappe/tests/ui/test_list/test_list_filter.js -frappe/tests/ui/test_list/test_list_paging.js -frappe/tests/ui/test_module_view.js -frappe/tests/ui/test_calendar_view.js -frappe/tests/ui/test_kanban/test_kanban_creation.js -frappe/tests/ui/test_kanban/test_kanban_view.js -frappe/tests/ui/test_kanban/test_kanban_filters.js -frappe/tests/ui/test_kanban/test_kanban_column.js -frappe/core/doctype/report/test_query_report.js -frappe/tests/ui/test_linked_with.js -frappe/custom/doctype/customize_form/test_customize_form.js -frappe/desk/doctype/event/test_event.js -frappe/tests/ui/test_control_html.js -frappe/tests/ui/test_control_geolocation.js -frappe/core/doctype/role_profile/test_role_profile.js -frappe/core/doctype/user/test_user_with_role_profile.js -frappe/tests/ui/test_list_count.js -frappe/workflow/doctype/workflow/tests/test_workflow_create.js -frappe/workflow/doctype/workflow/tests/test_workflow_test.js \ No newline at end of file diff --git a/frappe/utils/selenium_testdriver.py b/frappe/utils/selenium_testdriver.py deleted file mode 100644 index cde0e5cb45..0000000000 --- a/frappe/utils/selenium_testdriver.py +++ /dev/null @@ -1,299 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals, print_function - -from selenium import webdriver -from selenium.webdriver.common.by import By -from selenium.webdriver.support.ui import WebDriverWait -#from selenium.webdriver.support.select import Select -from selenium.webdriver.support import expected_conditions as EC -#from selenium.common.exceptions import TimeoutException -from selenium.webdriver.chrome.options import Options -from selenium.webdriver.common.desired_capabilities import DesiredCapabilities - -import time -import signal -import os, sys -import frappe -from ast import literal_eval - -class TestDriver(object): - def __init__(self, port=None): - self.port = port or frappe.get_site_config().webserver_port or '8000' - - chrome_options = Options() - capabilities = DesiredCapabilities.CHROME - - if os.environ.get('CI'): - self.host = 'localhost' - else: - self.host = frappe.local.site - - # enable browser logging - capabilities['loggingPrefs'] = {'browser':'ALL'} - - chrome_options.add_argument('--no-sandbox') - chrome_options.add_argument('--start-maximized') - self.driver = webdriver.Chrome(chrome_options=chrome_options, - desired_capabilities=capabilities, port=9515) - - # self.driver.set_window_size(1080,800) - self.cur_route = None - self.logged_in = False - - @property - def localhost(self): - return "http://{host}:{port}".format(host=self.host, port=self.port) - - def get(self, url): - return self.driver.get(os.path.join(self.localhost, url)) - - def start(self): - def signal_handler(signal, frame): - self.close() - sys.exit(0) - signal.signal(signal.SIGINT, signal_handler) - - def refresh(self): - self.driver.refresh() - - def close(self): - if self.driver: - self.driver.quit() - self.driver = None - - def login(self, wait_for_id="#page-desktop", animate=0, scroll_offset=0): - if self.logged_in: - return - self.get('login') - self.wait_for("#login_email") - self.set_input("#login_email", "Administrator") - self.set_input("#login_password", "admin") - self.click('.btn-login', animate=animate, offset=scroll_offset) - self.wait_for(wait_for_id) - self.logged_in = True - - def set_input(self, selector, text, key=None, xpath=None): - elem = self.find(selector, xpath=xpath)[0] - elem.clear() - elem.send_keys(text) - if key: - time.sleep(0.5) - elem.send_keys(key) - time.sleep(0.2) - - def set_field(self, fieldname, text): - elem = self.wait_for(xpath='//input[@data-fieldname="{0}"]'.format(fieldname)) - time.sleep(0.2) - elem.send_keys(text) - - def set_select(self, fieldname, text): - elem = self.wait_for(xpath='//select[@data-fieldname="{0}"]'.format(fieldname)) - time.sleep(0.2) - elem.send_keys(text) - - def set_multicheck(self, fieldname, values): - for value in values: - path = '//div[@data-fieldname="{0}"]//span[@data-unit="{1}"]'.format(fieldname, value) - elem = self.wait_for(xpath=path) - time.sleep(0.2) - elem.click() - - def set_text_editor(self, fieldname, text): - elem = self.wait_for(xpath='//div[@data-fieldname="{0}"]//div[@contenteditable="true"]'.format(fieldname)) - time.sleep(0.2) - elem.send_keys(text) - - def find(self, selector=None, everywhere=False, xpath=None): - if xpath: - return self.driver.find_elements_by_xpath(xpath) - else: - if self.cur_route and not everywhere: - selector = self.cur_route + " " + selector - return self.driver.find_elements_by_css_selector(selector) - - def wait_for(self, selector=None, everywhere=False, timeout=20, xpath=None, for_invisible=False): - if self.cur_route and not everywhere: - selector = self.cur_route + " " + selector - - time.sleep(0.5) - - if selector: - _by = By.CSS_SELECTOR - if xpath: - _by = By.XPATH - selector = xpath - - try: - if not for_invisible: - elem = self.get_wait(timeout).until( - EC.presence_of_element_located((_by, selector))) - else: - elem = self.get_wait(timeout).until( - EC.invisibility_of_element_located((_by, selector))) - return elem - except Exception as e: - # body = self.driver.find_element_by_id('body_div') - # print(body.get_attribute('innerHTML')) - self.print_console() - raise e - - def wait_for_invisible(self, selector=None, everywhere=False, timeout=20, xpath=None): - self.wait_for(selector, everywhere, timeout, xpath, True) - - def get_console(self): - out = [] - for entry in self.driver.get_log('browser'): - source, line_no, message = entry.get('message').split(' ', 2) - - if message and message[0] in ('"', "'"): - # message is a quoted/escaped string - message = literal_eval(message) - - out.append(source + ' ' + line_no) - out.append(message) - out.append('-'*40) - - return out - - def print_console(self): - for line in self.get_console(): - print(line) - - def get_wait(self, timeout=20): - return WebDriverWait(self.driver, timeout) - - def scroll_to(self, selector, animate=0, offset=0): - self.execute_script("frappe.ui.scroll('{0}', {1}, {2})".format(selector, animate, offset)) - - def set_route(self, *args): - self.execute_script('frappe.set_route({0})'\ - .format(', '.join(['"{0}"'.format(r) for r in args]))) - - self.wait_for(xpath='//div[@data-page-route="{0}"]'.format('/'.join(args)), timeout=4) - - def click(self, css_selector, xpath=None, timeout=20, animate=0, offset=0): - element = self.wait_till_clickable(css_selector, xpath, timeout) - self.scroll_to(css_selector, animate, offset) - time.sleep(0.5) - element.click() - return element - - def click_primary_action(self): - selector = ".page-actions .primary-action" - #self.scroll_to(selector) - self.wait_till_clickable(selector).click() - self.wait_for_ajax() - - def click_secondary_action(self): - selector = ".page-actions .btn-secondary" - #self.scroll_to(selector) - self.wait_till_clickable(selector).click() - self.wait_for_ajax() - - def click_modal_primary_action(self): - self.get_visible_modal().find_element_by_css_selector('.btn-primary').click() - - def get_visible_modal(self): - return self.get_visible_element('.modal-content') - - def get_visible_element(self, selector=None, xpath=None): - for elem in self.find(selector=selector, xpath=xpath): - if elem.is_displayed(): - return elem - - def wait_till_clickable(self, selector=None, xpath=None, timeout=20): - if self.cur_route: - selector = self.cur_route + " " + selector - - by = By.CSS_SELECTOR - if xpath: - by = By.XPATH - selector = xpath - - return self.get_wait(timeout).until(EC.element_to_be_clickable( - (by, selector))) - - - def execute_script(self, js): - self.driver.execute_script(js) - - def wait_for_ajax(self, freeze = False): - self.wait_for('body[data-ajax-state="complete"]', True) - if freeze: - self.wait_for_invisible(".freeze-message-container") - - -# def go_to_module(module_name, item=None): -# global cur_route -# -# # desktop -# find(".navbar-home", True)[0].click() -# cur_route = None -# wait("#page-desktop") -# -# page = "Module/" + module_name -# m = find('#page-desktop [data-link="{0}"] .app-icon'.format(page)) -# if not m: -# page = "List/" + module_name -# m = find('#page-desktop [data-link="{0}"] .app-icon'.format(page)) -# if not m: -# raise Exception("Module {0} not found".format(module_name)) -# -# m[0].click() -# wait_for_page(page) -# -# if item: -# elem = find('[data-label="{0}"]'.format(item))[0] -# elem.click() -# page = elem.get_attribute("data-route") -# wait_for_page(page) -# -# def new_doc(module, doctype): -# go_to_module(module, doctype) -# primary_action() -# wait_for_page("Form/" + doctype) -# -# def add_child(fieldname): -# find('[data-fieldname="{0}"] .grid-add-row'.format(fieldname))[0].click() -# wait('[data-fieldname="{0}"] .form-grid'.format(fieldname)) -# -# def done_add_child(fieldname): -# selector = '[data-fieldname="{0}"] .grid-row-open .btn-success'.format(fieldname) -# scroll_to(selector) -# wait_till_clickable(selector).click() -# -# def set_field(fieldname, value, fieldtype="input"): -# _driver.switch_to.window(_driver.current_window_handle) -# selector = '{0}[data-fieldname="{1}"]'.format(fieldtype, fieldname) -# set_input(selector, value, key=Keys.TAB) -# wait_for_ajax() -# -# def set_select(fieldname, value): -# select = Select(find('select[data-fieldname="{0}"]'.format(fieldname))[0]) -# select.select_by_value(value) -# wait_for_ajax() -# -# -# def wait_for_page(name): -# global cur_route -# cur_route = None -# route = '[data-page-route="{0}"]'.format(name) -# wait_for_ajax() -# elem = wait(route) -# wait_for_ajax() -# cur_route = route -# return elem -# -# -# def wait_till_visible(selector): -# if cur_route: -# selector = cur_route + " " + selector -# return get_wait().until(EC.visibility_of_element_located((By.CSS_SELECTOR, selector))) -# -# -# def wait_for_state(state): -# return wait(cur_route + '[data-state="{0}"]'.format(state), True) -# -# diff --git a/requirements.txt b/requirements.txt index 84788c863e..84b77993b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,6 @@ semantic_version rauth>=0.6.2 requests redis==2.10.6 -selenium babel==2.6.0 ipython html2text==2016.9.19 From c7edd0ac466e1edb92b7a0b25bc7f9574063ae38 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 Nov 2019 23:23:15 +0000 Subject: [PATCH 034/226] chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6 Bumps [markdown2](https://github.com/trentm/python-markdown2) from 2.3.5 to 2.3.6. **This update includes a security fix.** - [Release notes](https://github.com/trentm/python-markdown2/releases) - [Changelog](https://github.com/trentm/python-markdown2/blob/master/CHANGES.md) - [Commits](https://github.com/trentm/python-markdown2/compare/2.3.5...2.3.6) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 84788c863e..2db499d53f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ chardet dropbox==9.1.0 gunicorn jinja2 -markdown2==2.3.5 +markdown2==2.3.6 PyMySQL maxminddb-geolite2 python-dateutil From 9d5baca7de690239b893edc044bc4d83dbf65faa Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Thu, 14 Nov 2019 14:54:59 +0530 Subject: [PATCH 035/226] fix: change tags on filter change --- frappe/public/js/frappe/list/base_list.js | 2 +- frappe/public/js/frappe/list/list_sidebar.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 648a3d6d55..6650c952b0 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -402,7 +402,7 @@ frappe.views.BaseList = class BaseList { } after_render() { - + this.list_sidebar.reload_stats(); } render() { diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index 0000a3dc73..628f4d2edc 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -285,7 +285,8 @@ frappe.views.ListSidebar = class ListSidebar { args: { stats: me.stats, doctype: me.doctype, - filters: me.default_filters || [] + // wait for list filter area to be generated before getting filters, or fallback to default filters + filters: (me.list_view.filter_area ? me.list_filter.get_current_filters() : me.default_filters) || [] }, callback: function(r) { me.render_stat("_user_tags", (r.message.stats || {})["_user_tags"]); @@ -386,6 +387,7 @@ frappe.views.ListSidebar = class ListSidebar { reload_stats() { this.sidebar.find(".sidebar-stat").remove(); + this.sidebar.find(".list-tag-preview").remove(); this.get_stats(); } From 2693b357aa1c8c13bf222a79a9b383472271c8ba Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Wed, 30 Oct 2019 13:09:26 +0550 Subject: [PATCH 036/226] bumped to version 12.0.18 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 6424dcd9b5..77207e017f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -23,7 +23,7 @@ if sys.version[0] == '2': reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '12.0.17' +__version__ = '12.0.18' __title__ = "Frappe Framework" local = Local() From a3b100daaeaaf3336ea521c5759d89b447f039f3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 15 Nov 2019 11:23:12 +0530 Subject: [PATCH 037/226] chore: manual requirements.txt generation --- requirements.txt | 99 +++++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 47 deletions(-) diff --git a/requirements.txt b/requirements.txt index 41f2a405e0..5d961b90c8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,62 +1,67 @@ -setuptools==40.8.0 -urllib3==1.25.6 -Jinja2==2.10.3 -semantic_version==2.8.2 -pip==19.2.3 +Babel==2.6.0 +beautifulsoup4==4.8.1 +bleach-whitelist==0.0.10 +bleach==2.1.4 +boto3==1.10.18 +braintree==3.57.1 chardet==3.0.4 Click==7.0 -six==1.12.0 -requests==2.22.0 -ipython==7.9.0 -Image==1.5.27 -Pillow==6.2.1 -PyPDF2==1.26.0 -RestrictedPython==5.0 -google_api_python_client==1.7.11 -Babel==2.7.0 -bleach==3.1.0 -bleach_whitelist==0.0.10 -boto3==1.10.15 -botocore==1.13.15 -braintree==3.57.1 -beautifulsoup4==4.8.1 coverage==4.5.4 croniter==0.3.30 cryptography==2.8 -pycups==1.9.74 -python_dateutil==2.8.1 -dropbox==9.4.0 -email_reply_parser==0.5.9 -Faker==2.0.3 -python_frontmatter==0.4.5 -protobuf==3.10.0 -html2text==2019.9.26 -PyJWT==1.7.1 -python_ldap==3.2.0 -ldap3==2.6.1 -markdown2==2.3.8 -num2words==0.5.10 -oauthlib==3.1.0 -openpyxl==3.0.0 -passlib==1.7.1 +dropbox==9.1.0 +email-reply-parser==0.5.9 +Faker==2.0.4 +frontmatter==3.0.5 future==0.18.2 +GitPython==2.1.11 +google-api-python-client==1.7.11 +google-auth-httplib2==0.0.3 +google-auth-oauthlib==0.4.1 +google-auth==1.7.1 +googlemaps==3.1.1 +gunicorn==20.0.0 +html2text==2016.9.19 +ipython==7.9.0 +Jinja2==2.10.3 +markdown2==2.3.5 +maxminddb-geolite2==2018.703 +ndg-httpsclient==0.5.1 +num2words==0.5.5 +oauthlib==3.1.0 +openpyxl==3.0.1 +passlib==1.7.1 pdfkit==0.6.1 +Pillow==6.2.1 premailer==3.6.1 -psycopg2==2.8.4 -Pygments==2.4.2 -pymysql==0.9.3 +psycopg2-binary==2.7.5 +psycopg2==2.7.5 +pyasn1==0.4.7 +Pygments==2.2.0 +PyJWT==1.7.1 +PyMySQL==0.9.3 +pyOpenSSL==19.0.0 pyotp==2.3.0 -pyqrcode==1.2.1 +PyPDF2==1.26.0 +pypng==0.0.20 +PyQRCode==1.2.1 +python-dateutil==2.8.1 pytz==2019.3 +PyYAML==3.13 rauth==0.7.3 -redis==3.3.11 -rq==1.1.0 +redis==2.10.6 +requests-oauthlib==1.3.0 +requests==2.22.0 +RestrictedPython==5.0 +rq==0.12.0 schedule==0.6.0 -selenium==3.141.0 -sqlparse==0.3.0 +semantic-version==2.8.2 +six==1.13.0 +sqlparse==0.2.4 stripe==2.40.0 -watchdog==0.9.0 +unittest-xml-reporting==2.5.2 +urllib3==1.25.7 +watchdog==0.8.0 Werkzeug==0.16.0 xlrd==1.2.0 -xmlrunner==1.7.7 -zxcvbn==4.4.28 +zxcvbn-python==4.4.24 From e55135f216ff80894a05a7cc837c2fc82ac846e7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 15 Nov 2019 13:37:50 +0530 Subject: [PATCH 038/226] fix: updated travis config --- .travis.yml | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index ffd05eae03..6990a0df8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python dist: trusty -sudo: required addons: hosts: @@ -62,20 +61,20 @@ install: - mkdir ~/frappe-bench/sites/test_site - cp $TRAVIS_BUILD_DIR/.travis/$DB.json ~/frappe-bench/sites/test_site/site_config.json - - if: env(DB) = "mariadb" - - mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'" - - mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'" + - if [ $DB == "mariadb" ];then + mysql -u root -e "SET GLOBAL character_set_server = 'utf8mb4'"; + mysql -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"; + mysql -u root -e "CREATE DATABASE test_frappe"; + mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'"; + mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'"; + mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'"; + mysql -u root -e "FLUSH PRIVILEGES"; + fi - - mysql -u root -e "CREATE DATABASE test_frappe" - - mysql -u root -e "CREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe'" - - mysql -u root -e "GRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost'" - - - mysql -u root -e "UPDATE mysql.user SET Password=PASSWORD('travis') WHERE User='root'" - - mysql -u root -e "FLUSH PRIVILEGES" - - - if: env(DB) = "postgres" - - psql -c "CREATE DATABASE test_frappe" -U postgres - - psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres + - if [ $DB == "postgres" ];then + psql -c "CREATE DATABASE test_frappe" -U postgres; + psql -c "CREATE USER test_frappe WITH PASSWORD 'test_frappe'" -U postgres; + fi - cd ./frappe-bench From 6cb2a9c2ee65673bde193d23baa63b311321c048 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 15 Nov 2019 13:45:33 +0530 Subject: [PATCH 039/226] chore: added selenium requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 5d961b90c8..dd68094ca5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,7 @@ requests==2.22.0 RestrictedPython==5.0 rq==0.12.0 schedule==0.6.0 +selenium==3.141.0 semantic-version==2.8.2 six==1.13.0 sqlparse==0.2.4 From f8da1dffc3840ffbff0b76274f6c0a2c7e38500e Mon Sep 17 00:00:00 2001 From: sahil28297 <37302950+sahil28297@users.noreply.github.com> Date: Fri, 15 Nov 2019 14:22:08 +0530 Subject: [PATCH 040/226] fix(notification_log): skip enqueue_create_notification during new site creation --- frappe/desk/doctype/notification_log/notification_log.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 8f43cdc2b9..9425e105e4 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -26,6 +26,15 @@ def get_permission_query_conditions(for_user): return '''(`tabNotification Log`.for_user = '{user}')'''.format(user=for_user) def enqueue_create_notification(users, doc): + ''' + During installation of new site, enqueue_create_notification tries to connect to Redis. + This breaks new site creation if Redis server is not running. + We do not need any notifications in fresh installation + ''' + + if frappe.flags.in_install: + return + doc = frappe._dict(doc) if isinstance(users, frappe.string_types): From aa217e3b46a47be7ce9e0f5ac9ce8f9490b1f38d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 15 Nov 2019 14:31:01 +0530 Subject: [PATCH 041/226] fix(compat): pin requirements for backwards compatibility gunicorn==19.9.0 ipython==5.8.0 openpyxl==2.6.4 to update these packages, will have to drop support for py2 --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index dd68094ca5..dcfaac89ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,16 +20,16 @@ google-auth-httplib2==0.0.3 google-auth-oauthlib==0.4.1 google-auth==1.7.1 googlemaps==3.1.1 -gunicorn==20.0.0 +gunicorn==19.9.0 html2text==2016.9.19 -ipython==7.9.0 +ipython==5.8.0 Jinja2==2.10.3 markdown2==2.3.5 maxminddb-geolite2==2018.703 ndg-httpsclient==0.5.1 num2words==0.5.5 oauthlib==3.1.0 -openpyxl==3.0.1 +openpyxl==2.6.4 passlib==1.7.1 pdfkit==0.6.1 Pillow==6.2.1 From 8bdaaa3775b8ed7744ca0ccfbdd394b59cd4a193 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 15 Nov 2019 16:34:41 +0530 Subject: [PATCH 042/226] fix: empty grid_rows on delete all rows --- frappe/public/js/frappe/form/grid.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 63b3cc9a7c..011f031dd9 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -192,6 +192,7 @@ export default class Grid { delete_all_rows() { this.frm.doc[this.df.fieldname] = []; + this.grid_rows = []; this.refresh(); } From 731c0417627d94f3ed12e9ebd33efa83e935f621 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 18 Nov 2019 16:10:23 +0530 Subject: [PATCH 043/226] fix: scrolling behaviour --- frappe/public/js/frappe/form/grid.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 011f031dd9..924eaf17b0 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -3,6 +3,7 @@ import GridRow from "./grid_row"; import GridPagination from './grid_pagination'; +import { timingSafeEqual } from "crypto"; frappe.ui.form.get_open_grid_form = function() { return $(".grid-row-open").data("grid_row"); @@ -163,8 +164,8 @@ export default class Grid { var dirty = false; let tasks = []; - - this.get_selected_children().forEach(doc => { + let selected_children = this.get_selected_children(); + selected_children.forEach(doc => { tasks.push(() => { if (!this.frm) { this.df.data = this.get_data(); @@ -188,12 +189,18 @@ export default class Grid { }); frappe.run_serially(tasks); + + if (selected_children.length == this.page_length) { + frappe.utils.scroll_to(this.wrapper); + } } delete_all_rows() { this.frm.doc[this.df.fieldname] = []; + $(this.parent).find('.rows').empty(); this.grid_rows = []; this.refresh(); + frappe.utils.scroll_to(this.wrapper); } select_row(name) { @@ -261,7 +268,6 @@ export default class Grid { if(this.display_status === "None") return; // redraw - var _scroll_y = $(document).scrollTop(); this.make_head(); if (!this.grid_rows) { @@ -289,8 +295,6 @@ export default class Grid { this.last_display_status = this.display_status; this.last_docname = this.frm && this.frm.docname; - // frappe.utils.scroll_to(_scroll_y); - // red if mandatory this.form_grid.toggleClass('error', !!(this.df.reqd && !(this.data && this.data.length))); @@ -566,6 +570,9 @@ export default class Grid { add_new_row(idx, callback, show, copy_doc) { if (this.is_editable()) { this.grid_pagination.go_to_last_page(); + if (this.grid_pagination.page_index !== this.grid_pagination.total_pages ) { + frappe.utils.scroll_to(this.wrapper); + } if (this.frm) { var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx); if (copy_doc) { From eaa2cfda594782de96f130f2f16fd909f4f02918 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 19 Nov 2019 10:06:15 +0530 Subject: [PATCH 044/226] fix: revert "unique" fields in chat_*.json --- frappe/chat/doctype/chat_profile/chat_profile.json | 3 +-- frappe/chat/doctype/chat_token/chat_token.json | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/chat/doctype/chat_profile/chat_profile.json b/frappe/chat/doctype/chat_profile/chat_profile.json index f585924930..eb36f803fe 100644 --- a/frappe/chat/doctype/chat_profile/chat_profile.json +++ b/frappe/chat/doctype/chat_profile/chat_profile.json @@ -22,8 +22,7 @@ "fieldtype": "Link", "label": "User", "options": "User", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "default": "Online", diff --git a/frappe/chat/doctype/chat_token/chat_token.json b/frappe/chat/doctype/chat_token/chat_token.json index 40b85c5c6e..b73505ac2c 100644 --- a/frappe/chat/doctype/chat_token/chat_token.json +++ b/frappe/chat/doctype/chat_token/chat_token.json @@ -16,8 +16,7 @@ "fieldtype": "Data", "in_list_view": 1, "label": "Token", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "fieldname": "ip_address", From 01c926daec252347861d6580309935317725a3d2 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Tue, 19 Nov 2019 12:22:09 +0530 Subject: [PATCH 045/226] fix: move stat reload to subclass --- frappe/public/js/frappe/list/base_list.js | 2 +- frappe/public/js/frappe/list/list_view.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 6650c952b0..648a3d6d55 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -402,7 +402,7 @@ frappe.views.BaseList = class BaseList { } after_render() { - this.list_sidebar.reload_stats(); + } render() { diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 6912065e1c..3fdf84183f 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -390,6 +390,10 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { }); } + after_render() { + this.list_sidebar.reload_stats(); + } + render() { this.render_list(); this.on_row_checked(); From e67652261ee949a056838349c113a26ed3387d16 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Nov 2019 17:32:35 +0530 Subject: [PATCH 046/226] fix: Parse file extension correctly --- frappe/core/doctype/data_import/importer_new.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 6fccbc89ef..6cae7826cc 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -54,8 +54,9 @@ class Importer: extension = None if self.data_import and self.data_import.import_file: file_doc = frappe.get_doc("File", {"file_url": self.data_import.import_file}) + filename, extension = file_doc.get_extension() content = file_doc.get_content() - extension = file_doc.file_name.split(".")[1] + extension = extension.lstrip(".") if file_path: content, extension = self.read_file(file_path) From af4f9b2e3edd109d56bb173ff7ef0f3bfcc6db56 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Nov 2019 17:33:28 +0530 Subject: [PATCH 047/226] fix: Show Error for invalid template - For template with invalid extension or not enough rows --- frappe/core/doctype/data_import/importer_new.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index 6cae7826cc..b197e99dcf 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -80,6 +80,12 @@ class Importer: return file_content, extn def read_content(self, content, extension): + error_title = _("Template Error") + if extension not in ("csv", "xlsx", "xls"): + frappe.throw( + _("Import template should be of type .csv, .xlsx or .xls"), title=error_title + ) + if extension == "csv": data = read_csv_content(content) elif extension == "xlsx": @@ -87,6 +93,11 @@ class Importer: elif extension == "xls": data = read_xls_file_from_attached_file(content) + if len(data) <= 1: + frappe.throw( + _("Import template should contain a Header and atleast one row."), title=error_title + ) + self.header_row = data[0] self.data = data[1:] From 42cb0f3eb389e876e985ad9d9165d76a52d0814a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Nov 2019 17:33:44 +0530 Subject: [PATCH 048/226] style: Formatting --- frappe/core/doctype/data_import/importer_new.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index b197e99dcf..c503f1326f 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -874,15 +874,15 @@ class Importer: if failed_records: print("Failed to import {0} records".format(len(failed_records))) - file_name = '{0}_import_on_{1}.txt'.format(self.doctype, frappe.utils.now()) - print('Check {0} for errors'.format(os.path.join('sites', file_name))) + file_name = "{0}_import_on_{1}.txt".format(self.doctype, frappe.utils.now()) + print("Check {0} for errors".format(os.path.join("sites", file_name))) text = "" for w in failed_records: - text += "Row Indexes: {0}\n".format(str(w.get('row_indexes', []))) - text += "Messages:\n{0}\n".format('\n'.join(w.get('messages', []))) - text += "Traceback:\n{0}\n\n".format(w.get('exception')) + text += "Row Indexes: {0}\n".format(str(w.get("row_indexes", []))) + text += "Messages:\n{0}\n".format("\n".join(w.get("messages", []))) + text += "Traceback:\n{0}\n\n".format(w.get("exception")) - with open(file_name, 'w') as f: + with open(file_name, "w") as f: f.write(text) From db225c7c69f11ff0e7a03e04fae56970ae513a1d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Nov 2019 17:34:01 +0530 Subject: [PATCH 049/226] fix: Dont apply energy points during import --- frappe/social/doctype/energy_point_rule/energy_point_rule.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index 5986e90bfb..6615c2ab1d 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -83,7 +83,8 @@ class EnergyPointRule(Document): def process_energy_points(doc, state): if (frappe.flags.in_patch or frappe.flags.in_install - or frappe.flags.in_migrate): + or frappe.flags.in_migrate + or frappe.flags.in_import): return if not is_energy_point_enabled(): From f3a656d515f046bdb5a603b6c5f0c662edf4d2b1 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 19 Nov 2019 18:53:44 +0530 Subject: [PATCH 050/226] fix(tests): add ui tests for grid pagination --- cypress/integration/grid_pagination.js | 45 ++++++++++++++++++++++++++ frappe/tests/ui_test_helpers.py | 12 +++++++ 2 files changed, 57 insertions(+) create mode 100644 cypress/integration/grid_pagination.js diff --git a/cypress/integration/grid_pagination.js b/cypress/integration/grid_pagination.js new file mode 100644 index 0000000000..bf6f144358 --- /dev/null +++ b/cypress/integration/grid_pagination.js @@ -0,0 +1,45 @@ +context('Grid Pagination', () => { + beforeEach(() => { + cy.visit('/desk#Form/Contact/Test Contact'); + }); + before(() => { + cy.login(); + cy.visit('/desk'); + cy.window().its('frappe').then(frappe => { + frappe.call("frappe.tests.ui_test_helpers.create_contact_phone_nos_records"); + }); + }); + it('creates pages for child table', () => { + cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); + cy.get('@table').find('.current-page-number').should('contain', '1'); + cy.get('@table').find('.total-page-number').should('contain', '50'); + cy.get('@table').find('.grid-body .grid-row').should('have.length', 20); + }); + it('goes to the next and previous page', () => { + cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); + cy.get('@table').find('.next-page').click(); + cy.get('@table').find('.current-page-number').should('contain', '2'); + cy.get('@table').find('.grid-body .grid-row').first().should('have.attr', 'data-idx', '21'); + cy.get('@table').find('.prev-page').click(); + cy.get('@table').find('.current-page-number').should('contain', '1'); + cy.get('@table').find('.grid-body .grid-row').first().should('have.attr', 'data-idx', '1'); + }); + it('adds and deletes rows and changes page', ()=> { + cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); + cy.get('@table').find('button.grid-add-row').click(); + cy.get('@table').find('.grid-body .row-index').should('contain', 1001); + cy.get('@table').find('.current-page-number').should('contain', '51'); + cy.get('@table').find('.total-page-number').should('contain', '51'); + cy.get('@table').find('.grid-body .grid-row .grid-row-check').click({force: true}); + cy.get('@table').find('button.grid-remove-rows').click(); + cy.get('@table').find('.grid-body .row-index').last().should('contain', 1000); + cy.get('@table').find('.current-page-number').should('contain', '50'); + cy.get('@table').find('.total-page-number').should('contain', '50'); + }); + it('deletes all rows', ()=> { + cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); + cy.get('@table').find('.grid-heading-row .grid-row-check').click({force: true}); + cy.get('@table').find('button.grid-remove-all-rows').click(); + cy.get('@table').find('.grid-body .grid-row').should('have.length', 0); + }); +}); \ No newline at end of file diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 3747eaa75b..05f3c0617e 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -63,3 +63,15 @@ def setup_workflow(): create_todo_workflow() create_todo_records() frappe.clear_cache() + +@frappe.whitelist() +def create_contact_phone_nos_records(): + if frappe.db.get_all('Contact', {'first_name': 'Test Contact'}): + return + + doc = frappe.new_doc('Contact') + doc.first_name = 'Test Contact' + doc.insert() + for x in range(1000): + doc.append('phone_nos', {'phone': '123456789'}) + doc.save() \ No newline at end of file From f0663b63a08476cb4464f48b2b05b8f239f79fa7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 20 Nov 2019 14:15:50 +0530 Subject: [PATCH 051/226] style: Unused variable --- frappe/core/doctype/data_import/importer_new.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/data_import/importer_new.py b/frappe/core/doctype/data_import/importer_new.py index c503f1326f..f14f38c56d 100644 --- a/frappe/core/doctype/data_import/importer_new.py +++ b/frappe/core/doctype/data_import/importer_new.py @@ -54,7 +54,8 @@ class Importer: extension = None if self.data_import and self.data_import.import_file: file_doc = frappe.get_doc("File", {"file_url": self.data_import.import_file}) - filename, extension = file_doc.get_extension() + parts = file_doc.get_extension() + extension = parts[1] content = file_doc.get_content() extension = extension.lstrip(".") From a1b94fca7161bd797df1ac47b6fefdd1d88f74d5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 19 Nov 2019 15:40:16 +0530 Subject: [PATCH 052/226] fix: change code type to data in standard filter --- frappe/public/js/frappe/list/base_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 648a3d6d55..2c5e1df1df 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -614,7 +614,7 @@ class FilterArea { let options = df.options; let condition = '='; let fieldtype = df.fieldtype; - if (['Text', 'Small Text', 'Text Editor', 'Data'].includes(fieldtype)) { + if (['Text', 'Small Text', 'Text Editor', 'Data', 'Code'].includes(fieldtype)) { fieldtype = 'Data'; condition = 'like'; } From f629d7fd01af09de3e547b769b41c8024e04ad4d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 20 Nov 2019 15:31:13 +0530 Subject: [PATCH 053/226] fix: MultiSelect backspace on input - Dont clear values if backspace is pressed on input --- frappe/public/js/frappe/form/controls/multiselect_list.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js index c9ea23e9da..0313ee70d7 100644 --- a/frappe/public/js/frappe/form/controls/multiselect_list.js +++ b/frappe/public/js/frappe/form/controls/multiselect_list.js @@ -61,6 +61,9 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({ }); this.$list_wrapper.on('keydown', e => { + if ($(e.target).is('input')) { + return; + } if (e.key === 'Backspace') { this.set_value([]); } From 175b974910faf36fffea1cc064f4964584adca62 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 15 Nov 2019 15:44:39 +0530 Subject: [PATCH 054/226] fix(pdf): Remove unnecessary argument https://docs.python.org/3/library/urllib.parse.html#urllib.parse.quote https://docs.python.org/2/library/urllib.html#urllib.quote --- frappe/utils/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 886baf2c37..8169986e44 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -90,7 +90,7 @@ def as_json(): def as_pdf(): response = Response() response.mimetype = "application/pdf" - encoded_filename = quote(frappe.response['filename'].replace(' ', '_'), encoding='utf-8') + encoded_filename = quote(frappe.response['filename'].replace(' ', '_')) response.headers["Content-Disposition"] = ("filename=\"%s\"" % frappe.response['filename'].replace(' ', '_') + ";filename*=utf-8''%s" % encoded_filename).encode("utf-8") response.data = frappe.response['filecontent'] return response From c3f68142db54684c0e0beeb08b5fa7b0a6ff19b7 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 20 Nov 2019 16:09:01 +0530 Subject: [PATCH 055/226] fix: tags should consider list filters --- frappe/desk/reportview.py | 25 +++++++++++++------- frappe/public/js/frappe/list/list_sidebar.js | 4 ++-- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index d5b43807a8..937285206e 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -261,17 +261,24 @@ def delete_bulk(doctype, items): @frappe.whitelist() @frappe.read_only() def get_sidebar_stats(stats, doctype, filters=[]): + _user_tags = [] + data = frappe._dict(frappe.local.form_dict) + filters = json.loads(data["filters"]) - if not frappe.cache().hget("tags_count", doctype): - tags = [tag.name for tag in frappe.get_list("Tag")] - _user_tags = [] - for tag in tags: - count = frappe.db.count("Tag Link", filters={"document_type": doctype, "tag": tag}) - if count > 0: - _user_tags.append([tag, count]) - frappe.cache().hset("tags_count", doctype, _user_tags) + if not frappe.cache().hget("Tags", doctype): + tags = set([tag.tag for tag in frappe.get_list("Tag Link", filters={"document_type": doctype}, fields=["tag"])]) + frappe.cache().hset("Tags", doctype, tags) - return {"stats": {"_user_tags": frappe.cache().hget("tags_count", doctype)}} + for tag in list(frappe.cache().hget("Tags", doctype)): + tag_filters = [] + tag_filters.extend(filters) + tag_filters.extend([['Tag Link', 'tag', '=', tag]]) + + count = frappe.get_all(doctype, filters=tag_filters, fields=["count(*)"]) + if count[0].get("count(*)") > 0: + _user_tags.append([tag, count[0].get("count(*)")]) + + return {"stats": {"_user_tags": _user_tags}} @frappe.whitelist() @frappe.read_only() diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index 628f4d2edc..4767e02f43 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -386,8 +386,8 @@ frappe.views.ListSidebar = class ListSidebar { } reload_stats() { - this.sidebar.find(".sidebar-stat").remove(); - this.sidebar.find(".list-tag-preview").remove(); + this.sidebar.find(".stat-link").remove(); + this.sidebar.find(".stat-no-records").remove(); this.get_stats(); } From 7089be4db253e1a8fec0bb7fd4750af67f7f13a4 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 20 Nov 2019 16:16:39 +0530 Subject: [PATCH 056/226] fix: z-index for dropdown less than page-head --- frappe/public/less/sidebar.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less index 246cd721ac..985a2b1edb 100644 --- a/frappe/public/less/sidebar.less +++ b/frappe/public/less/sidebar.less @@ -400,7 +400,9 @@ body[data-route^="Module"] .main-menu { max-height: 300px; overflow-y: auto; max-width: 250px; + z-index: 100; } + .dropdown-search { padding: 8px; } From 1e26a73b8e44db5a3c24d41295e1553776474ed6 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sat, 16 Nov 2019 18:59:36 +0530 Subject: [PATCH 057/226] fix: Fallback for label in Table --- frappe/public/js/frappe/form/grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 90e0f90be7..3de62daf64 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -52,7 +52,7 @@ export default class Grid { let template = `
- +
From 2e95a1be140875c6cdc992965063aa657cbb8786 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 19 Nov 2019 13:39:01 +0530 Subject: [PATCH 058/226] fix: Only execute enabled server scripts --- frappe/core/doctype/server_script/server_script_utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script_utils.py b/frappe/core/doctype/server_script/server_script_utils.py index 0399dea106..878810f459 100644 --- a/frappe/core/doctype/server_script/server_script_utils.py +++ b/frappe/core/doctype/server_script/server_script_utils.py @@ -56,8 +56,10 @@ def get_server_script_map(): script_map = frappe.cache().get_value('server_script_map') if script_map is None: script_map = {} - for script in frappe.get_all('Server Script', ('name', 'reference_doctype', 'doctype_event', - 'api_method', 'script_type')): + enabled_server_scripts = frappe.get_all('Server Script', + fields=('name', 'reference_doctype', 'doctype_event','api_method', 'script_type'), + filters={'disabled': 0}) + for script in enabled_server_scripts: if script.script_type == 'DocType Event': script_map.setdefault(script.reference_doctype, {}).setdefault(script.doctype_event, []).append(script.name) else: From 1e68dde420b41903c26905ed3747f569c2c9e7ca Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 18 Nov 2019 15:52:23 +0530 Subject: [PATCH 059/226] fix: permission issue for activity --- frappe/core/doctype/activity_log/feed.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py index 22a7a3ee14..f51692fe9f 100644 --- a/frappe/core/doctype/activity_log/feed.py +++ b/frappe/core/doctype/activity_log/feed.py @@ -81,9 +81,9 @@ def get_feed_match_conditions(user=None, doctype='Comment'): if user_permissions: can_read_docs = [] - for doctype, obj in user_permissions.items(): + for dt, obj in user_permissions.items(): for n in obj: - can_read_docs.append('{}|{}'.format(doctype, frappe.db.escape(n.get('doc', '')))) + can_read_docs.append('{}|{}'.format(frappe.db.escape(dt), frappe.db.escape(n.get('doc', '')))) if can_read_docs: conditions.append("concat_ws('|', `tab{doctype}`.reference_doctype, `tab{doctype}`.reference_name) in ({values})".format( From e61f973788006da5dc422efb7b0fff69a9b356ea Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 15 Nov 2019 17:08:46 +0530 Subject: [PATCH 060/226] fix: Cache can_import list for all users and not just System Managers --- frappe/core/doctype/data_import/data_import.js | 7 ++++--- frappe/core/doctype/data_import/data_import.py | 5 ++--- frappe/utils/user.py | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js index c5bd4e99c9..9391b262d7 100644 --- a/frappe/core/doctype/data_import/data_import.js +++ b/frappe/core/doctype/data_import/data_import.js @@ -3,19 +3,20 @@ frappe.ui.form.on('Data Import', { onload: function(frm) { - if(frm.doc.__islocal) { + if (frm.doc.__islocal) { frm.set_value("action", ""); } frappe.call({ - method: "frappe.core.doctype.data_import.data_import.get_importable_doc", + method: "frappe.core.doctype.data_import.data_import.get_importable_doctypes", callback: function (r) { + let importable_doctypes = r.message; frm.set_query("reference_doctype", function () { return { "filters": { "issingle": 0, "istable": 0, - "name": ['in', r.message] + "name": ['in', importable_doctypes] } }; }); diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index 80f8553121..ecf34d24b0 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -30,9 +30,8 @@ class DataImport(Document): @frappe.whitelist() -def get_importable_doc(): - import_lst = frappe.cache().hget("can_import", frappe.session.user) - return import_lst +def get_importable_doctypes(): + return frappe.cache().hget("can_import", frappe.session.user) @frappe.whitelist() def import_data(data_import): diff --git a/frappe/utils/user.py b/frappe/utils/user.py index e0c943d7c5..fa114d0e3c 100755 --- a/frappe/utils/user.py +++ b/frappe/utils/user.py @@ -161,7 +161,8 @@ class UserPermissions: for docname in docs: if frappe.get_meta(docname, cached=True).allow_import == 1: self.can_import.append(docname) - frappe.cache().hset("can_import", frappe.session.user, self.can_import) + + frappe.cache().hset("can_import", frappe.session.user, self.can_import) def get_defaults(self): import frappe.defaults From 327d27b83d998b0b52bfd453fd63e8e7cea2a500 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 13 Nov 2019 11:48:20 +0530 Subject: [PATCH 061/226] fix(List): save checked rows on auto refresh --- frappe/public/js/frappe/list/list_view.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 6912065e1c..a1fe886484 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -1077,10 +1077,20 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { }); this.toggle_result_area(); this.render_list(); + if (this.$checks.length) { + this.set_rows_as_checked(); + } }); }); } + set_rows_as_checked() { + $.each(this.$checks, (i, el) => { + let docname = $(el).attr('data-name'); + this.$result.find(`.list-row-checkbox[data-name='${docname}']`).click(); + }); + } + on_row_checked() { this.$list_head_subject = this.$list_head_subject || this.$result.find('header .list-header-subject'); this.$checkbox_actions = this.$checkbox_actions || this.$result.find('header .checkbox-actions'); From 63c703389d74160c4571fed156b3a938bf80afb2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 15 Nov 2019 13:47:32 +0530 Subject: [PATCH 062/226] fix: Make code explicit .click() could have unchecked already checked row (this case may never occur but it's better to explicitly set it as checked) --- frappe/public/js/frappe/list/list_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index a1fe886484..b52b1db542 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -1087,7 +1087,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { set_rows_as_checked() { $.each(this.$checks, (i, el) => { let docname = $(el).attr('data-name'); - this.$result.find(`.list-row-checkbox[data-name='${docname}']`).click(); + this.$result.find(`.list-row-checkbox[data-name='${docname}']`).prop('checked', true); }); } From de9452387be40d619bdb1079cbbf940442a615c6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 15 Nov 2019 13:53:47 +0530 Subject: [PATCH 063/226] fix: Trigger on_row_checked after checking rows --- frappe/public/js/frappe/list/list_view.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index b52b1db542..b980ae7684 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -1089,6 +1089,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { let docname = $(el).attr('data-name'); this.$result.find(`.list-row-checkbox[data-name='${docname}']`).prop('checked', true); }); + this.on_row_checked(); } on_row_checked() { From 5af3dd8dcbba043737aee460d40e300177b4b050 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Thu, 14 Nov 2019 20:11:21 +0530 Subject: [PATCH 064/226] fix: Show total row in print only if add total row is checked --- .../public/js/frappe/views/reports/query_report.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 4b72a6b7b5..560cb3d17b 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -975,12 +975,15 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { return this.data[index]; } }).filter(Boolean); - let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => { - row[cell.column.id] = cell.content; - return row; - }, {}); - rows.push(totalRow); + if (this.raw_data.add_total_row) { + let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => { + row[cell.column.id] = cell.content; + return row; + }, {}); + + rows.push(totalRow); + } return rows; } From 9cb1869c9a116f4a40c2b02cecf4924b55bc80b9 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 18 Nov 2019 19:00:33 +0530 Subject: [PATCH 065/226] fix: pass doc to frappe.format so doc currency is set for the row, not system default currency --- frappe/public/js/frappe/views/reports/report_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 7f6e24595a..94c8e122c8 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -996,7 +996,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { content: d[cdt_field(col.field)], editable: Boolean(name && this.is_editable(col.docfield, d)), format: value => { - return frappe.format(value, col.docfield, { always_show_decimals: true }); + return frappe.format(value, col.docfield, { always_show_decimals: true }, d); } }; } From 499d0a94711ffc41b9050f7a4c1f2799f8bb1cc5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 18 Nov 2019 13:10:01 +0530 Subject: [PATCH 066/226] fix: spacing for modal --- frappe/public/scss/website.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss index bef504d70e..a297054ee2 100644 --- a/frappe/public/scss/website.scss +++ b/frappe/public/scss/website.scss @@ -101,6 +101,10 @@ h4.modal-title { font-size: 1em; } +h5.modal-title { + margin: 0px !important; +} + .col-xs-1 { @extend .col-1; } .col-xs-2 { @extend .col-2; } .col-xs-3 { @extend .col-3; } From bee23f07251e7ced80b2099bcd97eba0d25755b6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 18 Nov 2019 13:10:16 +0530 Subject: [PATCH 067/226] fix: allow setting message title from server --- frappe/website/js/website.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index f9766bae1d..98959e114f 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -132,12 +132,12 @@ $.extend(frappe, { if (data._server_messages) { var server_messages = JSON.parse(data._server_messages || '[]'); - server_messages = $.map(server_messages, function(v) { + server_messages.map((msg) => { // temp fix for messages sent as dict try { - return JSON.parse(v).message; + return JSON.parse(msg); } catch (e) { - return v; + return msg; } }).join('
'); From 31bc8b3aa4112ae0ef10796a220ab0f485dcba03 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 15 Nov 2019 10:37:41 +0530 Subject: [PATCH 068/226] fix: Allow creation of new point log if old logs were reverted --- frappe/social/doctype/energy_point_log/energy_point_log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py index 33a6717cb9..cd3d641d53 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/energy_point_log.py @@ -149,7 +149,8 @@ def check_if_log_exists(ref_doctype, ref_name, rule, user=None): filters = frappe._dict({ 'rule': rule, 'reference_doctype': ref_doctype, - 'reference_name': ref_name + 'reference_name': ref_name, + 'reverted': 0 }) if user: From e19b8dbff283379e6700b9543d4d326dc371d099 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 15 Nov 2019 10:50:40 +0530 Subject: [PATCH 069/226] test: Check allowance of new log over reverted log --- .../energy_point_log/test_energy_point_log.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py index a1d67789aa..9e4d0e6425 100644 --- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py @@ -249,6 +249,27 @@ class TestEnergyPointLog(unittest.TestCase): # point should not be awarded more than once for same doc (irrespective of user) self.assertEqual(second_user_points_after_closing_todo, second_user_points) + def test_allow_creation_of_new_log_if_the_previous_log_was_reverted(self): + frappe.set_user('test@example.com') + todo_point_rule = create_energy_point_rule_for_todo() + energy_point_of_user = get_points('test@example.com') + + created_todo = create_a_todo() + + created_todo.status = 'Closed' + created_todo.save() + points_after_closing_todo = get_points('test@example.com') + + log_name = frappe.db.exists('Energy Point Log', {'reference_name': created_todo.name}) + frappe.get_doc('Energy Point Log', log_name).revert('Just for test') + points_after_reverting_todo = get_points('test@example.com') + created_todo.save() + points_after_saving_todo_again = get_points('test@example.com') + + rule_points = todo_point_rule.points + self.assertEqual(points_after_closing_todo, energy_point_of_user + rule_points) + self.assertEqual(points_after_reverting_todo, points_after_closing_todo - rule_points) + self.assertEqual(points_after_saving_todo_again, points_after_reverting_todo + rule_points) def create_energy_point_rule_for_todo(multiplier_field=None, for_doc_event='Custom', max_points=None, for_assigned_users=0, field_to_check=None, apply_once=False, user_field='owner'): From d9dae005c36a38902ae8311749abf147ffa09ef2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 15 Nov 2019 10:50:52 +0530 Subject: [PATCH 070/226] refactor: Move revert functionality to controller --- .../energy_point_log/energy_point_log.js | 9 +-- .../energy_point_log/energy_point_log.py | 57 ++++++++++--------- .../energy_point_rule/energy_point_rule.py | 4 +- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js index 3090f3659d..9822998a30 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.js +++ b/frappe/social/doctype/energy_point_log/energy_point_log.js @@ -21,14 +21,15 @@ frappe.ui.form.on('Energy Point Log', { reqd: 1 }], primary_action: (values) => { - return frappe.xcall('frappe.social.doctype.energy_point_log.energy_point_log.revert', { - 'name': frm.doc.name, + return frm.call('revert', { 'reason': values.reason - }).then(revert_log => { + }).then(res => { + let revert_log = res.message; revert_dialog.hide(); revert_dialog.clear(); frappe.model.docinfo[frm.doc.reference_doctype][frm.doc.reference_name].energy_point_logs.unshift(revert_log); - }).catch(() => {}); + frm.refresh(); + }); }, primary_action_label: __('Submit') }); diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py index cd3d641d53..cfba5884cf 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/energy_point_log.py @@ -44,6 +44,35 @@ class EnergyPointLog(Document): enqueue_create_notification(self.user, notification_doc) + def on_trash(self): + if self.type == 'Revert': + reference_log = frappe.get_doc('Energy Point Log', self.revert_of) + reference_log.reverted = 0 + reference_log.save() + + def revert(self, reason): + frappe.only_for('System Manager') + if self.type != 'Auto': + frappe.throw(_('This document cannot be reverted')) + + if self.reverted: return + + self.reverted = 1 + self.save(ignore_permissions=True) + + revert_log = frappe.get_doc({ + 'doctype': 'Energy Point Log', + 'points': -(self.points), + 'type': 'Revert', + 'user': self.user, + 'reason': reason, + 'reference_doctype': self.reference_doctype, + 'reference_name': self.reference_name, + 'revert_of': self.name + }).insert(ignore_permissions=True) + + return revert_log + def get_notification_message(doc): owner_name = get_fullname(doc.owner) points = doc.points @@ -258,32 +287,6 @@ def get_reviews(doctype, docname): 'type': ['in', ('Appreciation', 'Criticism')], }, fields=['points', 'owner', 'type', 'user', 'reason', 'creation']) -@frappe.whitelist() -def revert(name, reason): - frappe.only_for('System Manager') - doc_to_revert = frappe.get_doc('Energy Point Log', name) - - if doc_to_revert.type != 'Auto': - frappe.throw(_('This document cannot be reverted')) - - if doc_to_revert.reverted: return - - doc_to_revert.reverted = 1 - doc_to_revert.save(ignore_permissions=True) - - revert_log = frappe.get_doc({ - 'doctype': 'Energy Point Log', - 'points': -(doc_to_revert.points), - 'type': 'Revert', - 'user': doc_to_revert.user, - 'reason': reason, - 'reference_doctype': doc_to_revert.reference_doctype, - 'reference_name': doc_to_revert.reference_name, - 'revert_of': doc_to_revert.name - }).insert(ignore_permissions=True) - - return revert_log - def send_weekly_summary(): send_summary('Weekly') @@ -326,5 +329,3 @@ def get_footer_message(timespan): return _("Stats based on last month's performance (from {0} to {1})") else: return _("Stats based on last week's performance (from {0} to {1})") - - diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index 38995887f0..0d66691a1b 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -8,7 +8,7 @@ from frappe import _ import frappe.cache_manager from frappe.model.document import Document from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled -from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log, revert +from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log class EnergyPointRule(Document): def on_update(self): @@ -106,7 +106,7 @@ def revert_points_for_cancelled_doc(doc): 'type': 'Auto' }) for log in energy_point_logs: - revert(log.name, _('Reference document has been cancelled')) + frappe.get_doc('Energy Point Log', log.name).revert(_('Reference document has been cancelled')) def get_energy_point_doctypes(): From afb0a501892a4dab9123253c77b063ab2260ede3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 15 Nov 2019 11:00:05 +0530 Subject: [PATCH 071/226] style: Fix codacy --- frappe/social/doctype/energy_point_log/energy_point_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py index cfba5884cf..eb8bccf96a 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/energy_point_log.py @@ -55,7 +55,7 @@ class EnergyPointLog(Document): if self.type != 'Auto': frappe.throw(_('This document cannot be reverted')) - if self.reverted: return + if self.get('reverted'): return self.reverted = 1 self.save(ignore_permissions=True) From 95c116e71a43e2d69430ed7ec9df1cdb9af4b749 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 15 Nov 2019 11:15:53 +0530 Subject: [PATCH 072/226] style: Fix deepsource --- frappe/social/doctype/energy_point_log/energy_point_log.py | 3 ++- .../social/doctype/energy_point_rule/energy_point_rule.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.py b/frappe/social/doctype/energy_point_log/energy_point_log.py index eb8bccf96a..8353c3aa5f 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/energy_point_log.py @@ -55,7 +55,8 @@ class EnergyPointLog(Document): if self.type != 'Auto': frappe.throw(_('This document cannot be reverted')) - if self.get('reverted'): return + if self.get('reverted'): + return self.reverted = 1 self.save(ignore_permissions=True) diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index 0d66691a1b..5986e90bfb 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -8,7 +8,8 @@ from frappe import _ import frappe.cache_manager from frappe.model.document import Document from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled -from frappe.social.doctype.energy_point_log.energy_point_log import create_energy_points_log +from frappe.social.doctype.energy_point_log.energy_point_log import \ + create_energy_points_log class EnergyPointRule(Document): def on_update(self): @@ -106,7 +107,8 @@ def revert_points_for_cancelled_doc(doc): 'type': 'Auto' }) for log in energy_point_logs: - frappe.get_doc('Energy Point Log', log.name).revert(_('Reference document has been cancelled')) + reference_log = frappe.get_doc('Energy Point Log', log.name) + reference_log.revert(_('Reference document has been cancelled')) def get_energy_point_doctypes(): From 7b55f1657b840d11204c4c76f06e681b2c0eb6a7 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 6 Nov 2019 15:10:48 +0530 Subject: [PATCH 073/226] fix: Barcode Control - Fix render caching in forms - Handle raw and svg value --- .../public/js/frappe/form/controls/barcode.js | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js index 1cd1411b49..8245962d7e 100644 --- a/frappe/public/js/frappe/form/controls/barcode.js +++ b/frappe/public/js/frappe/form/controls/barcode.js @@ -1,18 +1,27 @@ -import JsBarcode from "jsbarcode"; +import JsBarcode from 'jsbarcode'; frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({ make_wrapper() { // Create the elements for barcode area this._super(); + this.default_svg = ''; let $input_wrapper = this.$wrapper.find('.control-input-wrapper'); - this.barcode_area = $(`
`); + this.barcode_area = $( + `
${this.default_svg}
` + ); this.barcode_area.appendTo($input_wrapper); }, parse(value) { // Parse raw value - return value ? this.get_barcode_html(value) : ""; + if (value) { + if (value.startsWith(' Date: Mon, 18 Nov 2019 16:21:01 +0530 Subject: [PATCH 074/226] test: UI test for Barcode Control --- cypress/integration/control_barcode.js | 55 +++++++++++++++++++ .../public/js/frappe/form/controls/barcode.js | 2 +- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 cypress/integration/control_barcode.js diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js new file mode 100644 index 0000000000..8d720f6b6c --- /dev/null +++ b/cypress/integration/control_barcode.js @@ -0,0 +1,55 @@ +context('Control Barcide', () => { + beforeEach(() => { + cy.login(); + cy.visit('/desk'); + }); + + function get_dialog_with_barcode() { + return cy.dialog({ + title: 'Barcode', + fields: [ + { + label: 'Barcode', + fieldname: 'barcode', + fieldtype: 'Barcode' + } + ] + }); + } + + it('should generate barcode on setting a value', () => { + get_dialog_with_barcode().as('dialog'); + + cy.get('.frappe-control[data-fieldname=barcode] input') + .focus() + .type('123456789') + .blur(); + cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]') + .should('exist'); + + cy.get('@dialog').then(dialog => { + let value = dialog.get_value('barcode'); + expect(value).to.contain(' { + get_dialog_with_barcode().as('dialog'); + + cy.get('.frappe-control[data-fieldname=barcode] input') + .focus() + .type('123456789') + .blur(); + cy.get('.frappe-control[data-fieldname=barcode] input') + .clear() + .blur(); + cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]') + .should('not.exist'); + + cy.get('@dialog').then(dialog => { + let value = dialog.get_value('barcode'); + expect(value).to.equal(''); + }); + }); +}); diff --git a/frappe/public/js/frappe/form/controls/barcode.js b/frappe/public/js/frappe/form/controls/barcode.js index 8245962d7e..08bb7b763f 100644 --- a/frappe/public/js/frappe/form/controls/barcode.js +++ b/frappe/public/js/frappe/form/controls/barcode.js @@ -29,7 +29,7 @@ frappe.ui.form.ControlBarcode = frappe.ui.form.ControlData.extend({ let svg = value; const barcode_value = $(svg).attr('data-barcode-value'); - if (!barcode_value) { + if (!barcode_value && this.doc) { svg = this.get_barcode_html(value); this.doc[this.df.fieldname] = svg; } From 30e3e1a5b8690181f471f024c8829b0dfa04a699 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 19 Nov 2019 11:37:43 +0530 Subject: [PATCH 075/226] fix: typo Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- cypress/integration/control_barcode.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/integration/control_barcode.js b/cypress/integration/control_barcode.js index 8d720f6b6c..ac2a687bae 100644 --- a/cypress/integration/control_barcode.js +++ b/cypress/integration/control_barcode.js @@ -1,4 +1,4 @@ -context('Control Barcide', () => { +context('Control Barcode', () => { beforeEach(() => { cy.login(); cy.visit('/desk'); From 8cfbc0a51c753b47b2c7192415b733db8d394652 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 20 Nov 2019 18:41:05 +0530 Subject: [PATCH 076/226] fix: go to last page only when add row is clicked --- frappe/public/js/frappe/form/grid.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 924eaf17b0..1fca6fd12d 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -560,18 +560,19 @@ export default class Grid { setup_add_row() { this.wrapper.find(".grid-add-row").click(() => { - this.add_new_row(null, null, true); + this.add_new_row(null, null, true, null, true); this.set_focus_on_row(); return false; }); } - add_new_row(idx, callback, show, copy_doc) { + add_new_row(idx, callback, show, copy_doc, go_to_last_page=false) { if (this.is_editable()) { - this.grid_pagination.go_to_last_page(); - if (this.grid_pagination.page_index !== this.grid_pagination.total_pages ) { + if (go_to_last_page) { + this.grid_pagination.go_to_last_page(); frappe.utils.scroll_to(this.wrapper); + } if (this.frm) { var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx); From 22aa7cef78c15e43885f310d74f2af3ed6ab3f50 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 20 Nov 2019 12:53:52 +0530 Subject: [PATCH 077/226] fix(web-forms): view addresses only by session user --- frappe/contacts/doctype/address/address.py | 28 ++++------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py index 6795011745..21ed88addb 100644 --- a/frappe/contacts/doctype/address/address.py +++ b/frappe/contacts/doctype/address/address.py @@ -145,30 +145,10 @@ def get_list_context(context=None): def get_address_list(doctype, txt, filters, limit_start, limit_page_length = 20, order_by = None): from frappe.www.list import get_list user = frappe.session.user - ignore_permissions = False - if is_website_user(): - if not filters: filters = [] - add_name = [] - contact = frappe.db.sql(""" - select - address.name - from - `tabDynamic Link` as link - join - `tabAddress` as address on link.parent = address.name - where - link.parenttype = 'Address' and - link_name in( - select - link.link_name from `tabContact` as contact - join - `tabDynamic Link` as link on contact.name = link.parent - where - contact.user = %s)""",(user)) - for c in contact: - add_name.append(c[0]) - filters.append(("Address", "name", "in", add_name)) - ignore_permissions = True + ignore_permissions = True + + if not filters: filters = [] + filters.append(("Address", "owner", "=", user)) return get_list(doctype, txt, filters, limit_start, limit_page_length, ignore_permissions=ignore_permissions) From 6605b2e8d39812fb97b823f874ff2565c8fb4da0 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 21 Nov 2019 12:52:30 +0530 Subject: [PATCH 078/226] fix: codacy --- frappe/public/js/frappe/form/grid.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 1fca6fd12d..62830bb2ad 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -3,7 +3,6 @@ import GridRow from "./grid_row"; import GridPagination from './grid_pagination'; -import { timingSafeEqual } from "crypto"; frappe.ui.form.get_open_grid_form = function() { return $(".grid-row-open").data("grid_row"); @@ -222,7 +221,7 @@ export default class Grid { get_selected() { return (this.grid_rows || []).map(row => { - return row.doc.__checked ? row.doc.name : null; + return row.doc.__checked ? row.doc.name : null; }).filter(d => { return d; }); @@ -232,7 +231,7 @@ export default class Grid { return (this.grid_rows || []).map(row => { return row.doc.__checked ? row.doc : null; }).filter(d => { - return d; + return d; }); } From ed98820929023cf3ef661a2c71450f725e2e9f6e Mon Sep 17 00:00:00 2001 From: Bob Schulze Date: Thu, 21 Nov 2019 09:05:40 +0100 Subject: [PATCH 079/226] fix for a problem than prevents deletion of a table that is solely custom --- frappe/model/delete_doc.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index af67350ab6..905c97d7db 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -80,8 +80,8 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa if not (for_reload or frappe.flags.in_migrate or frappe.flags.in_install or frappe.flags.in_test): try: delete_controllers(name, doc.module) - except (FileNotFoundError, OSError): - # in case a doctype doesnt have any controller code + except (FileNotFoundError, OSError, KeyError): + # in case a doctype doesnt have any controller code nor any app and module pass else: From 65fffcf9eb069fc0330a6c4d74b6132b79b0ba96 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 21 Nov 2019 16:02:06 +0530 Subject: [PATCH 080/226] fix: grid page length --- frappe/public/js/frappe/form/grid.js | 14 ++++++-------- frappe/public/js/frappe/form/grid_pagination.js | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 62830bb2ad..038402fc55 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -189,7 +189,7 @@ export default class Grid { frappe.run_serially(tasks); - if (selected_children.length == this.page_length) { + if (selected_children.length == this.grid_pagination.page_length) { frappe.utils.scroll_to(this.wrapper); } } @@ -355,7 +355,7 @@ export default class Grid { this.wrapper.find('.grid-add-multiple-rows').removeClass('hidden'); } } - } else if (this.grid_rows.length < this.page_length ) { + } else if (this.grid_rows.length < this.grid_pagination.page_length ) { this.wrapper.find('.grid-footer').toggle(false); } @@ -416,14 +416,14 @@ export default class Grid { } // prevent drag behaviour if _sortable property is "false" let idx = $(event.dragged).closest('.grid-row').attr('data-idx'); - let doc = this.data[idx%this.page_length]; + let doc = this.data[idx%this.grid_pagination.page_length]; if (doc && doc._sortable === false) { return false; } }, onUpdate: (event) => { let idx = $(event.item).closest('.grid-row').attr('data-idx'); - let doc = this.data[idx%this.page_length]; + let doc = this.data[idx%this.grid_pagination.page_length]; this.renumber_based_on_dom(); this.frm.script_manager.trigger(this.df.fieldname + "_move", this.df.options, doc.name); this.refresh(); @@ -570,8 +570,6 @@ export default class Grid { if (this.is_editable()) { if (go_to_last_page) { this.grid_pagination.go_to_last_page(); - frappe.utils.scroll_to(this.wrapper); - } if (this.frm) { var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx); @@ -613,7 +611,7 @@ export default class Grid { $rows.find(".grid-row").each( (i, item) => { let $item = $(item); - let index = (this.page_index-1)*this.page_length+i; + let index = (this.grid_pagination.page_index-1)*this.grid_pagination.page_length+i; let d = locals[this.doctype][$item.attr('data-name')]; d.idx = index + 1; $item.attr('data-idx', d.idx); @@ -774,7 +772,7 @@ export default class Grid { this.frm.clear_table(this.df.fieldname); $.each(data, (i, row) => { - if(i > 6) { + if (i > 6) { var blank_row = true; $.each(row, function(ci, value) { if (value) { diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index dd9390e347..80cf5502a0 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -44,7 +44,7 @@ export default class GridPagination { }); this.last_page_button.on('click', () => { - this.go_to_page(this.total_pages); + this.go_to_last_page(); }); } @@ -120,6 +120,7 @@ export default class GridPagination { } else { this.go_to_page(total_pages); } + frappe.utils.scroll_to(this.wrapper); } get_result_length() { From 27d87a7028e7eb988160951717036af973b30aef Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 21 Nov 2019 16:09:43 +0530 Subject: [PATCH 081/226] feat: added a null state to list view --- frappe/public/images/ui-states/empty.png | Bin 0 -> 50732 bytes frappe/public/js/frappe/list/list_view.js | 3 +++ frappe/public/less/list.less | 5 +++++ 3 files changed, 8 insertions(+) create mode 100644 frappe/public/images/ui-states/empty.png diff --git a/frappe/public/images/ui-states/empty.png b/frappe/public/images/ui-states/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..de2a89350854b07203c53051eacbe4e9170864f4 GIT binary patch literal 50732 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 literal 0 HcmV?d00001 diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index b980ae7684..d5db15d126 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -308,6 +308,9 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {

` : ''; return `
+
+ Generic Empty State +

${__('No {0} found', [__(this.doctype)])}

${new_button}
`; diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index efcbad4653..99ba3e7c22 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -4,6 +4,11 @@ .result, .no-result, .freeze { min-height: ~"calc(100vh - 284px)"; } + + .null-state { + height: 12em !important; + width: auto; + } } .freeze-row { From cbde4643199bf8c642ec97fba51ac06d41341cd3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 21 Nov 2019 17:01:33 +0530 Subject: [PATCH 082/226] fix: Add Notification Settings --- frappe/config/settings.py | 9 ++++++++- .../notification_settings/notification_settings.js | 12 ++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 frappe/desk/doctype/notification_settings/notification_settings.js diff --git a/frappe/config/settings.py b/frappe/config/settings.py index 2422f2fae2..a0a7dcd65f 100644 --- a/frappe/config/settings.py +++ b/frappe/config/settings.py @@ -1,4 +1,5 @@ from __future__ import unicode_literals +import frappe from frappe import _ from frappe.desk.moduleview import add_setup_section @@ -88,7 +89,7 @@ def get_data(): ] }, { - "label": _("Email"), + "label": _("Email / Notifications"), "icon": "fa fa-envelope", "items": [ { @@ -120,6 +121,12 @@ def get_data(): "type": "doctype", "name": "Newsletter", "description": _("Create and manage newsletter") + }, + { + "type": "doctype", + "route": "Form/Notification Settings/{}".format(frappe.session.user), + "name": "Notification Settings", + "description": _("Configure notifications for mentions, assignments, energy points and more.") } ] }, diff --git a/frappe/desk/doctype/notification_settings/notification_settings.js b/frappe/desk/doctype/notification_settings/notification_settings.js new file mode 100644 index 0000000000..d4e3b08def --- /dev/null +++ b/frappe/desk/doctype/notification_settings/notification_settings.js @@ -0,0 +1,12 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Notification Settings', { + onload: () => { + frappe.breadcrumbs.add({ + label: __('Settings'), + route: '#modules/Settings', + type: 'Custom' + }); + } +}); From 3505e680819632ac7cbf6619694860f6a08a714a Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 19 Nov 2019 14:38:24 +0530 Subject: [PATCH 083/226] fix: standard filters with default value are saved when changed --- frappe/public/js/frappe/list/base_list.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index 2c5e1df1df..d713ae6c3e 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -625,17 +625,13 @@ class FilterArea { options = options.join("\n"); } } - let default_value = (fieldtype === 'Link') ? frappe.defaults.get_user_default(options) : null; - if (['__default', '__global'].includes(default_value)) { - default_value = null; - } + return { fieldtype: fieldtype, label: __(df.label), options: options, fieldname: df.fieldname, condition: condition, - default: default_value, onchange: () => this.refresh_list_view(), ignore_link_validation: fieldtype === 'Dynamic Link' }; @@ -650,6 +646,10 @@ class FilterArea { for (let key in fields_dict) { let field = fields_dict[key]; let value = field.get_value(); + let default_value = (field.df.fieldtype === 'Link') + ? frappe.defaults.get_user_default(field.df.options) + : null; + if (value) { if (field.df.condition === 'like' && !value.includes('%')) { value = '%' + value + '%'; @@ -660,6 +660,13 @@ class FilterArea { field.df.condition || '=', value ]); + } else if (default_value) { + filters.push([ + this.list_view.doctype, + field.df.fieldname, + field.df.condition, + default_value + ]); } } From fdf37115aaf6e750c0cb9b1048344959e1aacd95 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 21 Nov 2019 00:33:32 +0530 Subject: [PATCH 084/226] fix: check for __default, __global default values --- frappe/public/js/frappe/list/base_list.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index d713ae6c3e..c0eaf5845c 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -649,6 +649,9 @@ class FilterArea { let default_value = (field.df.fieldtype === 'Link') ? frappe.defaults.get_user_default(field.df.options) : null; + if (['__default', '__global'].includes(default_value)) { + default_value = null; + } if (value) { if (field.df.condition === 'like' && !value.includes('%')) { From 3d15be73fab267375cf6cf46bb99d41e24f6b922 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 21 Nov 2019 08:49:30 +0530 Subject: [PATCH 085/226] style: Remove trailing tabs --- frappe/public/js/frappe/list/base_list.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index c0eaf5845c..0ea9a801fb 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -646,11 +646,11 @@ class FilterArea { for (let key in fields_dict) { let field = fields_dict[key]; let value = field.get_value(); - let default_value = (field.df.fieldtype === 'Link') - ? frappe.defaults.get_user_default(field.df.options) - : null; - if (['__default', '__global'].includes(default_value)) { - default_value = null; + let default_value = (field.df.fieldtype === 'Link') ? + frappe.defaults.get_user_default(field.df.options) : null; + + if (['__default', '__global'].includes(default_value)) { + default_value = null; } if (value) { From 7e6f5ea07ebfc7bd78b1d6ac7f7743292cd8772e Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 21 Nov 2019 10:59:06 +0000 Subject: [PATCH 086/226] Misspelt, when selecting ALL emails it was being set to UNSEEN. This rectifies the issue. --- frappe/email/doctype/email_account/email_account.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js index 7a175e7192..71f9cccb0d 100644 --- a/frappe/email/doctype/email_account/email_account.js +++ b/frappe/email/doctype/email_account/email_account.js @@ -184,7 +184,7 @@ frappe.ui.form.on("Email Account", { read as well as unread message from server. This may also cause the duplication\ of Communication (emails)."); frappe.confirm(msg, null, function() { - frm.set_value("email_sync_option", "UNSEEN"); + frm.set_value("email_sync_option", "ALL"); }); } } From 27245d14bed9db30c366a4ded0b9725b7e88b896 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Thu, 21 Nov 2019 20:21:13 +0530 Subject: [PATCH 087/226] feat: onboarding wizard with configurable slides --- .../setup_wizard_help_link/__init__.py | 0 .../setup_wizard_help_link.json | 35 +++ .../setup_wizard_help_link.py | 10 + .../doctype/setup_wizard_settings/__init__.py | 0 .../setup_wizard_settings.js | 8 + .../setup_wizard_settings.json | 46 ++++ .../setup_wizard_settings.py | 84 +++++++ .../test_setup_wizard_settings.py | 10 + .../doctype/setup_wizard_slide/__init__.py | 0 .../setup_wizard_slide/setup_wizard_slide.js | 8 + .../setup_wizard_slide.json | 153 +++++++++++++ .../setup_wizard_slide/setup_wizard_slide.py | 10 + .../test_setup_wizard_slide.py | 10 + .../setup_wizard_slide_field/__init__.py | 0 .../setup_wizard_slide_field.json | 109 +++++++++ .../setup_wizard_slide_field.py | 10 + .../setup_wizard_slide_order/__init__.py | 0 .../setup_wizard_slide_order.json | 30 +++ .../setup_wizard_slide_order.py | 10 + .../setup_wizard_settings.json | 24 ++ frappe/desk/setup_wizard_slide/__init__.py | 0 .../add_a_few_customers/__init__.py | 0 .../add_a_few_customers.json | 64 ++++++ .../__init__.py | 0 .../add_a_few_products_you_buy_or_sell.json | 78 +++++++ .../add_a_few_suppliers/__init__.py | 0 .../add_a_few_suppliers.json | 65 ++++++ .../company_logo_and_letter_head/__init__.py | 0 .../company_logo_and_letter_head.json | 50 +++++ .../welcome_to_erpnext!/__init__.py | 0 .../welcome_to_erpnext!.json | 36 +++ frappe/model/sync.py | 9 +- frappe/public/js/frappe/desk.js | 29 +++ .../public/js/frappe/ui/onboarding_dialog.js | 126 +++++++++++ frappe/public/js/frappe/ui/slides.js | 11 +- .../frappe/ui/toolbar/user_progress_dialog.js | 209 ------------------ frappe/public/less/desk.less | 18 ++ frappe/sessions.py | 2 +- 38 files changed, 1039 insertions(+), 215 deletions(-) create mode 100644 frappe/desk/doctype/setup_wizard_help_link/__init__.py create mode 100644 frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json create mode 100644 frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py create mode 100644 frappe/desk/doctype/setup_wizard_settings/__init__.py create mode 100644 frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.js create mode 100644 frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.json create mode 100644 frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py create mode 100644 frappe/desk/doctype/setup_wizard_settings/test_setup_wizard_settings.py create mode 100644 frappe/desk/doctype/setup_wizard_slide/__init__.py create mode 100644 frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js create mode 100644 frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json create mode 100644 frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py create mode 100644 frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py create mode 100644 frappe/desk/doctype/setup_wizard_slide_field/__init__.py create mode 100644 frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json create mode 100644 frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py create mode 100644 frappe/desk/doctype/setup_wizard_slide_order/__init__.py create mode 100644 frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.json create mode 100644 frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.py create mode 100644 frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json create mode 100644 frappe/desk/setup_wizard_slide/__init__.py create mode 100644 frappe/desk/setup_wizard_slide/add_a_few_customers/__init__.py create mode 100644 frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json create mode 100644 frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/__init__.py create mode 100644 frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json create mode 100644 frappe/desk/setup_wizard_slide/add_a_few_suppliers/__init__.py create mode 100644 frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json create mode 100644 frappe/desk/setup_wizard_slide/company_logo_and_letter_head/__init__.py create mode 100644 frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json create mode 100644 frappe/desk/setup_wizard_slide/welcome_to_erpnext!/__init__.py create mode 100644 frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json create mode 100644 frappe/public/js/frappe/ui/onboarding_dialog.js delete mode 100644 frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js diff --git a/frappe/desk/doctype/setup_wizard_help_link/__init__.py b/frappe/desk/doctype/setup_wizard_help_link/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json b/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json new file mode 100644 index 0000000000..b97b482cac --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json @@ -0,0 +1,35 @@ +{ + "creation": "2019-11-19 12:22:42.805741", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "label", + "video_id" + ], + "fields": [ + { + "fieldname": "label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Label" + }, + { + "fieldname": "video_id", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Video" + } + ], + "istable": 1, + "modified": "2019-11-19 13:39:57.716248", + "modified_by": "Administrator", + "module": "Desk", + "name": "Setup Wizard Help Link", + "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/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py b/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py new file mode 100644 index 0000000000..fbb96bbd91 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 SetupWizardHelpLink(Document): + pass diff --git a/frappe/desk/doctype/setup_wizard_settings/__init__.py b/frappe/desk/doctype/setup_wizard_settings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.js b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.js new file mode 100644 index 0000000000..48b4497182 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Setup Wizard Settings', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.json b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.json new file mode 100644 index 0000000000..900a2da83b --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.json @@ -0,0 +1,46 @@ +{ + "creation": "2019-11-13 15:55:07.016295", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "slide_order_section", + "slide_order" + ], + "fields": [ + { + "fieldname": "slide_order_section", + "fieldtype": "Section Break", + "label": "Slide Order" + }, + { + "fieldname": "slide_order", + "fieldtype": "Table", + "label": "Slide Order", + "options": "Setup Wizard Slide Order", + "reqd": 1 + } + ], + "issingle": 1, + "modified": "2019-11-19 11:56:32.757433", + "modified_by": "Administrator", + "module": "Desk", + "name": "Setup Wizard Settings", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py new file mode 100644 index 0000000000..4a959190a7 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe.model.document import Document +from erpnext.setup.doctype.setup_progress.setup_progress import get_action_completed_state +from frappe.modules import get_module_path, scrub_dt_dn +from frappe.modules.export_file import export_to_files, create_init_py + +class SetupWizardSettings(Document): + def on_update(self): + if frappe.flags.in_import or frappe.flags.in_test: + return + + if frappe.local.conf.get('developer_mode'): + record_list =[['Setup Wizard Settings', self.name]] + + for s in self.slide_order: + record_list.append(['Setup Wizard Slide', s.slide]) + + export_to_files(record_list=record_list, record_module='Desk') + + for s in self.slide_order: + dt, dn = scrub_dt_dn('Setup Wizard Slide', s.slide) + create_init_py(get_module_path('Desk'), dt, dn) + +def get_slide_settings(): + slides = [] + slide_settings = frappe.get_single('Setup Wizard Settings') + for entry in slide_settings.slide_order: + slide_doc = frappe.get_doc('Setup Wizard Slide', entry.slide) + print(frappe.get_installed_apps()) + if frappe.scrub(slide_doc.app) in frappe.get_installed_apps(): + domains = get_domains(slide_doc) + help_links = get_help_links(slide_doc) + if slide_doc.slide_type == 'Action': + submit_method = frappe.scrub(slide_doc.app) + '.utilities.onboarding_utils.' + slide_doc.submit_method + else: + submit_method = None + if slide_doc.image_src: + image_src = slide_doc.image_src + else: + image_src = None + slides.append(frappe._dict( + slide_type = slide_doc.slide_type, + title = slide_doc.slide_title, + help = slide_doc.slide_desc, + domains = domains, + fields = slide_doc.slide_fields, + help_links = help_links, + add_more = slide_doc.add_more_button, + max_count = slide_doc.max_count, + submit_method = submit_method, + image_src= image_src + )) + return slides + +@frappe.whitelist() +def get_onboarding_slides(): + slides = [] + slide_settings = get_slide_settings() + + domains = frappe.get_active_domains() + for s in slide_settings: + if not s.domains or any(d in domains for d in s.domains): + slides.append(s) + return slides + +def get_domains(slide_doc): + domains_list = [] + for entry in slide_doc.domains: + domains_list.append(entry.domain) + return domains_list + +def get_help_links(slide_doc): + links=[] + for link in slide_doc.help_links: + links.append({ + 'label': link.label, + 'video_id': link.video_id + }) + return links diff --git a/frappe/desk/doctype/setup_wizard_settings/test_setup_wizard_settings.py b/frappe/desk/doctype/setup_wizard_settings/test_setup_wizard_settings.py new file mode 100644 index 0000000000..08aa831d2b --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_settings/test_setup_wizard_settings.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestSetupWizardSettings(unittest.TestCase): + pass diff --git a/frappe/desk/doctype/setup_wizard_slide/__init__.py b/frappe/desk/doctype/setup_wizard_slide/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js new file mode 100644 index 0000000000..dcc6fb15a8 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js @@ -0,0 +1,8 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Setup Wizard Slide', { + // refresh: { + + // } +}); diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json new file mode 100644 index 0000000000..661a855e39 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json @@ -0,0 +1,153 @@ +{ + "autoname": "field:slide_title", + "creation": "2019-11-13 14:39:56.834658", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "slide_title", + "app", + "column_break_4", + "image_src", + "description_section_break", + "slide_desc", + "action_section_break", + "slide_type", + "submit_method", + "column_break_6", + "max_count", + "add_more_button", + "section_break_5", + "slide_fields", + "section_break_10", + "domains", + "column_break_12", + "help_links" + ], + "fields": [ + { + "fieldname": "slide_title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Slide Title", + "reqd": 1, + "unique": 1 + }, + { + "depends_on": "eval:doc.slide_type === 'Action';", + "fieldname": "submit_method", + "fieldtype": "Data", + "label": "Submit Method" + }, + { + "fieldname": "slide_desc", + "fieldtype": "HTML Editor", + "label": "Slide Description" + }, + { + "default": "3", + "depends_on": "add_more_button", + "fieldname": "max_count", + "fieldtype": "Int", + "label": "Max Count" + }, + { + "default": "0", + "depends_on": "eval: doc.slide_type === 'Action';", + "fieldname": "add_more_button", + "fieldtype": "Check", + "label": "Add More Button" + }, + { + "fieldname": "section_break_5", + "fieldtype": "Section Break", + "label": "Fields" + }, + { + "fieldname": "slide_fields", + "fieldtype": "Table", + "label": "Slide Fields", + "options": "Setup Wizard Slide Field" + }, + { + "fieldname": "section_break_10", + "fieldtype": "Section Break" + }, + { + "fieldname": "domains", + "fieldtype": "Table", + "label": "Domains", + "options": "Has Domain", + "reqd": 1 + }, + { + "fieldname": "column_break_12", + "fieldtype": "Column Break" + }, + { + "fieldname": "help_links", + "fieldtype": "Table", + "label": "Help Links", + "options": "Setup Wizard Help Link" + }, + { + "fieldname": "action_section_break", + "fieldtype": "Section Break", + "label": "Action Settings" + }, + { + "fieldname": "slide_type", + "fieldtype": "Select", + "label": "Slide Type", + "options": "\nAction\nInfo", + "reqd": 1 + }, + { + "fieldname": "column_break_6", + "fieldtype": "Column Break" + }, + { + "fieldname": "app", + "fieldtype": "Select", + "label": "App", + "options": "Frappe\nERPNext", + "reqd": 1 + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fieldname": "image_src", + "fieldtype": "Data", + "label": "Slide Image Source" + }, + { + "fieldname": "description_section_break", + "fieldtype": "Section Break", + "label": "Description" + } + ], + "modified": "2019-11-21 17:35:30.846135", + "modified_by": "ruchamahabal2@gmail.com", + "module": "Desk", + "name": "Setup Wizard Slide", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py new file mode 100644 index 0000000000..2a87820efc --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 SetupWizardSlide(Document): + pass diff --git a/frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py b/frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py new file mode 100644 index 0000000000..58652c4ec2 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestSetupWizardSlide(unittest.TestCase): + pass diff --git a/frappe/desk/doctype/setup_wizard_slide_field/__init__.py b/frappe/desk/doctype/setup_wizard_slide_field/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json b/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json new file mode 100644 index 0000000000..d0f643a9ab --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json @@ -0,0 +1,109 @@ +{ + "creation": "2019-11-13 13:35:08.617909", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "label", + "fieldtype", + "fieldname", + "options", + "align", + "placeholder", + "reqd", + "column_break_4", + "max_length", + "max_value", + "section_break_6", + "description", + "column_break_8", + "default" + ], + "fields": [ + { + "fieldname": "label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Label" + }, + { + "fieldname": "fieldtype", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Fieldtype", + "options": "Attach\nAttach Image\nCheck\nCurrency\nData\nDate\nDatetime\nFloat\nHTML\nInt\nRating\nSelect\nLink\nSmall Text\nText\nText Editor\nSection Break\nColumn Break" + }, + { + "fieldname": "fieldname", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Fieldname" + }, + { + "fieldname": "options", + "fieldtype": "Text", + "in_list_view": 1, + "label": "Options" + }, + { + "fieldname": "align", + "fieldtype": "Select", + "label": "Align", + "options": "\ncenter\nleft\nright" + }, + { + "fieldname": "placeholder", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Placeholder" + }, + { + "default": "0", + "fieldname": "reqd", + "fieldtype": "Check", + "label": "Mandatory" + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fieldname": "max_length", + "fieldtype": "Int", + "label": "Max Length" + }, + { + "depends_on": "eval:doc.fieldtype=='Int'", + "fieldname": "max_value", + "fieldtype": "Int", + "label": "Max Value" + }, + { + "fieldname": "section_break_6", + "fieldtype": "Section Break" + }, + { + "fieldname": "description", + "fieldtype": "Text", + "label": "Description" + }, + { + "fieldname": "column_break_8", + "fieldtype": "Column Break" + }, + { + "fieldname": "default", + "fieldtype": "Data", + "label": "Default" + } + ], + "istable": 1, + "modified": "2019-11-21 17:47:12.648395", + "modified_by": "ruchamahabal2@gmail.com", + "module": "Desk", + "name": "Setup Wizard Slide Field", + "owner": "Administrator", + "permissions": [], + "sort_field": "modified", + "sort_order": "DESC" +} \ No newline at end of file diff --git a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py b/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py new file mode 100644 index 0000000000..1b880ef916 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 SetupWizardSlideField(Document): + pass diff --git a/frappe/desk/doctype/setup_wizard_slide_order/__init__.py b/frappe/desk/doctype/setup_wizard_slide_order/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.json b/frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.json new file mode 100644 index 0000000000..7cffeb55e7 --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.json @@ -0,0 +1,30 @@ +{ + "creation": "2019-11-13 15:54:09.558748", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "slide" + ], + "fields": [ + { + "fieldname": "slide", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Slide", + "options": "Setup Wizard Slide", + "reqd": 1 + } + ], + "istable": 1, + "modified": "2019-11-19 11:55:58.818555", + "modified_by": "Administrator", + "module": "Desk", + "name": "Setup Wizard Slide Order", + "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/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.py b/frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.py new file mode 100644 index 0000000000..7ac5ac3fda --- /dev/null +++ b/frappe/desk/doctype/setup_wizard_slide_order/setup_wizard_slide_order.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, 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 SetupWizardSlideOrder(Document): + pass diff --git a/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json b/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json new file mode 100644 index 0000000000..7b77beb2b6 --- /dev/null +++ b/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json @@ -0,0 +1,24 @@ +{ + "creation": "2019-11-13 16:07:24.786989", + "docstatus": 0, + "doctype": "Setup Wizard Settings", + "idx": "0", + "modified": "2019-11-21 12:38:33.839741", + "modified_by": "ruchamahabal2@gmail.com", + "name": "Setup Wizard Settings", + "owner": "Administrator", + "slide_order": [ + { + "slide": "Welcome to ERPNext!" + }, + { + "slide": "Add A Few Products You Buy Or Sell" + }, + { + "slide": "Add A Few Customers" + }, + { + "slide": "Add A Few Suppliers" + } + ] +} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/__init__.py b/frappe/desk/setup_wizard_slide/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/setup_wizard_slide/add_a_few_customers/__init__.py b/frappe/desk/setup_wizard_slide/add_a_few_customers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json b/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json new file mode 100644 index 0000000000..f2b90d231b --- /dev/null +++ b/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json @@ -0,0 +1,64 @@ +{ + "add_more_button": 1, + "app": "ERPNext", + "creation": "2019-11-15 14:44:10.065014", + "docstatus": 0, + "doctype": "Setup Wizard Slide", + "domains": [ + { + "domain": "Manufacturing" + }, + { + "domain": "Services" + }, + { + "domain": "Retail" + }, + { + "domain": "Distribution" + } + ], + "help_links": [ + { + "label": "Customers", + "video_id": "zsrrVDk6VBs" + } + ], + "idx": 0, + "max_count": 3, + "modified": "2019-11-21 10:54:10.736056", + "modified_by": "Administrator", + "name": "Add A Few Customers", + "owner": "Administrator", + "slide_fields": [ + { + "align": "", + "fieldname": "customer_name", + "fieldtype": "Data", + "label": "Customer Name", + "max_length": 0, + "max_value": 0, + "placeholder": "", + "reqd": 1 + }, + { + "align": "", + "fieldtype": "Column Break", + "max_length": 0, + "max_value": 0, + "reqd": 0 + }, + { + "align": "", + "fieldname": "customer_contact", + "fieldtype": "Data", + "label": "Customer Contact", + "max_length": 0, + "max_value": 0, + "reqd": 1 + } + ], + "slide_title": "Add A Few Customers", + "slide_type": "Action", + "submit_method": "create_customers" +} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/__init__.py b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json new file mode 100644 index 0000000000..5946a13624 --- /dev/null +++ b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json @@ -0,0 +1,78 @@ +{ + "add_more_button": 1, + "app": "ERPNext", + "creation": "2019-11-15 14:41:12.007359", + "docstatus": 0, + "doctype": "Setup Wizard Slide", + "domains": [ + { + "domain": "Manufacturing" + }, + { + "domain": "Retail" + }, + { + "domain": "Services" + }, + { + "domain": "Distribution" + } + ], + "help_links": [], + "idx": 0, + "image_src": "/assets/erpnext/images/illustrations/product.png", + "max_count": 3, + "modified": "2019-11-21 12:31:57.487975", + "modified_by": "ruchamahabal2@gmail.com", + "name": "Add A Few Products You Buy Or Sell", + "owner": "Administrator", + "slide_desc": "", + "slide_fields": [ + { + "align": "", + "fieldname": "item", + "fieldtype": "Data", + "label": "Item", + "max_length": 0, + "max_value": 0, + "placeholder": "Product Name", + "reqd": 1 + }, + { + "align": "", + "fieldtype": "Column Break", + "max_length": 0, + "max_value": 0, + "reqd": 1 + }, + { + "align": "", + "fieldname": "uom", + "fieldtype": "Link", + "label": "UOM", + "max_length": 0, + "max_value": 0, + "options": "UOM", + "reqd": 1 + }, + { + "align": "", + "fieldtype": "Column Break", + "max_length": 0, + "max_value": 0, + "reqd": 0 + }, + { + "align": "", + "fieldname": "item_price", + "fieldtype": "Currency", + "label": "Item Price", + "max_length": 0, + "max_value": 0, + "reqd": 1 + } + ], + "slide_title": "Add A Few Products You Buy Or Sell", + "slide_type": "Action", + "submit_method": "create_items" +} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/add_a_few_suppliers/__init__.py b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json new file mode 100644 index 0000000000..0d72f532e6 --- /dev/null +++ b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json @@ -0,0 +1,65 @@ +{ + "add_more_button": 1, + "app": "ERPNext", + "creation": "2019-11-15 14:45:32.626641", + "docstatus": 0, + "doctype": "Setup Wizard Slide", + "domains": [ + { + "domain": "Manufacturing" + }, + { + "domain": "Services" + }, + { + "domain": "Retail" + }, + { + "domain": "Distribution" + } + ], + "help_links": [ + { + "label": "Supplier", + "video_id": "zsrrVDk6VBs" + } + ], + "idx": 0, + "max_count": 3, + "modified": "2019-11-21 10:54:03.196745", + "modified_by": "Administrator", + "name": "Add A Few Suppliers", + "owner": "Administrator", + "slide_desc": "", + "slide_fields": [ + { + "align": "", + "fieldname": "supplier_name", + "fieldtype": "Data", + "label": "Supplier Name", + "max_length": 0, + "max_value": 0, + "placeholder": "", + "reqd": 1 + }, + { + "align": "", + "fieldtype": "Column Break", + "max_length": 0, + "max_value": 0, + "reqd": 0 + }, + { + "align": "", + "fieldname": "supplier_contact", + "fieldtype": "Data", + "label": "Supplier Contact", + "max_length": 0, + "max_value": 0, + "reqd": 1 + } + ], + "slide_title": "Add A Few Suppliers", + "slide_type": "Action", + "submit_method": "create_suppliers" +} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/__init__.py b/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json b/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json new file mode 100644 index 0000000000..6357db09b1 --- /dev/null +++ b/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json @@ -0,0 +1,50 @@ +{ + "add_more_button": 0, + "creation": "2019-11-13 16:03:01.422088", + "docstatus": 0, + "doctype": "Setup Wizard Slide", + "domains": [ + { + "domain": "Services" + }, + { + "domain": "Manufacturing" + }, + { + "domain": "Retail" + }, + { + "domain": "Distribution" + } + ], + "help_links": [], + "idx": 0, + "max_count": 0, + "modified": "2019-11-19 13:35:05.379455", + "modified_by": "Administrator", + "name": "Company Logo and Letter Head", + "owner": "Administrator", + "slide_fields": [ + { + "align": "center", + "fieldname": "attach_logo", + "fieldtype": "Attach Image", + "label": "Attach Logo", + "max_length": 0, + "max_value": 0, + "options": "image", + "reqd": 0 + }, + { + "align": "center", + "fieldname": "attach_letterhead", + "fieldtype": "Attach Image", + "label": "Attach Letterhead", + "max_length": 0, + "max_value": 0, + "options": "image", + "reqd": 0 + } + ], + "slide_title": "Company Logo and Letter Head" +} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/__init__.py b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json new file mode 100644 index 0000000000..78ae0e615c --- /dev/null +++ b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json @@ -0,0 +1,36 @@ +{ + "add_more_button": 0, + "app": "ERPNext", + "creation": "2019-11-13 16:00:04.735347", + "docstatus": 0, + "doctype": "Setup Wizard Slide", + "domains": [ + { + "domain": "Manufacturing" + }, + { + "domain": "Retail" + }, + { + "domain": "Services" + }, + { + "domain": "Distribution" + }, + { + "domain": "Education" + } + ], + "help_links": [], + "idx": 0, + "image_src": "/assets/erpnext/images/illustrations/handshake.png", + "max_count": 0, + "modified": "2019-11-21 12:31:45.856754", + "modified_by": "ruchamahabal2@gmail.com", + "name": "Welcome to ERPNext!", + "owner": "Administrator", + "slide_desc": "Setting up an ERP can be overwhelming. But don't worry, we have got your back!
\nLet's setup your company.\nThis wizard will help you onboard to ERPNext in a short time!", + "slide_fields": [], + "slide_title": "Welcome to ERPNext!", + "slide_type": "Info" +} \ No newline at end of file diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 18bf827c5f..8e4504d160 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -41,7 +41,12 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe ("data_migration", "data_migration_mapping_detail"), ("data_migration", "data_migration_mapping"), ("data_migration", "data_migration_plan_mapping"), - ("data_migration", "data_migration_plan")): + ("data_migration", "data_migration_plan"), + ("desk", "setup_wizard_slide_field"), + ("desk", "setup_wizard_help_link"), + ("desk", "setup_wizard_slide"), + ("desk", "setup_wizard_slide_order"), + ("desk", "setup_wizard_settings")): files.append(os.path.join(frappe.get_app_path("frappe"), d[0], "doctype", d[1], d[1] + ".json")) @@ -70,7 +75,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F # load in sequence - warning for devs document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'website_theme', 'web_form', 'notification', 'print_style', - 'data_migration_mapping', 'data_migration_plan'] + 'data_migration_mapping', 'data_migration_plan', 'setup_wizard_slide', 'setup_wizard_settings'] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) if os.path.exists(doctype_path): diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 3deeb02ae4..75a17932ff 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -88,6 +88,9 @@ frappe.Application = Class.extend({ } this.show_update_available(); + if (frappe.boot.is_first_startup) { + this.setup_onboarding_wizard(); + } if(frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) { frappe.ui.startup_setup_dialog.pre_show(); @@ -486,6 +489,32 @@ frappe.Application = Class.extend({ }); }, + setup_onboarding_wizard: () => { + var me = this; + frappe.call({ + method: "frappe.desk.doctype.setup_wizard_settings.setup_wizard_settings.get_onboarding_slides", + callback: function(r) { + if(r.message) { + let slides = r.message; + if(slides.length) { + frappe.require("assets/frappe/js/frappe/ui/onboarding_dialog.js", () => { + me.progress_dialog = new frappe.setup.OnboardingDialog({ + slides: slides + }); + me.progress_dialog.show(); + frappe.call({ + method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup", + args: {}, + callback: () => {} + }); + }); + } + } + }, + freeze: false + }); + }, + setup_analytics: function() { if(window.mixpanel) { window.mixpanel.identify(frappe.session.user); diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js new file mode 100644 index 0000000000..c9f9896b8e --- /dev/null +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -0,0 +1,126 @@ +// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +// License: GNU General Public License v3. See license.txt + +frappe.provide("frappe.setup"); +frappe.provide("frappe.ui"); + +frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { + constructor(slide = null) { + super(slide); + } + + make() { + super.make(); + this.$done_state = $(`
+
+
`).appendTo(this.$body); + if(this.help_links) { + this.setup_help_links(); + } + } + + before_show() { + this.$action_button = this.slides_footer.find('.next-btn') + if (this.id === 0) { + this.$action_button.text(__('Start')); + } else { + this.$action_button.text(__('Next')); + } if (this.id === this.parent[0].children.length-1) { + this.slides_footer.find('.complete-btn').removeClass('hide').addClass('btn-primary action primary'); + this.slides_footer.find('.next-btn').removeClass('action primary'); + this.$action_button = this.slides_footer.find('.complete-btn') + } else { + this.slides_footer.find('.complete-btn').removeClass('btn-primary action primary').addClass('hide'); + this.slides_footer.find('.next-btn').addClass('action primary'); + this.$action_button = this.slides_footer.find('.next-btn') + } if (this.slide_type == 'Action') { + this.$action_button.addClass('primary'); + } else if (this.slide_type == 'Info') { + this.$action_button.removeClass('primary'); + } + } + + primary_action() { + let me = this; + if (me.set_values()) { + me.slides_footer.find('.primary').addClass('disabled'); + frappe.call({ + method: me.submit_method, + args: {args_data: me.values}, + callback: function() { + if (me.id === me.parent[0].children.length-1) { + if (me.slides_footer.find('.complete-btn').hasClass('primary')) { + $('.user-progress-dialog').modal('toggle'); + frappe.msgprint({ + message: __('You are all set up!'), + indicator: 'green', + title: __('Success') + }); + } + } + }, + onerror: function() { + me.slides_footer.find('.primary').removeClass('disabled'); + }, + freeze: true + }); + } + } + + unbind_primary_action() { + // unbind only action method as next button is same as create button in this setup wizard + this.slides_footer.find('.action').off('click.primary_action'); + } + + setup_help_links() { + let $help_links = this.$done_state.find('.help-links'); + this.help_links.map(link => { + let $link = $( + `${link.label} + + + ` + ); + if(link.video_id) { + $link.on('click', () => { + frappe.help.show_video(link.video_id, link.label); + }) + } + $help_links.append($link); + }); + $('.help-links').append($help_links); + } +}; + +frappe.setup.OnboardingDialog = class OnboardingDialog { + constructor({ + slides = [] + }) { + this.slides = slides; + this.setup(); + } + + setup() { + this.dialog = new frappe.ui.Dialog({title: __("Let's Onboard!")}); + this.$wrapper = $(this.dialog.$wrapper).addClass('user-progress-dialog'); + this.slide_container = new frappe.ui.Slides({ + parent: this.dialog.body, + slides: this.slides, + slide_class: frappe.setup.OnboardingSlide, + unidirectional: 1, + before_load: ($footer) => { + $footer.find('.prev-btn').addClass('hide'); + $footer.find('.next-btn').removeClass('btn-default').addClass('btn-primary action'); + $footer.find('.text-right').prepend( + $(` + ${__("Complete")}`)); + } + }); + + this.$wrapper.find('.modal-title').prepend(``); + } + + show() { + this.dialog.show(); + } +}; diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index 7db8e958ce..d2e504337c 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -26,7 +26,9 @@ frappe.ui.Slide = class Slide {
- ${__("Add More")} + + +
`).appendTo(this.$wrapper); @@ -35,9 +37,9 @@ frappe.ui.Slide = class Slide { this.$form = this.$body.find(".form"); this.$primary_btn = this.slides_footer.find('.primary'); - if(this.help) this.$content.append($(`

${this.help}

`)); if(this.image_src) this.$content.append( $(``)); + if(this.help) this.$content.append($(`

${this.help}

`)); this.reqd_fields = []; @@ -69,6 +71,8 @@ frappe.ui.Slide = class Slide { this.set_reqd_fields(); } + setup_done_state() {} + // Form methods get_atomic_fields() { var fields = JSON.parse(JSON.stringify(this.fields)); @@ -122,6 +126,7 @@ frappe.ui.Slide = class Slide { if(!field.static) { if(field.label) field.label += ' ' + this.count; } + field.reqd = 0; return field; })); if(this.count === this.max_count) { @@ -163,7 +168,7 @@ frappe.ui.Slide = class Slide { } bind_primary_action() { - this.slides_footer.find(".primary").on('click', () => { + this.slides_footer.find(".primary").on('click.primary_action', () => { this.primary_action(); }); } diff --git a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js b/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js deleted file mode 100644 index 4da50f61f2..0000000000 --- a/frappe/public/js/frappe/ui/toolbar/user_progress_dialog.js +++ /dev/null @@ -1,209 +0,0 @@ -// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -// License: GNU General Public License v3. See license.txt - -frappe.provide("frappe.setup"); -frappe.provide("frappe.ui"); - -frappe.setup.UserProgressSlide = class UserProgressSlide extends frappe.ui.Slide { - constructor(slide = null) { - super(slide); - } - - make() { - super.make(); - } - - setup_done_state() { - this.$body.find(".slide-help").hide(); - this.$body.find(".form-wrapper").hide(); - this.slides_footer.find('.next-btn').addClass('btn-primary'); - this.slides_footer.find('.done-btn').hide(); - this.$primary_btn.hide(); - this.make_done_state(); - } - - make_done_state() { - this.$done_state = $(`
-
-

-
-
`).appendTo(this.$body); - - this.$done_state_title = this.$done_state.find('.title'); - this.$check = this.$done_state.find('.check'); - this.$help_links = this.$done_state.find('.help-links'); - - if(this.done_state_title) { - $("" + this.done_state_title + "").appendTo(this.$done_state_title); - this.$done_state_title.on('click', () => { - frappe.set_route(this.done_state_title_route); - }); - } - - if(this.help_links) { - this.help_links.map(link => { - let $link = $(`${link.label}`); - if(link.url) { - $link.attr({"href": link.url}); - } else if(link.video_id) { - $link.on('click', () => { - frappe.help.show_video(link.video_id, link.label); - }) - } - this.$help_links.append($link); - }); - } - - } - - before_show() { - if(this.done) { - this.slides_footer.find('.next-btn').addClass('btn-primary'); - this.slides_footer.find('.done-btn').hide(); - } else { - this.slides_footer.find('.next-btn').removeClass('btn-primary'); - this.slides_footer.find('.done-btn').show(); - } - if(this.dialog_dismissed) { - this.slides_footer.find('.next-btn').removeClass('btn-primary'); - } - } - - primary_action() { - var me = this; - if(this.set_values()) { - this.slides_footer.find('.make-btn').addClass('disabled'); - frappe.call({ - method: me.submit_method, - args: {args_data: me.values}, - callback: function() { - me.done = 1; - me.refresh(); - }, - onerror: function() { - me.slides_footer.find('.make-btn').removeClass('disabled'); - }, - freeze: true - }); - } - } -}; - -frappe.setup.UserProgressDialog = class UserProgressDialog { - constructor({ - slides = [] - }) { - this.slides = slides; - this.progress_state_dict = {}; - this.slides.map(slide => { - this.progress_state_dict[slide.action_name] = slide.done || 0; - }); - this.progress_percent = 0; - this.setup(); - } - - setup() { - this.dialog = new frappe.ui.Dialog({title: __("Complete Setup")}); - this.$wrapper = $(this.dialog.$wrapper).addClass('user-progress-dialog'); - this.slide_container = new frappe.ui.Slides({ - parent: this.dialog.body, - slides: this.slides, - slide_class: frappe.setup.UserProgressSlide, - done_state: 1, - before_load: ($footer) => { - $footer.find('.text-right') - .prepend($(` - ${__("Mark as Done")}`)) - .append($(` - ${__('Create')}`)); - }, - on_update: (completed, total) => { - let percent = completed * 100 / total; - $('.user-progress .progress-bar').css({'width': percent + '%'}); - if(percent === 100) { - this.dismiss_progress(); - } - } - }); - - this.$wrapper.find('.done-btn').on('click', () => { - this.mark_as_done(); - }); - - this.get_and_update_progress_state(); - this.check_for_updates(); - } - - mark_as_done() { - let me = this; - let current_slide = this.slide_container.current_slide; - frappe.call({ - method: current_slide.mark_as_done_method, - args: {action_name: current_slide.action_name}, - callback: function() { - current_slide.done = 1; - current_slide.refresh(); - }, - freeze: true - }); - } - - check_for_updates() { - this.updater = setInterval(() => { - this.get_and_update_progress_state(); - }, 60000); - } - - get_and_update_progress_state() { - var me = this; - frappe.call({ - method: "frappe.desk.user_progress.update_and_get_user_progress", - callback: function(r) { - let states = r.message; - let changed = 0; - let completed = 0; - Object.keys(states).map(action_name => { - if(states[action_name]) { - completed ++; - } - if(me.progress_state_dict[action_name] != states[action_name]) { - changed = 1; - me.progress_state_dict[action_name] = states[action_name]; - } - }); - - if(changed) { - Object.keys(me.slide_container.slide_dict).map((id) => { - let slide = me.slide_container.slide_dict[id]; - if(me.progress_state_dict[slide.action_name]) { - if(!slide.done) { - slide.done = 1; - slide.refresh(); - } - } - }); - - } - me.progress_percent = completed / Object.keys(states).length * 100; - me.update_progress(); - }, - freeze: false - }); - } - - update_progress() { - $('.user-progress .progress-bar').css({'width': this.progress_percent + '%'}); - if(this.progress_percent === 100) { - this.dismiss_progress(); - } - } - - dismiss_progress() { - $('.user-progress').addClass('hide'); - clearInterval(this.updater); - } - - show() { - this.dialog.show(); - } -}; diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 5a515b6e84..88761aab99 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -961,6 +961,24 @@ input[type="checkbox"] { // User Progress Dialog .user-progress-dialog { + + .modal-dialog { + width: 50%; + height: 80%; + max-width: none; + } + + .onboarding-icon { + color: #3246F5; + margin-right: 5px; + } + + .modal-content .slide-container { + height: auto; + min-height: 100%; + bottom: 0; + } + .slides-progress { margin-top: 15px; } diff --git a/frappe/sessions.py b/frappe/sessions.py index ffad4b5e7b..cca40cbc55 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -155,7 +155,7 @@ def get(): bootinfo["disable_async"] = frappe.conf.disable_async bootinfo["setup_complete"] = cint(frappe.db.get_single_value('System Settings', 'setup_complete')) - + bootinfo["is_first_startup"] = cint(frappe.db.get_single_value('System Settings', 'is_first_startup')) return bootinfo From 2759689ea972645c15de658f99fb155746fcbe21 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 Nov 2019 11:34:20 +0530 Subject: [PATCH 088/226] fix: reload notification subscribed document (#8868) --- frappe/patches/v12_0/create_notification_settings_for_user.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches/v12_0/create_notification_settings_for_user.py b/frappe/patches/v12_0/create_notification_settings_for_user.py index 170931bdf3..63eeccc07a 100644 --- a/frappe/patches/v12_0/create_notification_settings_for_user.py +++ b/frappe/patches/v12_0/create_notification_settings_for_user.py @@ -4,6 +4,7 @@ from frappe.desk.doctype.notification_settings.notification_settings import crea def execute(): frappe.reload_doc('desk', 'doctype', 'notification_settings') + frappe.reload_doc('desk', 'doctype', 'notification_subscribed_document') users = frappe.db.get_all('User', fields=['name']) for user in users: From 30d20610c4411016eb970409f08c3883357ef5dd Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 21 Nov 2019 16:13:42 +0530 Subject: [PATCH 089/226] fix: ui tests --- cypress/integration/grid_pagination.js | 7 ++++++- frappe/tests/ui_test_helpers.py | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cypress/integration/grid_pagination.js b/cypress/integration/grid_pagination.js index bf6f144358..cf41e31ee6 100644 --- a/cypress/integration/grid_pagination.js +++ b/cypress/integration/grid_pagination.js @@ -1,6 +1,7 @@ context('Grid Pagination', () => { beforeEach(() => { - cy.visit('/desk#Form/Contact/Test Contact'); + cy.login(); + cy.visit('/desk'); }); before(() => { cy.login(); @@ -10,12 +11,14 @@ context('Grid Pagination', () => { }); }); it('creates pages for child table', () => { + cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('.current-page-number').should('contain', '1'); cy.get('@table').find('.total-page-number').should('contain', '50'); cy.get('@table').find('.grid-body .grid-row').should('have.length', 20); }); it('goes to the next and previous page', () => { + cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('.next-page').click(); cy.get('@table').find('.current-page-number').should('contain', '2'); @@ -25,6 +28,7 @@ context('Grid Pagination', () => { cy.get('@table').find('.grid-body .grid-row').first().should('have.attr', 'data-idx', '1'); }); it('adds and deletes rows and changes page', ()=> { + cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('button.grid-add-row').click(); cy.get('@table').find('.grid-body .row-index').should('contain', 1001); @@ -37,6 +41,7 @@ context('Grid Pagination', () => { cy.get('@table').find('.total-page-number').should('contain', '50'); }); it('deletes all rows', ()=> { + cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('.grid-heading-row .grid-row-check').click({force: true}); cy.get('@table').find('button.grid-remove-all-rows').click(); diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 05f3c0617e..d3e6193699 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -71,7 +71,6 @@ def create_contact_phone_nos_records(): doc = frappe.new_doc('Contact') doc.first_name = 'Test Contact' - doc.insert() for x in range(1000): doc.append('phone_nos', {'phone': '123456789'}) - doc.save() \ No newline at end of file + doc.insert() \ No newline at end of file From 3a73cf6e7d2ea8997a839b36c0c6d20ed110c741 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 22 Nov 2019 15:13:19 +0530 Subject: [PATCH 090/226] feat: Handle server and client side primary action in msgprint (#8870) * feat: Handle server and client side primary action in msgprint - Added provision to pass primary action from server side msgprint - msgprint on client side handles server side and client side methods as primary actions * chore: Code cleanup * fix: Codacy * fix: patch --- frappe/__init__.py | 6 +++++- frappe/public/js/frappe/ui/messages.js | 30 ++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 77207e017f..c937cc8548 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -290,7 +290,7 @@ def log(msg): debug_log.append(as_unicode(msg)) -def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False): +def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False, primary_action=None): """Print a message to the user (via HTTP response). Messages are sent in the `__server_messages` property in the response JSON and shown in a pop-up / modal. @@ -299,6 +299,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, :param title: [optional] Message title. :param raise_exception: [optional] Raise given exception and show message. :param as_table: [optional] If `msg` is a list of lists, render as HTML table. + :param primary_action: [optional] Bind a primary server/client side action. """ from frappe.utils import encode @@ -338,6 +339,9 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, if alert: out.alert = 1 + if primary_action: + out.primary_action = primary_action + message_log.append(json.dumps(out)) if raise_exception and hasattr(raise_exception, '__name__'): diff --git a/frappe/public/js/frappe/ui/messages.js b/frappe/public/js/frappe/ui/messages.js index f804648834..26bee50f18 100644 --- a/frappe/public/js/frappe/ui/messages.js +++ b/frappe/public/js/frappe/ui/messages.js @@ -122,8 +122,34 @@ frappe.msgprint = function(msg, title) { // setup and bind an action to the primary button if (data.primary_action) { - frappe.msg_dialog.set_primary_action(__(data.primary_action.label || "Done"), - data.primary_action.action); + if (data.primary_action.server_action && typeof data.primary_action.server_action === 'string') { + data.primary_action.action = () => { + frappe.call({ + method: data.primary_action.server_action, + args: { + args: data.primary_action.args + } + }); + } + } + + if (data.primary_action.client_action && typeof data.primary_action.client_action === 'string') { + let parts = data.primary_action.client_action.split('.'); + let obj = window; + for (let part of parts) { + obj = obj[part]; + } + data.primary_action.action = () => { + if (typeof obj === 'function') { + obj(data.primary_action.args); + } + } + } + + frappe.msg_dialog.set_primary_action( + __(data.primary_action.label || "Done"), + data.primary_action.action + ); } // class "msgprint" is used in tests From cc4f0e98ca5775c1d0f3c7edc2d7cd6ba89456a7 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 18 Nov 2019 11:51:37 +0530 Subject: [PATCH 091/226] feat: add all time in dashboard charts --- frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 1 + frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js index 99ba49bc4f..a330f7e97e 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js @@ -41,6 +41,7 @@ frappe.ui.form.on('Dashboard Chart', { timespan: function(frm) { const time_interval_options = { "Select Date Range": ["Quarterly", "Monthly", "Weekly", "Daily"], + "All Time": ["Yearly", "Monthly"], "Last Year": ["Quarterly", "Monthly", "Weekly", "Daily"], "Last Quarter": ["Monthly", "Weekly", "Daily"], "Last Month": ["Weekly", "Daily"], diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json index 7e99b86eae..a5f9cead00 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json @@ -82,14 +82,14 @@ "fieldname": "timespan", "fieldtype": "Select", "label": "Timespan", - "options": "Last Year\nLast Quarter\nLast Month\nLast Week\nSelect Date Range" + "options": "All Time\nLast Year\nLast Quarter\nLast Month\nLast Week\nSelect Date Range" }, { "depends_on": "timeseries", "fieldname": "time_interval", "fieldtype": "Select", "label": "Time Interval", - "options": "Quarterly\nMonthly\nWeekly\nDaily" + "options": "Yearly\nQuarterly\nMonthly\nWeekly\nDaily" }, { "default": "0", @@ -187,7 +187,7 @@ "label": "To Date" } ], - "modified": "2019-11-04 12:32:14.525409", + "modified": "2019-11-18 16:20:11.529496", "modified_by": "Administrator", "module": "Desk", "name": "Dashboard Chart", From 2489a1bc9df20717e7bb38eb32f7232aac7caaba Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Thu, 21 Nov 2019 11:00:16 +0530 Subject: [PATCH 092/226] fix: fetch date based on a predefined period for yearly charts --- frappe/core/page/dashboard/dashboard.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py index ebe8ce2c16..bed5c9d4bc 100644 --- a/frappe/core/page/dashboard/dashboard.py +++ b/frappe/core/page/dashboard/dashboard.py @@ -44,5 +44,7 @@ def get_from_date_from_timespan(to_date, timespan): months = -3 elif "Last Year" == timespan: years = -1 + elif "All Time" == timespan: + years = -50 return add_to_date(to_date, years=years, months=months, days=days, as_datetime=True) From 3d748c8a3377a045dc3402e8c860576610d7815d Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Fri, 22 Nov 2019 22:06:58 +0530 Subject: [PATCH 093/226] feat: add yearly in dashboard charts --- .../dashboard_chart/dashboard_chart.py | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index e7ec3f8bab..753bab9c2b 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -74,8 +74,7 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date): result = convert_to_dates(data, timegrain) # add missing data points for periods where there was no result - result = add_missing_values(result, timegrain, from_date, to_date) - + result = add_missing_values(result, timegrain, timespan, from_date, to_date) chart_config = { "labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result], "datasets": [{ @@ -134,6 +133,7 @@ def get_aggregate_function(chart_type): }[chart_type] def convert_to_dates(data, timegrain): + ''' Converts individual dates within data to the end of period ''' result = [] for d in data: if timegrain == 'Daily': @@ -144,7 +144,8 @@ def convert_to_dates(data, timegrain): result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = d[1]), days = -1), d[2]]) elif timegrain == 'Quarterly': result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = d[1] * 3), days = -1), d[2]]) - + elif timegrain == 'Yearly': + result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = 12), days = -1), d[2]]) result[-1][0] = getdate(result[-1][0]) return result @@ -164,17 +165,17 @@ def get_unit_function(datefield, timegrain): return unit_function -def add_missing_values(data, timegrain, from_date, to_date): +def add_missing_values(data, timegrain, from_date, to_date, timespan): # add missing intervals result = [] - first_expected_date = get_period_ending(from_date, timegrain) - - # fill out data before the first data point - first_data_point_date = data[0][0] if data else getdate(add_to_date(to_date, days=1)) - while first_data_point_date > first_expected_date: - result.append([first_expected_date, 0.0]) - first_expected_date = get_next_expected_date(first_expected_date, timegrain) + if timespan != 'All Time': + first_expected_date = get_period_ending(from_date, timegrain) + # fill out data before the first data point + first_data_point_date = data[0][0] if data else getdate(add_to_date(to_date, days=1)) + while first_data_point_date > first_expected_date: + result.append([first_expected_date, 0.0]) + first_expected_date = get_next_expected_date(first_expected_date, timegrain) # fill data points and missing points for i, d in enumerate(data): @@ -220,6 +221,8 @@ def get_period_ending(date, timegrain): date = get_month_ending(date) elif timegrain=='Quarterly': date = get_quarter_ending(date) + elif timegrain=='Yearly': + date = get_year_ending(date) return getdate(date) @@ -255,6 +258,14 @@ def get_quarter_ending(date): return date +def get_year_ending(date): + ''' returns year ending of the given date ''' + year = int(date.strftime('%y')) + + # first day of next year (note year starts from 1) + date = add_to_date('{}-01-01'.format(date.year), months = 12) + # last day of this month + return add_to_date(date, days = -1) class DashboardChart(Document): def on_update(self): From f7e48d5a81af91850ba509c339e71a048868379a Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Sat, 23 Nov 2019 18:36:34 +0530 Subject: [PATCH 094/226] fix: minor changes --- frappe/core/page/dashboard/dashboard.py | 10 +++---- .../dashboard_chart/dashboard_chart.py | 30 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/frappe/core/page/dashboard/dashboard.py b/frappe/core/page/dashboard/dashboard.py index bed5c9d4bc..1f4eaee783 100644 --- a/frappe/core/page/dashboard/dashboard.py +++ b/frappe/core/page/dashboard/dashboard.py @@ -36,15 +36,15 @@ def generate_and_cache_results(chart, chart_name, function, cache_key): def get_from_date_from_timespan(to_date, timespan): days = months = years = 0 - if "Last Week" == timespan: + if timespan == "Last Week": days = -7 - if "Last Month" == timespan: + if timespan == "Last Month": months = -1 - elif "Last Quarter" == timespan: + elif timespan == "Last Quarter": months = -3 - elif "Last Year" == timespan: + elif timespan == "Last Year": years = -1 - elif "All Time" == timespan: + elif timespan == "All Time": years = -50 return add_to_date(to_date, years=years, months=months, days=days, as_datetime=True) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 753bab9c2b..6dec12efc5 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -132,8 +132,9 @@ def get_aggregate_function(chart_type): "Average": "AVG", }[chart_type] + def convert_to_dates(data, timegrain): - ''' Converts individual dates within data to the end of period ''' + """ Converts individual dates within data to the end of period """ result = [] for d in data: if timegrain == 'Daily': @@ -141,11 +142,11 @@ def convert_to_dates(data, timegrain): elif timegrain == 'Weekly': result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), weeks = d[1] + 1), days = -1), d[2]]) elif timegrain == 'Monthly': - result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = d[1]), days = -1), d[2]]) + result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1]), days = -1), d[2]]) elif timegrain == 'Quarterly': - result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = d[1] * 3), days = -1), d[2]]) + result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1] * 3), days = -1), d[2]]) elif timegrain == 'Yearly': - result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months = 12), days = -1), d[2]]) + result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=12), days = -1), d[2]]) result[-1][0] = getdate(result[-1][0]) return result @@ -165,7 +166,7 @@ def get_unit_function(datefield, timegrain): return unit_function -def add_missing_values(data, timegrain, from_date, to_date, timespan): +def add_missing_values(data, timegrain, timespan, from_date, to_date): # add missing intervals result = [] @@ -213,15 +214,15 @@ def get_next_expected_date(date, timegrain): def get_period_ending(date, timegrain): date = getdate(date) - if timegrain=='Daily': + if timegrain == 'Daily': pass - elif timegrain=='Weekly': + elif timegrain == 'Weekly': date = get_week_ending(date) - elif timegrain=='Monthly': + elif timegrain == 'Monthly': date = get_month_ending(date) - elif timegrain=='Quarterly': + elif timegrain == 'Quarterly': date = get_quarter_ending(date) - elif timegrain=='Yearly': + elif timegrain == 'Yearly': date = get_year_ending(date) return getdate(date) @@ -234,7 +235,7 @@ def get_week_ending(date): # first day of next week date = add_to_date('{}-01-01'.format(date.year), weeks = week_of_the_year + 1) # last day of this week - return add_to_date(date, days = -1) + return add_to_date(date, days=-1) def get_month_ending(date): month_of_the_year = int(date.strftime('%m')) @@ -242,7 +243,7 @@ def get_month_ending(date): date = add_to_date('{}-01-01'.format(date.year), months = month_of_the_year) # last day of this month - return add_to_date(date, days = -1) + return add_to_date(date, days=-1) def get_quarter_ending(date): date = getdate(date) @@ -260,14 +261,15 @@ def get_quarter_ending(date): def get_year_ending(date): ''' returns year ending of the given date ''' - year = int(date.strftime('%y')) # first day of next year (note year starts from 1) date = add_to_date('{}-01-01'.format(date.year), months = 12) # last day of this month - return add_to_date(date, days = -1) + return add_to_date(date, days=-1) + class DashboardChart(Document): + def on_update(self): frappe.cache().delete_key('chart-data:{}'.format(self.name)) From 9536d6d61c61a25862043cb1d41bd6a5f5b22e3a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 25 Nov 2019 12:01:25 +0530 Subject: [PATCH 095/226] feat: contextual null state messages --- frappe/public/js/frappe/list/list_view.js | 21 ++++++++++++++++++--- frappe/public/less/list.less | 17 ++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index d5db15d126..5620469f8a 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -301,18 +301,33 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { this.columns = this.columns.slice(0, column_count); } + get_documentation_link() { + let find_url = this.meta.description.match("url:[^ ]*"); + if (find_url) { + let link = find_url[0].split("url:")[1] + return `Need Help?` + } + + return '' + } + get_no_result_message() { + let help_link = this.get_documentation_link() + let no_result_message = this.filters.length ? __('No {0} found', [__(this.doctype)]) : __('You haven\'t created a {0} yet', [__(this.doctype)]); + let new_button_label = this.filters.length ? __('Create a new {0}', [__(this.doctype)]) : __('Create your first {0}', [__(this.doctype)]); + const new_button = this.can_create ? `

` : ''; return `
- Generic Empty State + Generic Empty State
-

${__('No {0} found', [__(this.doctype)])}

+

${no_result_message}

${new_button} + ${help_link}
`; } diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index 99ba3e7c22..0df010c08c 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -5,9 +5,20 @@ min-height: ~"calc(100vh - 284px)"; } - .null-state { - height: 12em !important; - width: auto; + .msg-box { + margin-bottom: 2em; + // To compensate for percieved centering + // + .null-state { + height: 12em !important; + width: auto; + } + + .meta-description { + width: 45%; + margin-right: auto; + margin-left: auto; + } } } From 5351bff370a3df37598c460979f1246aabc2cb55 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 25 Nov 2019 12:04:13 +0530 Subject: [PATCH 096/226] fix: code cleanup --- .../setup_wizard_settings.py | 32 ++++---- .../setup_wizard_slide.json | 9 ++- .../setup_wizard_settings.json | 4 +- .../add_a_few_customers.json | 4 +- .../add_a_few_products_you_buy_or_sell.json | 4 +- .../add_a_few_suppliers.json | 3 +- .../__init__.py | 0 .../company_letter_head.json | 50 ++++++++++++ .../company_logo_and_letter_head.json | 50 ------------ .../welcome_to_erpnext!.json | 6 +- frappe/desk/user_progress.py | 30 ------- frappe/public/css/desk.css | 12 +-- frappe/public/js/frappe/desk.js | 6 +- .../public/js/frappe/ui/onboarding_dialog.js | 78 ++++++++++--------- frappe/public/less/desk.less | 27 ++----- 15 files changed, 135 insertions(+), 180 deletions(-) rename frappe/desk/setup_wizard_slide/{company_logo_and_letter_head => company_letter_head}/__init__.py (100%) create mode 100644 frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json delete mode 100644 frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json delete mode 100644 frappe/desk/user_progress.py diff --git a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py index 4a959190a7..7b0ee157d5 100644 --- a/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py +++ b/frappe/desk/doctype/setup_wizard_settings/setup_wizard_settings.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -from erpnext.setup.doctype.setup_progress.setup_progress import get_action_completed_state from frappe.modules import get_module_path, scrub_dt_dn from frappe.modules.export_file import export_to_files, create_init_py @@ -15,7 +14,7 @@ class SetupWizardSettings(Document): return if frappe.local.conf.get('developer_mode'): - record_list =[['Setup Wizard Settings', self.name]] + record_list = [['Setup Wizard Settings', self.name]] for s in self.slide_order: record_list.append(['Setup Wizard Slide', s.slide]) @@ -31,29 +30,18 @@ def get_slide_settings(): slide_settings = frappe.get_single('Setup Wizard Settings') for entry in slide_settings.slide_order: slide_doc = frappe.get_doc('Setup Wizard Slide', entry.slide) - print(frappe.get_installed_apps()) if frappe.scrub(slide_doc.app) in frappe.get_installed_apps(): - domains = get_domains(slide_doc) - help_links = get_help_links(slide_doc) - if slide_doc.slide_type == 'Action': - submit_method = frappe.scrub(slide_doc.app) + '.utilities.onboarding_utils.' + slide_doc.submit_method - else: - submit_method = None - if slide_doc.image_src: - image_src = slide_doc.image_src - else: - image_src = None slides.append(frappe._dict( slide_type = slide_doc.slide_type, title = slide_doc.slide_title, help = slide_doc.slide_desc, - domains = domains, + domains = get_domains(slide_doc), fields = slide_doc.slide_fields, - help_links = help_links, + help_links = get_help_links(slide_doc), add_more = slide_doc.add_more_button, max_count = slide_doc.max_count, - submit_method = submit_method, - image_src= image_src + submit_method = get_submit_method(slide_doc), + image_src = get_slide_image(slide_doc) )) return slides @@ -82,3 +70,13 @@ def get_help_links(slide_doc): 'video_id': link.video_id }) return links + +def get_submit_method(slide_doc): + if slide_doc.slide_type == 'Action': + return frappe.scrub(slide_doc.app) + '.utilities.onboarding_utils.' + slide_doc.submit_method + return None + +def get_slide_image(slide_doc): + if slide_doc.image_src: + return slide_doc.image_src + return None \ No newline at end of file diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json index 661a855e39..86defaf69a 100644 --- a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json +++ b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json @@ -35,6 +35,7 @@ }, { "depends_on": "eval:doc.slide_type === 'Action';", + "description": "Place this method in {app_name}.utilities.onboarding_utils.{method_name}\nand specify the method name here", "fieldname": "submit_method", "fieldtype": "Data", "label": "Submit Method" @@ -47,6 +48,7 @@ { "default": "3", "depends_on": "add_more_button", + "description": "The amount of times you want to repeat the set of fields (eg: if you want 3 customers in the slide, set this field to 3. Only the first set of fields is shown as mandatory in the slide)", "fieldname": "max_count", "fieldtype": "Int", "label": "Max Count" @@ -74,6 +76,7 @@ "fieldtype": "Section Break" }, { + "description": "Specify in what all domains should the slides show up. If nothing is specified the slide is shown in all domains by default.", "fieldname": "domains", "fieldtype": "Table", "label": "Domains", @@ -85,6 +88,7 @@ "fieldtype": "Column Break" }, { + "description": "Add a help video link just in case user has no idea about what to fill in the slide.", "fieldname": "help_links", "fieldtype": "Table", "label": "Help Links", @@ -96,6 +100,7 @@ "label": "Action Settings" }, { + "description": "If slide type is Action there should be a submit method bound to be executed after the slide is completed.", "fieldname": "slide_type", "fieldtype": "Select", "label": "Slide Type", @@ -128,8 +133,8 @@ "label": "Description" } ], - "modified": "2019-11-21 17:35:30.846135", - "modified_by": "ruchamahabal2@gmail.com", + "modified": "2019-11-25 10:11:12.710078", + "modified_by": "Administrator", "module": "Desk", "name": "Setup Wizard Slide", "owner": "Administrator", diff --git a/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json b/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json index 7b77beb2b6..3ebd637633 100644 --- a/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json +++ b/frappe/desk/setup_wizard_settings/setup_wizard_settings/setup_wizard_settings.json @@ -3,8 +3,8 @@ "docstatus": 0, "doctype": "Setup Wizard Settings", "idx": "0", - "modified": "2019-11-21 12:38:33.839741", - "modified_by": "ruchamahabal2@gmail.com", + "modified": "2019-11-25 11:50:27.156173", + "modified_by": "Administrator", "name": "Setup Wizard Settings", "owner": "Administrator", "slide_order": [ diff --git a/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json b/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json index f2b90d231b..8a7827226f 100644 --- a/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json +++ b/frappe/desk/setup_wizard_slide/add_a_few_customers/add_a_few_customers.json @@ -25,11 +25,13 @@ } ], "idx": 0, + "image_src": "/assets/erpnext/images/illustrations/customer.png", "max_count": 3, - "modified": "2019-11-21 10:54:10.736056", + "modified": "2019-11-25 11:05:51.169841", "modified_by": "Administrator", "name": "Add A Few Customers", "owner": "Administrator", + "slide_desc": "", "slide_fields": [ { "align": "", diff --git a/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json index 5946a13624..ce5df244d2 100644 --- a/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json +++ b/frappe/desk/setup_wizard_slide/add_a_few_products_you_buy_or_sell/add_a_few_products_you_buy_or_sell.json @@ -22,8 +22,8 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/product.png", "max_count": 3, - "modified": "2019-11-21 12:31:57.487975", - "modified_by": "ruchamahabal2@gmail.com", + "modified": "2019-11-22 13:16:32.222715", + "modified_by": "Administrator", "name": "Add A Few Products You Buy Or Sell", "owner": "Administrator", "slide_desc": "", diff --git a/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json index 0d72f532e6..d156ceff79 100644 --- a/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json +++ b/frappe/desk/setup_wizard_slide/add_a_few_suppliers/add_a_few_suppliers.json @@ -25,8 +25,9 @@ } ], "idx": 0, + "image_src": "/assets/erpnext/images/illustrations/supplier.png", "max_count": 3, - "modified": "2019-11-21 10:54:03.196745", + "modified": "2019-11-25 11:05:58.390770", "modified_by": "Administrator", "name": "Add A Few Suppliers", "owner": "Administrator", diff --git a/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/__init__.py b/frappe/desk/setup_wizard_slide/company_letter_head/__init__.py similarity index 100% rename from frappe/desk/setup_wizard_slide/company_logo_and_letter_head/__init__.py rename to frappe/desk/setup_wizard_slide/company_letter_head/__init__.py diff --git a/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json new file mode 100644 index 0000000000..cb8e1f9aac --- /dev/null +++ b/frappe/desk/setup_wizard_slide/company_letter_head/company_letter_head.json @@ -0,0 +1,50 @@ +{ + "add_more_button": 0, + "app": "ERPNext", + "creation": "2019-11-22 13:25:42.892593", + "docstatus": 0, + "doctype": "Setup Wizard Slide", + "domains": [ + { + "domain": "Services" + }, + { + "domain": "Manufacturing" + }, + { + "domain": "Retail" + }, + { + "domain": "Distribution" + } + ], + "help_links": [ + { + "label": "Know more about printing and branding through letterhead", + "video_id": "cKZHcx1znMc" + } + ], + "idx": 0, + "image_src": "/assets/erpnext/images/illustrations/letterhead.png", + "max_count": 0, + "modified": "2019-11-25 11:06:07.152239", + "modified_by": "Administrator", + "name": "Company Letter Head", + "owner": "Administrator", + "slide_desc": "Attach Letterhead:(Keep it web friendly as 1024px by 128px)", + "slide_fields": [ + { + "align": "center", + "fieldname": "letterhead", + "fieldtype": "Attach Image", + "label": "Attach Letterhead", + "max_length": 0, + "max_value": 0, + "options": "image", + "reqd": 0 + } + ], + "slide_title": "Company Letter Head", + "slide_type": "Action", + "submit_method": "create_letterhead" +} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json b/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json deleted file mode 100644 index 6357db09b1..0000000000 --- a/frappe/desk/setup_wizard_slide/company_logo_and_letter_head/company_logo_and_letter_head.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "add_more_button": 0, - "creation": "2019-11-13 16:03:01.422088", - "docstatus": 0, - "doctype": "Setup Wizard Slide", - "domains": [ - { - "domain": "Services" - }, - { - "domain": "Manufacturing" - }, - { - "domain": "Retail" - }, - { - "domain": "Distribution" - } - ], - "help_links": [], - "idx": 0, - "max_count": 0, - "modified": "2019-11-19 13:35:05.379455", - "modified_by": "Administrator", - "name": "Company Logo and Letter Head", - "owner": "Administrator", - "slide_fields": [ - { - "align": "center", - "fieldname": "attach_logo", - "fieldtype": "Attach Image", - "label": "Attach Logo", - "max_length": 0, - "max_value": 0, - "options": "image", - "reqd": 0 - }, - { - "align": "center", - "fieldname": "attach_letterhead", - "fieldtype": "Attach Image", - "label": "Attach Letterhead", - "max_length": 0, - "max_value": 0, - "options": "image", - "reqd": 0 - } - ], - "slide_title": "Company Logo and Letter Head" -} \ No newline at end of file diff --git a/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json index 78ae0e615c..0daeb51da0 100644 --- a/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json +++ b/frappe/desk/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json @@ -23,10 +23,10 @@ ], "help_links": [], "idx": 0, - "image_src": "/assets/erpnext/images/illustrations/handshake.png", + "image_src": "/assets/erpnext/images/illustrations/onboard.png", "max_count": 0, - "modified": "2019-11-21 12:31:45.856754", - "modified_by": "ruchamahabal2@gmail.com", + "modified": "2019-11-25 09:58:53.284461", + "modified_by": "Administrator", "name": "Welcome to ERPNext!", "owner": "Administrator", "slide_desc": "Setting up an ERP can be overwhelming. But don't worry, we have got your back!
\nLet's setup your company.\nThis wizard will help you onboard to ERPNext in a short time!", diff --git a/frappe/desk/user_progress.py b/frappe/desk/user_progress.py deleted file mode 100644 index f62bb2a29d..0000000000 --- a/frappe/desk/user_progress.py +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals - -import frappe -from frappe.utils import cint - -@frappe.whitelist() -def get_user_progress_slides(): - ''' - Return user progress slides for the desktop (called via `get_user_progress_slides` hook) - ''' - slides = [] - if cint(frappe.db.get_single_value('System Settings', 'setup_complete')): - for fn in frappe.get_hooks('get_user_progress_slides'): - slides += frappe.get_attr(fn)() - - return slides - -@frappe.whitelist() -def update_and_get_user_progress(): - ''' - Return setup progress action states (called via `update_and_get_user_progress` hook) - ''' - states = {} - for fn in frappe.get_hooks('update_and_get_user_progress'): - states.update(frappe.get_attr(fn)()) - - return states diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index 8e43be12ea..6ddf93df6a 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -1158,16 +1158,6 @@ input[type="checkbox"]:focus { color: #fff; border-color: #b1bdca; } -.user-progress-dialog .slides-progress { +.onboarding-dialog .slides-progress { margin-top: 15px; } -.user-progress-dialog .done-state .check-container { - font-size: 64px; - margin: 40px; -} -.user-progress-dialog .done-state .title { - font-weight: normal; -} -.user-progress-dialog .done-state .help-links a { - margin: 0px 10px; -} diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 75a17932ff..4f5c0027b4 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -88,9 +88,9 @@ frappe.Application = Class.extend({ } this.show_update_available(); - if (frappe.boot.is_first_startup) { - this.setup_onboarding_wizard(); - } + // if (frappe.boot.is_first_startup) { + this.setup_onboarding_wizard(); + // } if(frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) { frappe.ui.startup_setup_dialog.pre_show(); diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index c9f9896b8e..792080a0c7 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -11,52 +11,47 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { make() { super.make(); - this.$done_state = $(`
-
-
`).appendTo(this.$body); - if(this.help_links) { + this.$next_btn = this.slides_footer.find('.next-btn'); + this.$complete_btn = this.slides_footer.find('.complete-btn'); + this.$action_button = this.slides_footer.find('.next-btn') + if (this.help_links) { + this.$help_links = $(`
+
+
`).appendTo(this.$body); this.setup_help_links(); } } before_show() { - this.$action_button = this.slides_footer.find('.next-btn') - if (this.id === 0) { - this.$action_button.text(__('Start')); - } else { - this.$action_button.text(__('Next')); - } if (this.id === this.parent[0].children.length-1) { - this.slides_footer.find('.complete-btn').removeClass('hide').addClass('btn-primary action primary'); - this.slides_footer.find('.next-btn').removeClass('action primary'); - this.$action_button = this.slides_footer.find('.complete-btn') - } else { - this.slides_footer.find('.complete-btn').removeClass('btn-primary action primary').addClass('hide'); - this.slides_footer.find('.next-btn').addClass('action primary'); - this.$action_button = this.slides_footer.find('.next-btn') - } if (this.slide_type == 'Action') { - this.$action_button.addClass('primary'); - } else if (this.slide_type == 'Info') { - this.$action_button.removeClass('primary'); + (this.id === 0) ? + this.$next_btn.text(__('Start')) : this.$next_btn.text(__('Next')); + //last slide + if (this.id === this.parent[0].children.length-1) { + this.$complete_btn.removeClass('hide').addClass('action primary'); + this.$next_btn.removeClass('action primary'); + this.$action_button = this.$complete_btn; } + this.setup_action_button(); } primary_action() { let me = this; - if (me.set_values()) { - me.slides_footer.find('.primary').addClass('disabled'); + if (this.set_values()) { + this.$action_button.addClass('disabled'); + if (me.add_more) { + me.values.append('max_count', cint(me.max_count)); + } frappe.call({ method: me.submit_method, args: {args_data: me.values}, callback: function() { if (me.id === me.parent[0].children.length-1) { - if (me.slides_footer.find('.complete-btn').hasClass('primary')) { - $('.user-progress-dialog').modal('toggle'); - frappe.msgprint({ - message: __('You are all set up!'), - indicator: 'green', - title: __('Success') - }); - } + $('.onboarding-dialog').modal('toggle'); + frappe.msgprint({ + message: __('You are all set up!'), + indicator: 'green', + title: __('Success') + }); } }, onerror: function() { @@ -69,11 +64,10 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { unbind_primary_action() { // unbind only action method as next button is same as create button in this setup wizard - this.slides_footer.find('.action').off('click.primary_action'); + this.$action_button.off('click.primary_action'); } setup_help_links() { - let $help_links = this.$done_state.find('.help-links'); this.help_links.map(link => { let $link = $( `${link.label} @@ -86,9 +80,13 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { frappe.help.show_video(link.video_id, link.label); }) } - $help_links.append($link); + this.$help_links.append($link); }); - $('.help-links').append($help_links); + } + + setup_action_button() { + (this.slide_type == 'Action') ? + this.$action_button.addClass('primary') : this.$action_button.removeClass('primary'); } }; @@ -102,7 +100,7 @@ frappe.setup.OnboardingDialog = class OnboardingDialog { setup() { this.dialog = new frappe.ui.Dialog({title: __("Let's Onboard!")}); - this.$wrapper = $(this.dialog.$wrapper).addClass('user-progress-dialog'); + this.$wrapper = $(this.dialog.$wrapper).addClass('onboarding-dialog'); this.slide_container = new frappe.ui.Slides({ parent: this.dialog.body, slides: this.slides, @@ -112,12 +110,16 @@ frappe.setup.OnboardingDialog = class OnboardingDialog { $footer.find('.prev-btn').addClass('hide'); $footer.find('.next-btn').removeClass('btn-default').addClass('btn-primary action'); $footer.find('.text-right').prepend( - $(` + $(` ${__("Complete")}`)); } }); - this.$wrapper.find('.modal-title').prepend(``); + this.$wrapper.find('.modal-title').prepend( + ` + + ` + ); } show() { diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 88761aab99..d8f5a141f4 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -959,8 +959,8 @@ input[type="checkbox"] { } } -// User Progress Dialog -.user-progress-dialog { +// Onboarding Dialog +.onboarding-dialog { .modal-dialog { width: 50%; @@ -979,26 +979,13 @@ input[type="checkbox"] { bottom: 0; } - .slides-progress { - margin-top: 15px; + img { + max-width: 128px; + max-height: 128px; } - .done-state { - .check-container { - font-size: 64px; - margin: 40px; - } - - .title { - font-weight: normal; - } - - .help-links { - - a { - margin: 0px 10px; - } - } + .slides-progress { + margin-top: 15px; } } From 3da534546d44895951cd4661843ce6188cb19543 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 25 Nov 2019 12:06:46 +0530 Subject: [PATCH 097/226] fix: show setup wizard on first startup --- frappe/public/js/frappe/desk.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 4f5c0027b4..75a17932ff 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -88,9 +88,9 @@ frappe.Application = Class.extend({ } this.show_update_available(); - // if (frappe.boot.is_first_startup) { - this.setup_onboarding_wizard(); - // } + if (frappe.boot.is_first_startup) { + this.setup_onboarding_wizard(); + } if(frappe.ui.startup_setup_dialog && !frappe.boot.setup_complete) { frappe.ui.startup_setup_dialog.pre_show(); From b5e7ce06628689cd1fd46fb9d98edeeb4a89b846 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 25 Nov 2019 12:09:09 +0530 Subject: [PATCH 098/226] feat: allow changing empty_state --- frappe/public/js/frappe/list/list_view.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 5620469f8a..5bc00ddd97 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -302,12 +302,13 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { } get_documentation_link() { - let find_url = this.meta.description.match("url:[^ ]*"); - if (find_url) { - let link = find_url[0].split("url:")[1] - return `Need Help?` + if (this.meta.description) { + let find_url = this.meta.description.match("url:[^ ]*"); + if (find_url) { + let link = find_url[0].split("url:")[1] + return `Need Help?` + } } - return '' } @@ -315,6 +316,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { let help_link = this.get_documentation_link() let no_result_message = this.filters.length ? __('No {0} found', [__(this.doctype)]) : __('You haven\'t created a {0} yet', [__(this.doctype)]); let new_button_label = this.filters.length ? __('Create a new {0}', [__(this.doctype)]) : __('Create your first {0}', [__(this.doctype)]); + let empty_state_image = this.settings.empty_state_image || '/assets/frappe/images/ui-states/empty.png' const new_button = this.can_create ? `

-
  • {{__('No user found')}}
    • From c7ed4342c05a3d796ce40cc4cdb67c010ae6890c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 27 Nov 2019 08:59:58 +0530 Subject: [PATCH 130/226] fix: Move user-avatar style changes under .recent-item class So that it does not mess up other user-avatars --- frappe/public/less/notifications.less | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/frappe/public/less/notifications.less b/frappe/public/less/notifications.less index 7a49709d16..52e1c07f1e 100644 --- a/frappe/public/less/notifications.less +++ b/frappe/public/less/notifications.less @@ -33,7 +33,7 @@ } .category-list[data-category="Open Documents"] li a:hover { - background-color: #f0f4f7; + background-color: #f0f4f7; } .open-doc-count { @@ -70,7 +70,7 @@ } a.recent-item:hover { - background-color: #f0f4f7; + background-color: #f0f4f7; } a.unread:hover .mark-read { @@ -102,17 +102,19 @@ a.unread:hover .mark-read { background: @light-yellow; } -.notification-timestamp { - margin-top: 5px; - font-size: 11px; - display: inline-block; - margin-bottom: 10px; -} +.recent-item { + .notification-timestamp { + margin-top: 5px; + font-size: 11px; + display: inline-block; + margin-bottom: 10px; + } -.user-avatar { - float: left; - margin-right: 10px; - margin-bottom: 30px; + .user-avatar { + float: left; + margin-right: 10px; + margin-bottom: 30px; + } } .event-time { From 62ad8c3fff6aa1f119d76a6b9799b6294bb9238b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 27 Nov 2019 09:02:57 +0530 Subject: [PATCH 131/226] fix: Show a fallback image if image set is invalid --- frappe/public/js/frappe/ui/toolbar/search.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/toolbar/search.js b/frappe/public/js/frappe/ui/toolbar/search.js index acc623fa20..042eefc316 100644 --- a/frappe/public/js/frappe/ui/toolbar/search.js +++ b/frappe/public/js/frappe/ui/toolbar/search.js @@ -302,10 +302,16 @@ frappe.search.SearchDialog = Class.extend({ return link; } - if(result.image) { - $result.append('
    ' + result.label + '
    '); + if (result.image) { + $result.append(` +
    + ${result.label} +
    +     `); } else if (result.image === null) { $result.append('
    ' From 15a662a4b6a7f14f597e660d73cbbc2f07723381 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 27 Nov 2019 09:53:41 +0530 Subject: [PATCH 132/226] fix: Reivew pill font size --- frappe/public/less/sidebar.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less index 985a2b1edb..61d47712f3 100644 --- a/frappe/public/less/sidebar.less +++ b/frappe/public/less/sidebar.less @@ -450,7 +450,7 @@ body[data-route^="Module"] .main-menu { flex-basis: 50%; text-align: center; align-self: center; - font-size: @text-small; + font-size: 9px; } cursor: pointer; } From 0b415b3a49fed65c2b3cc1e226b51d58aed75986 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 27 Nov 2019 11:55:34 +0530 Subject: [PATCH 133/226] fix: set onboarding dialog as static --- .../welcome_to_erpnext!.json | 20 ------------------- .../company_letter_head.json | 2 +- frappe/public/build.json | 1 + .../public/js/frappe/ui/onboarding_dialog.js | 6 +++++- 4 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 frappe/core/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json diff --git a/frappe/core/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json b/frappe/core/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json deleted file mode 100644 index 4fae510282..0000000000 --- a/frappe/core/setup_wizard_slide/welcome_to_erpnext!/welcome_to_erpnext!.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "add_more_button": 0, - "app": "Frappe", - "creation": "2019-11-26 16:59:48.315297", - "docstatus": 0, - "doctype": "Setup Wizard Slide", - "domains": [], - "help_links": [], - "idx": 0, - "max_count": 3, - "modified": "2019-11-26 17:00:49.350931", - "modified_by": "Administrator", - "name": "Welcome to ERPNext!", - "owner": "Administrator", - "slide_fields": [], - "slide_module": "Core", - "slide_order": 0, - "slide_title": "Welcome to ERPNext!", - "slide_type": "Information" -} \ No newline at end of file diff --git a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json index 51fcccd5ff..3644a54089 100644 --- a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json +++ b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json @@ -14,7 +14,7 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/letterhead.png", "max_count": 0, - "modified": "2019-11-26 18:21:01.509703", + "modified": "2019-11-27 11:39:56.213373", "modified_by": "Administrator", "name": "Company Letter Head", "owner": "Administrator", diff --git a/frappe/public/build.json b/frappe/public/build.json index ddca0bbc7e..f0db49ef3f 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -145,6 +145,7 @@ "public/js/frappe/ui/page.html", "public/js/frappe/ui/page.js", "public/js/frappe/ui/slides.js", + "public/js/frappe/ui/onboarding_dialog.js", "public/js/frappe/ui/find.js", "public/js/frappe/ui/iconbar.js", "public/js/frappe/form/layout.js", diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index 0b9ecfaeb7..1798d0fe68 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -106,7 +106,11 @@ frappe.setup.OnboardingDialog = class OnboardingDialog { } setup() { - this.dialog = new frappe.ui.Dialog({title: __("Let's Onboard!")}); + this.dialog = new frappe.ui.Dialog({ + static: true, + minimizable: false, + title: __("Let's Onboard!") + }); this.$wrapper = $(this.dialog.$wrapper).addClass('onboarding-dialog'); this.slide_container = new frappe.ui.Slides({ parent: this.dialog.body, From 633e2b546cb9c16f72e4ac216e4cb65ef2be0b16 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 27 Nov 2019 12:59:50 +0530 Subject: [PATCH 134/226] fix: do not pop item from list --- frappe/utils/global_search.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 7c38298dc3..c127a55619 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -477,7 +477,6 @@ def search(text, start=0, limit=20, doctype=""): frappe.clear_messages() sorted_results.extend([r]) - results.pop(index) return sorted_results or results From 7f82ee873ef5c4e62c033a2b37d0bef99dc47f04 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 27 Nov 2019 14:08:45 +0530 Subject: [PATCH 135/226] fix: dont add index for global search doctype --- .../doctype/global_search_doctype/global_search_doctype.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/global_search_doctype/global_search_doctype.py b/frappe/desk/doctype/global_search_doctype/global_search_doctype.py index bf3b4d3040..4c9a948278 100644 --- a/frappe/desk/doctype/global_search_doctype/global_search_doctype.py +++ b/frappe/desk/doctype/global_search_doctype/global_search_doctype.py @@ -3,10 +3,8 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe +# import frappe from frappe.model.document import Document class GlobalSearchDocType(Document): - - def on_doctype_update(): - frappe.db.add_index("Global Search DocType", ["document_type"]) + pass From 86ff0a635412beb5f9e3e52db5047ff5265cf4cc Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 27 Nov 2019 14:12:44 +0530 Subject: [PATCH 136/226] fix: list view group by filter ambiguous column name --- frappe/desk/listview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/listview.py b/frappe/desk/listview.py index fd0833eb51..e7f56d313e 100644 --- a/frappe/desk/listview.py +++ b/frappe/desk/listview.py @@ -48,7 +48,7 @@ def get_group_by_count(doctype, current_filters, field): else: return frappe.db.get_list(doctype, filters=current_filters, - group_by=field, + group_by='`tab{0}`.{1}'.format(doctype, field), fields=['count(*) as count', '`{}` as name'.format(field)], order_by='count desc', limit=50, From 7daa6736f645cc13682e35f622b51cd67d0c6f3d Mon Sep 17 00:00:00 2001 From: gavin Date: Wed, 27 Nov 2019 20:37:19 +0530 Subject: [PATCH 137/226] chore(deps): [security] bump markdown2 from 2.3.5 to 2.3.6 redo https://github.com/frappe/frappe/pull/8811 after merging https://github.com/frappe/frappe/pull/8823 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dcfaac89ec..c824cdeeee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ gunicorn==19.9.0 html2text==2016.9.19 ipython==5.8.0 Jinja2==2.10.3 -markdown2==2.3.5 +markdown2==2.3.6 maxminddb-geolite2==2018.703 ndg-httpsclient==0.5.1 num2words==0.5.5 From 9b4cd4a3898624d8007102c01a2e806f791f5683 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 28 Nov 2019 12:17:41 +0530 Subject: [PATCH 138/226] fix: Pass prepared_report_name as filter if exists --- .../js/frappe/views/reports/query_report.js | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 560cb3d17b..a7505ff8f3 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -293,6 +293,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.last_ajax.abort(); } + const query_params = this.get_query_params(); + + if (query_params.prepared_report_name) { + filters.prepared_report_name = query_params.prepared_report_name; + } + return new Promise(resolve => { this.last_ajax = frappe.call({ method: 'frappe.desk.query_report.run', @@ -303,7 +309,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { }, callback: resolve, always: () => this.page.btn_secondary.prop('disabled', false) - }) + }); }).then(r => { let data = r.message; this.hide_status(); @@ -313,18 +319,18 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { if (data.prepared_report) { this.prepared_report = true; - const query_string = frappe.utils.get_query_string(frappe.get_route_str()); - const query_params = frappe.utils.get_query_params(query_string); // If query_string contains prepared_report_name then set filters // to match the mentioned prepared report doc and disable editing - if(query_params.prepared_report_name) { + if (query_params.prepared_report_name) { this.prepared_report_action = "Edit"; const filters_from_report = JSON.parse(data.doc.filters); Object.values(this.filters).forEach(function(field) { if (filters_from_report[field.fieldname]) { field.set_input(filters_from_report[field.fieldname]); } - field.input.disabled = true; + if (field.input) { + field.input.disabled = true; + } }); } this.add_prepared_report_buttons(data.doc); @@ -357,6 +363,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { }); } + get_query_params() { + const query_string = frappe.utils.get_query_string(frappe.get_route_str()); + const query_params = frappe.utils.get_query_params(query_string); + return query_params; + } + add_prepared_report_buttons(doc) { if(doc){ this.page.add_inner_button(__("Download Report"), function (){ From 29c0772449ddab658488e2665ae2a23582330b79 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 28 Nov 2019 12:32:34 +0530 Subject: [PATCH 139/226] fix: Add input to multiselect_list control --- frappe/public/js/frappe/form/controls/multiselect_list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js index 0313ee70d7..3e8dc21dca 100644 --- a/frappe/public/js/frappe/form/controls/multiselect_list.js +++ b/frappe/public/js/frappe/form/controls/multiselect_list.js @@ -17,6 +17,7 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({ this.$list_wrapper = $(template); this.$input = $(''); + this.input = this.$input.get(0); this.$list_wrapper.prependTo(this.input_area); this.$filter_input = this.$list_wrapper.find('input'); this.$list_wrapper.on('click', '.dropdown-menu', e => { From acae06a36ab62e296787a2d0b71725c81a20f955 Mon Sep 17 00:00:00 2001 From: Shridhar Date: Thu, 28 Nov 2019 16:13:20 +0530 Subject: [PATCH 140/226] case insensitive search for postgres --- frappe/model/db_query.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index b7feee82f4..41a186688b 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -513,6 +513,8 @@ class DatabaseQuery(object): or not can_be_null or (f.value and f.operator.lower() in ('=', 'like')) or 'ifnull(' in column_name.lower()): + if f.operator == 'like' and frappe.conf.get('db_type') == 'postgres': + f.operator = 'ilike' condition = '{column_name} {operator} {value}'.format( column_name=column_name, operator=f.operator, value=value) From bbd99139adcccbde6b7ca43c1430e01185fa7ec5 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 Nov 2019 16:32:20 +0530 Subject: [PATCH 141/226] fix: Add CSS highlighting to Custom CSS field --- .../doctype/print_format/print_format.json | 1126 ++++------------- 1 file changed, 222 insertions(+), 904 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index a5d41ee099..951a863776 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -1,905 +1,223 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 1, - "autoname": "Prompt", - "beta": 0, - "creation": "2013-01-23 19:54:43", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "editable_grid": 0, - "engine": "InnoDB", - "fields": [ - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "description": "", - "fetch_if_empty": 0, - "fieldname": "doc_type", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 1, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "DocType", - "length": 0, - "no_copy": 0, - "options": "DocType", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "module", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Module", - "length": 0, - "no_copy": 0, - "options": "Module Def", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "disabled", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Disabled", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "No", - "fetch_if_empty": 0, - "fieldname": "standard", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 1, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Standard", - "length": 0, - "no_copy": 1, - "oldfieldname": "standard", - "oldfieldtype": "Select", - "options": "No\nYes", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 1, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "custom_format", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Custom Format", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "custom_format", - "fetch_if_empty": 0, - "fieldname": "section_break_6", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Jinja", - "depends_on": "custom_format", - "description": "", - "fetch_if_empty": 0, - "fieldname": "print_format_type", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Print Format Type", - "length": 0, - "no_copy": 0, - "options": "Jinja\nJS", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "", - "fetch_if_empty": 0, - "fieldname": "raw_printing", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Raw Printing", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.raw_printing", - "fetch_if_empty": 0, - "fieldname": "html", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "HTML", - "length": 0, - "no_copy": 0, - "oldfieldname": "html", - "oldfieldtype": "Text Editor", - "options": "HTML", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "raw_printing", - "description": "Any string-based printer languages can be used. Writing raw commands requires knowledge of the printer's native language provided by the printer manufacturer. Please refer to the developer manual provided by the printer manufacturer on how to write their native commands. These commands are rendered on the server side using the Jinja Templating Language.", - "fetch_if_empty": 0, - "fieldname": "raw_commands", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Raw Commands", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.custom_format", - "fetch_if_empty": 0, - "fieldname": "section_break_9", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Style Settings", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fetch_if_empty": 0, - "fieldname": "align_labels_right", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Align Labels to the Right", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fetch_if_empty": 0, - "fieldname": "show_section_headings", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Show Section Headings", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fetch_if_empty": 0, - "fieldname": "line_breaks", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Show Line Breaks after Sections", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "column_break_11", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "default_print_language", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Default Print Language", - "length": 0, - "no_copy": 0, - "options": "Language", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Default", - "depends_on": "eval:!doc.custom_format", - "fetch_if_empty": 0, - "fieldname": "font", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Font", - "length": 0, - "no_copy": 0, - "options": "Default\nArial\nHelvetica\nVerdana\nMonospace", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "eval:!doc.raw_printing", - "fetch_if_empty": 0, - "fieldname": "css_section", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "css", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Custom CSS", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "custom_html_help", - "fieldtype": "HTML", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Custom HTML Help", - "length": 0, - "no_copy": 0, - "options": "

    Custom CSS Help

    \n\n

    Notes:

    \n\n
      \n
    1. All field groups (label + value) are set attributes data-fieldtype and data-fieldname
      2. \n
    2. All values are given class value
      3. \n
    3. All Section Breaks are given class section-break
      4. \n
    4. All Column Breaks are given class column-break
      5. \n
    \n\n

    Examples

    \n\n

    1. Left align integers

    \n\n
    [data-fieldtype=\"Int\"] .value { text-left: left; }
    \n\n

    1. Add border to sections except the last section

    \n\n
    .section-break { padding: 30px 0px; border-bottom: 1px solid #eee; }\n.section-break:last-child { padding-bottom: 0px; border-bottom: 0px;  }
    \n", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "custom_format", - "fetch_if_empty": 0, - "fieldname": "section_break_13", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "depends_on": "custom_format", - "fetch_if_empty": 0, - "fieldname": "print_format_help", - "fieldtype": "HTML", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Print Format Help", - "length": 0, - "no_copy": 0, - "options": "

    Print Format Help

    \n
    \n

    Introduction

    \n

    Print itemsFormats are rendered on the server side using the Jinja Templating Language. All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.

    \n

    For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.

    \n
    \n

    References

    \n
      \n\t
    1. Jinja Tempalting Language: Reference
      2. \n\t
    2. Bootstrap CSS Framework
      3. \n
    \n
    \n

    Example

    \n
    <h3>{{ doc.select_print_heading or \"Invoice\" }}</h3>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Customer Name</div>\n\t<div class=\"col-md-9\">{{ doc.customer_name }}</div>\n</div>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Date</div>\n\t<div class=\"col-md-9\">{{ doc.get_formatted(\"invoice_date\") }}</div>\n</div>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<th>Sr</th>\n\t\t\t<th>Item Name</th>\n\t\t\t<th>Description</th>\n\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t<th class=\"text-right\">Amount</th>\n\t\t</tr>\n\t\t{%- for row in doc.items -%}\n\t\t<tr>\n\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t</td>\n\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>
    \n
    \n

    Common Functions

    \n\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\n
    doc.get_formatted(\"[fieldname]\", [parent_doc])Get document value formatted as Date, Currency etc. Pass parent doc for curreny type fields.
    frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
    \n", - "permlevel": 0, - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "format_data", - "fieldtype": "Code", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Format Data", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, - { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "print_format_builder", - "fieldtype": "Check", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Print Format Builder", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - } - ], - "has_web_view": 0, - "hide_toolbar": 0, - "icon": "fa fa-print", - "idx": 1, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "menu_index": 0, - "modified": "2019-06-05 12:45:25.869180", - "modified_by": "Administrator", - "module": "Printing", - "name": "Print Format", - "owner": "Administrator", - "permissions": [ - { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 1 - } - ], - "quick_entry": 0, - "read_only": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 - } \ No newline at end of file + "allow_rename": 1, + "autoname": "Prompt", + "creation": "2013-01-23 19:54:43", + "doctype": "DocType", + "engine": "InnoDB", + "field_order": [ + "doc_type", + "module", + "disabled", + "column_break_3", + "standard", + "custom_format", + "section_break_6", + "print_format_type", + "raw_printing", + "html", + "raw_commands", + "section_break_9", + "align_labels_right", + "show_section_headings", + "line_breaks", + "column_break_11", + "default_print_language", + "font", + "css_section", + "css", + "custom_html_help", + "section_break_13", + "print_format_help", + "format_data", + "print_format_builder" + ], + "fields": [ + { + "fieldname": "doc_type", + "fieldtype": "Link", + "in_filter": 1, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "DocType", + "options": "DocType", + "reqd": 1 + }, + { + "fieldname": "module", + "fieldtype": "Link", + "label": "Module", + "options": "Module Def" + }, + { + "default": "0", + "fieldname": "disabled", + "fieldtype": "Check", + "label": "Disabled" + }, + { + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, + { + "default": "No", + "fieldname": "standard", + "fieldtype": "Select", + "in_filter": 1, + "label": "Standard", + "no_copy": 1, + "oldfieldname": "standard", + "oldfieldtype": "Select", + "options": "No\nYes", + "reqd": 1, + "search_index": 1 + }, + { + "default": "0", + "fieldname": "custom_format", + "fieldtype": "Check", + "label": "Custom Format" + }, + { + "depends_on": "custom_format", + "fieldname": "section_break_6", + "fieldtype": "Section Break" + }, + { + "default": "Jinja", + "depends_on": "custom_format", + "fieldname": "print_format_type", + "fieldtype": "Select", + "label": "Print Format Type", + "options": "Jinja\nJS" + }, + { + "default": "0", + "fieldname": "raw_printing", + "fieldtype": "Check", + "label": "Raw Printing" + }, + { + "depends_on": "eval:!doc.raw_printing", + "fieldname": "html", + "fieldtype": "Code", + "label": "HTML", + "oldfieldname": "html", + "oldfieldtype": "Text Editor", + "options": "HTML" + }, + { + "depends_on": "raw_printing", + "description": "Any string-based printer languages can be used. Writing raw commands requires knowledge of the printer's native language provided by the printer manufacturer. Please refer to the developer manual provided by the printer manufacturer on how to write their native commands. These commands are rendered on the server side using the Jinja Templating Language.", + "fieldname": "raw_commands", + "fieldtype": "Code", + "label": "Raw Commands" + }, + { + "depends_on": "eval:!doc.custom_format", + "fieldname": "section_break_9", + "fieldtype": "Section Break", + "label": "Style Settings" + }, + { + "default": "0", + "fieldname": "align_labels_right", + "fieldtype": "Check", + "label": "Align Labels to the Right" + }, + { + "default": "0", + "fieldname": "show_section_headings", + "fieldtype": "Check", + "label": "Show Section Headings" + }, + { + "default": "0", + "fieldname": "line_breaks", + "fieldtype": "Check", + "label": "Show Line Breaks after Sections" + }, + { + "fieldname": "column_break_11", + "fieldtype": "Column Break" + }, + { + "fieldname": "default_print_language", + "fieldtype": "Link", + "label": "Default Print Language", + "options": "Language" + }, + { + "default": "Default", + "depends_on": "eval:!doc.custom_format", + "fieldname": "font", + "fieldtype": "Select", + "label": "Font", + "options": "Default\nArial\nHelvetica\nVerdana\nMonospace" + }, + { + "depends_on": "eval:!doc.raw_printing", + "fieldname": "css_section", + "fieldtype": "Section Break" + }, + { + "fieldname": "css", + "fieldtype": "Code", + "label": "Custom CSS", + "options": "CSS" + }, + { + "fieldname": "custom_html_help", + "fieldtype": "HTML", + "label": "Custom HTML Help", + "options": "

    Custom CSS Help

    \n\n

    Notes:

    \n\n
      \n
    1. All field groups (label + value) are set attributes data-fieldtype and data-fieldname
      2. \n
    2. All values are given class value
      3. \n
    3. All Section Breaks are given class section-break
      4. \n
    4. All Column Breaks are given class column-break
      5. \n
    \n\n

    Examples

    \n\n

    1. Left align integers

    \n\n
    [data-fieldtype=\"Int\"] .value { text-left: left; }
    \n\n

    1. Add border to sections except the last section

    \n\n
    .section-break { padding: 30px 0px; border-bottom: 1px solid #eee; }\n.section-break:last-child { padding-bottom: 0px; border-bottom: 0px;  }
    \n" + }, + { + "depends_on": "custom_format", + "fieldname": "section_break_13", + "fieldtype": "Section Break" + }, + { + "depends_on": "custom_format", + "fieldname": "print_format_help", + "fieldtype": "HTML", + "label": "Print Format Help", + "options": "

    Print Format Help

    \n
    \n

    Introduction

    \n

    Print itemsFormats are rendered on the server side using the Jinja Templating Language. All forms have access to the doc object which contains information about the document that is being formatted. You can also access common utilities via the frappe module.

    \n

    For styling, the Boostrap CSS framework is provided and you can enjoy the full range of classes.

    \n
    \n

    References

    \n
      \n\t
    1. Jinja Tempalting Language: Reference
      2. \n\t
    2. Bootstrap CSS Framework
      3. \n
    \n
    \n

    Example

    \n
    <h3>{{ doc.select_print_heading or \"Invoice\" }}</h3>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Customer Name</div>\n\t<div class=\"col-md-9\">{{ doc.customer_name }}</div>\n</div>\n<div class=\"row\">\n\t<div class=\"col-md-3 text-right\">Date</div>\n\t<div class=\"col-md-9\">{{ doc.get_formatted(\"invoice_date\") }}</div>\n</div>\n<table class=\"table table-bordered\">\n\t<tbody>\n\t\t<tr>\n\t\t\t<th>Sr</th>\n\t\t\t<th>Item Name</th>\n\t\t\t<th>Description</th>\n\t\t\t<th class=\"text-right\">Qty</th>\n\t\t\t<th class=\"text-right\">Rate</th>\n\t\t\t<th class=\"text-right\">Amount</th>\n\t\t</tr>\n\t\t{%- for row in doc.items -%}\n\t\t<tr>\n\t\t\t<td style=\"width: 3%;\">{{ row.idx }}</td>\n\t\t\t<td style=\"width: 20%;\">\n\t\t\t\t{{ row.item_name }}\n\t\t\t\t{% if row.item_code != row.item_name -%}\n\t\t\t\t<br>Item Code: {{ row.item_code}}\n\t\t\t\t{%- endif %}\n\t\t\t</td>\n\t\t\t<td style=\"width: 37%;\">\n\t\t\t\t<div style=\"border: 0px;\">{{ row.description }}</div></td>\n\t\t\t<td style=\"width: 10%; text-align: right;\">{{ row.qty }} {{ row.uom or row.stock_uom }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"rate\", doc) }}</td>\n\t\t\t<td style=\"width: 15%; text-align: right;\">{{\n\t\t\t\trow.get_formatted(\"amount\", doc) }}</td>\n\t\t</tr>\n\t\t{%- endfor -%}\n\t</tbody>\n</table>
    \n
    \n

    Common Functions

    \n\n\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\n
    doc.get_formatted(\"[fieldname]\", [parent_doc])Get document value formatted as Date, Currency etc. Pass parent doc for curreny type fields.
    frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
    \n" + }, + { + "fieldname": "format_data", + "fieldtype": "Code", + "hidden": 1, + "label": "Format Data" + }, + { + "default": "0", + "fieldname": "print_format_builder", + "fieldtype": "Check", + "hidden": 1, + "label": "Print Format Builder" + } + ], + "icon": "fa fa-print", + "idx": 1, + "modified": "2019-11-28 12:40:40.364699", + "modified_by": "faris@erpnext.com", + "module": "Printing", + "name": "Print Format", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file From 45138df076ab1be7fb276bc0d4a3c6a4f7c09e1a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 Nov 2019 16:32:37 +0530 Subject: [PATCH 142/226] fix: Add syntax highlighting to Edit HTML dialog --- .../printing/page/print_format_builder/print_format_builder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js index 8605fb762e..f9bb524d54 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -695,7 +695,8 @@ frappe.PrintFormatBuilder = Class.extend({ { fieldname: "content", fieldtype: "Code", - label: label + label: label, + options: "HTML" }, { fieldname: "help", From 6a0d8f306d64b3dd27232e6f17beacf178f65294 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 Nov 2019 16:33:34 +0530 Subject: [PATCH 143/226] feat: Add Refresh button to Print Format selector --- frappe/public/js/frappe/form/print.js | 7 +++++++ .../js/frappe/form/templates/print_layout.html | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/print.js b/frappe/public/js/frappe/form/print.js index eb9c0240f5..eb1b1464a7 100644 --- a/frappe/public/js/frappe/form/print.js +++ b/frappe/public/js/frappe/form/print.js @@ -43,6 +43,13 @@ frappe.ui.form.PrintPreview = Class.extend({ me.multilingual_preview(); }); + this.wrapper + .find(".print-preview-refresh") + .on("click", function () { + me.set_default_print_language(); + me.multilingual_preview(); + }); + //On selection of language get code and pass it to preview method this.language_sel = this.wrapper .find(".languages") diff --git a/frappe/public/js/frappe/form/templates/print_layout.html b/frappe/public/js/frappe/form/templates/print_layout.html index 9bdba0d99d..b9eaf86665 100644 --- a/frappe/public/js/frappe/form/templates/print_layout.html +++ b/frappe/public/js/frappe/form/templates/print_layout.html @@ -1,7 +1,13 @@
    -
    -
    +
    +
    + + + + +
    +
    @@ -12,7 +18,7 @@ {%= __("Letter Head") %}
    -
    +
    From ae0bf912c7873ac67697673122ac74c8fedd3d1e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 28 Nov 2019 16:34:41 +0530 Subject: [PATCH 144/226] fix: Add label to standard print format sections data-label is now added to each section so they can be targeted via CSS --- frappe/templates/print_formats/standard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/print_formats/standard.html b/frappe/templates/print_formats/standard.html index 5e707cddcb..77b8f09bb7 100644 --- a/frappe/templates/print_formats/standard.html +++ b/frappe/templates/print_formats/standard.html @@ -21,7 +21,7 @@ {% endif %} {% for section in page %} -
    +
    {%- if doc.print_line_breaks and loop.index != 1 -%}
    {%- endif -%} {%- if doc.print_section_headings and section.label and section.has_data -%}

    {{ _(section.label) }}

    From 44c7f08ccf205d86338a86daebfbf4b377f050d7 Mon Sep 17 00:00:00 2001 From: Shridhar Date: Thu, 28 Nov 2019 18:07:14 +0530 Subject: [PATCH 145/226] convert operator to lowercase while checking --- frappe/model/db_query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 41a186688b..64e242d6af 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -513,7 +513,7 @@ class DatabaseQuery(object): or not can_be_null or (f.value and f.operator.lower() in ('=', 'like')) or 'ifnull(' in column_name.lower()): - if f.operator == 'like' and frappe.conf.get('db_type') == 'postgres': + if f.operator.lower() == 'like' and frappe.conf.get('db_type') == 'postgres': f.operator = 'ilike' condition = '{column_name} {operator} {value}'.format( column_name=column_name, operator=f.operator, From 29fcd291b194df2ff235daf984184ec8161945e6 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 29 Nov 2019 13:18:48 +0530 Subject: [PATCH 146/226] fix(reportview): convert to unicode conditionally fixes TypeError: decoding str is not supported Traceback (most recent call last): File "/home/frappe/frappe-bench/apps/frappe/frappe/app.py", line 57, in application response = frappe.handler.handle() File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 22, in handle data = execute_cmd(cmd) File "/home/frappe/frappe-bench/apps/frappe/frappe/handler.py", line 61, in execute_cmd return frappe.call(method, **frappe.form_dict) File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 1038, in call return fn(*args, **newargs) File "/home/frappe/frappe-bench/apps/frappe/frappe/__init__.py", line 511, in wrapper_fn retval = fn(*args, **get_newargs(fn, kwargs)) File "/home/frappe/frappe-bench/apps/frappe/frappe/desk/reportview.py", line 177, in export_query frappe.response['result'] = text_type(f.read(), 'utf-8') TypeError: decoding str is not supported Signed-off-by: Chinmay D. Pai --- frappe/desk/reportview.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 937285206e..2a816293fb 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -9,8 +9,10 @@ from six.moves import range import frappe.permissions from frappe.model.db_query import DatabaseQuery from frappe import _ -from six import text_type, string_types, StringIO +from six import string_types, StringIO from frappe.core.doctype.access_log.access_log import make_access_log +from frappe.utils import cstr + @frappe.whitelist() @frappe.read_only() @@ -174,7 +176,7 @@ def export_query(): if isinstance(v, string_types) else v for v in r]) f.seek(0) - frappe.response['result'] = text_type(f.read(), 'utf-8') + frappe.response['result'] = cstr(f.read()) frappe.response['type'] = 'csv' frappe.response['doctype'] = title From 649759fc3f92fba93bfb2e743084144dd723f201 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 29 Nov 2019 14:56:37 +0530 Subject: [PATCH 147/226] fix: Default and company address fixes --- frappe/contacts/doctype/address/address.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py index 21ed88addb..40b5f55fa6 100644 --- a/frappe/contacts/doctype/address/address.py +++ b/frappe/contacts/doctype/address/address.py @@ -60,10 +60,6 @@ class Address(Document): if not [row for row in self.links if row.link_doctype == "Company"]: frappe.throw(_("Company is mandatory, as it is your company address")) - # removing other links - to_remove = [row for row in self.links if row.link_doctype != "Company"] - [ self.remove(row) for row in to_remove ] - def get_display(self): return get_address_display(self.as_dict()) @@ -81,7 +77,7 @@ class Address(Document): return False @frappe.whitelist() -def get_default_address(doctype, name, sort_key='is_primary_address'): +def get_default_address(doctype, name, sort_key='is_primary_address', existing_address=None): '''Returns default Address name for the given doctype, name''' if sort_key not in ['is_shipping_address', 'is_primary_address']: return None @@ -95,6 +91,10 @@ def get_default_address(doctype, name, sort_key='is_primary_address'): dl.link_name = %s and ifnull(addr.disabled, 0) = 0 """ %(sort_key, '%s', '%s'), (doctype, name)) + if existing_address: + if existing_address in [d[0] for d in out]: + return existing_address + if out: return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(y[1], x[1])))[0][0] else: From 56b038584157911df8d058fd711d5c0665d94800 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 29 Nov 2019 16:25:31 +0530 Subject: [PATCH 148/226] chore: remove useless encode Signed-off-by: Chinmay D. Pai --- frappe/desk/reportview.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 2a816293fb..5db6ae18bf 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -172,7 +172,7 @@ def export_query(): writer = csv.writer(f) for r in data: # encode only unicode type strings and not int, floats etc. - writer.writerow([handle_html(frappe.as_unicode(v)).encode('utf-8') \ + writer.writerow([handle_html(frappe.as_unicode(v)) \ if isinstance(v, string_types) else v for v in r]) f.seek(0) From 1a17c25ca49c30d6fb3fab10c0aa62eee08ad8e5 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 29 Nov 2019 17:00:53 +0530 Subject: [PATCH 149/226] fix: Allow Rename in Website Route Meta --- .../website_route_meta.json | 70 +++---------------- 1 file changed, 8 insertions(+), 62 deletions(-) diff --git a/frappe/website/doctype/website_route_meta/website_route_meta.json b/frappe/website/doctype/website_route_meta/website_route_meta.json index 1ca6a70fa0..bcaee8c8b0 100644 --- a/frappe/website/doctype/website_route_meta/website_route_meta.json +++ b/frappe/website/doctype/website_route_meta/website_route_meta.json @@ -1,97 +1,43 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, + "allow_rename": 1, "autoname": "Prompt", - "beta": 0, "creation": "2019-02-16 17:37:27.918909", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "meta_tags" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "meta_tags", "fieldtype": "Table", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Meta Tags", - "length": 0, - "no_copy": 0, "options": "Website Meta Tag", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "reqd": 1 } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2019-02-16 17:37:27.918909", - "modified_by": "Administrator", + "modified": "2019-11-28 17:26:49.068372", + "modified_by": "faris@erpnext.com", "module": "Website", "name": "Website Route Meta", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "System Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 } ], "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + "track_changes": 1 } \ No newline at end of file From 598deb7c4ac6278985d8d42b7b0bfe5ddb02e7ce Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 29 Nov 2019 17:01:02 +0530 Subject: [PATCH 150/226] fix: Add Visit Web Page button in form --- .../doctype/website_route_meta/website_route_meta.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/website/doctype/website_route_meta/website_route_meta.js b/frappe/website/doctype/website_route_meta/website_route_meta.js index f13963e14f..0e41e92b8e 100644 --- a/frappe/website/doctype/website_route_meta/website_route_meta.js +++ b/frappe/website/doctype/website_route_meta/website_route_meta.js @@ -4,5 +4,12 @@ frappe.ui.form.on('Website Route Meta', { refresh: function(frm) { frm.get_field('__newname').set_label('Route'); + frm.add_custom_button(__('Visit Web Page'), () => { + let route = frm.doc.name; + if (!route.startsWith('/')) { + route = '/' + route; + } + window.open(route, '_blank'); + }); } }); From aa1e698acf1592efa99f0374518912a759f805b8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 28 Nov 2019 08:11:43 +0530 Subject: [PATCH 151/226] chore: cleanup redundant function definitions, sort imports --- frappe/tests/__init__.py | 46 ------------------------------------ frappe/tests/test_website.py | 11 +++------ 2 files changed, 3 insertions(+), 54 deletions(-) diff --git a/frappe/tests/__init__.py b/frappe/tests/__init__.py index dda38c93f9..e69de29bb2 100644 --- a/frappe/tests/__init__.py +++ b/frappe/tests/__init__.py @@ -1,46 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals - -import frappe -from werkzeug.wrappers import Request -from werkzeug.test import EnvironBuilder - -def set_request(**kwargs): - builder = EnvironBuilder(**kwargs) - frappe.local.request = Request(builder.get_environ()) - -def insert_test_data(doctype, sort_fn=None): - import frappe.model - data = get_test_doclist(doctype) - if sort_fn: - data = sorted(data, key=sort_fn) - - for doclist in data: - frappe.insert(doclist) - -def get_test_doclist(doctype, name=None): - """get test doclist, collection of doclists""" - import os - from frappe import conf - from frappe.modules.utils import peval_doclist - from frappe.modules import scrub - - doctype = scrub(doctype) - doctype_path = os.path.join(os.path.dirname(os.path.abspath(conf.__file__)), - conf.test_data_path, doctype) - - if name: - with open(os.path.join(doctype_path, scrub(name) + ".json"), 'r') as txtfile: - doclist = peval_doclist(txtfile.read()) - - return doclist - - else: - all_doclists = [] - for fname in filter(lambda n: n.endswith(".json"), os.listdir(doctype_path)): - with open(os.path.join(doctype_path, scrub(fname)), 'r') as txtfile: - all_doclists.append(peval_doclist(txtfile.read())) - - return all_doclists diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 9efd4d04a1..a8f74dcf0d 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -1,14 +1,11 @@ from __future__ import unicode_literals -import frappe, unittest -from werkzeug.wrappers import Request -from werkzeug.test import EnvironBuilder +import unittest +import frappe from frappe.website import render +from frappe.utils import set_request -def set_request(**kwargs): - builder = EnvironBuilder(**kwargs) - frappe.local.request = Request(builder.get_environ()) def get_html_for_route(route): set_request(method='GET', path=route) @@ -17,7 +14,6 @@ def get_html_for_route(route): return html class TestWebsite(unittest.TestCase): - def test_page_load(self): frappe.set_user('Guest') set_request(method='POST', path='login') @@ -76,4 +72,3 @@ class TestWebsite(unittest.TestCase): delattr(frappe.hooks, 'website_redirects') frappe.cache().delete_key('app_hooks') - From ace5ddad8727cc632ffc2bd70f9341715489cfd0 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 29 Nov 2019 18:27:18 +0530 Subject: [PATCH 152/226] fix: next schedule date should be on or after current date --- .../doctype/auto_repeat/auto_repeat.py | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index a950669d12..27f17a1a62 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -105,10 +105,6 @@ class AutoRepeat(Document): schedule_details = [] start_date = getdate(self.start_date) end_date = getdate(self.end_date) - today = frappe.utils.datetime.date.today() - - if start_date < today: - start_date = today if not self.end_date: start_date = get_next_schedule_date(start_date, self.frequency, self.repeat_on_day, self.repeat_on_last_day) @@ -121,7 +117,8 @@ class AutoRepeat(Document): start_date = get_next_schedule_date(start_date, self.frequency, self.repeat_on_day, self.repeat_on_last_day) if self.end_date: - start_date = get_next_schedule_date(start_date, self.frequency, self.repeat_on_day, self.repeat_on_last_day) + start_date = start_date = get_next_schedule_date( + start_date, self.frequency, self.repeat_on_day, self.repeat_on_last_day, end_date, for_full_schedule=True) while (getdate(start_date) < getdate(end_date)): row = { "reference_document" : self.reference_document, @@ -129,7 +126,8 @@ class AutoRepeat(Document): "next_scheduled_date" : start_date } schedule_details.append(row) - start_date = get_next_schedule_date(start_date, self.frequency, self.repeat_on_day, self.repeat_on_last_day, end_date) + start_date = start_date = get_next_schedule_date( + start_date, self.frequency, self.repeat_on_day, self.repeat_on_last_day, end_date, for_full_schedule=True) return schedule_details @@ -271,18 +269,28 @@ class AutoRepeat(Document): ) -def get_next_schedule_date(start_date, frequency, repeat_on_day, repeat_on_last_day = False, end_date = None): +def get_next_schedule_date(start_date, frequency, repeat_on_day, repeat_on_last_day=False, end_date=None, for_full_schedule=False): month_count = month_map.get(frequency) + day_count = 0 if month_count and repeat_on_last_day: next_date = get_next_date(start_date, month_count, 31) + day_count = 31 + next_date = get_next_date(start_date, month_count, day_count) elif month_count and repeat_on_day: next_date = get_next_date(start_date, month_count, repeat_on_day) + day_count = repeat_on_day + next_date = get_next_date(start_date, month_count, day_count) elif month_count: next_date = get_next_date(start_date, month_count) else: days = 7 if frequency == 'Weekly' else 1 next_date = add_days(start_date, days) + # next schedule date should be after or on current date + if not for_full_schedule: + while getdate(next_date) < getdate(today()): + next_date = get_next_date(next_date, month_count, day_count) + return next_date def get_next_date(dt, mcount, day=None): @@ -307,7 +315,7 @@ def create_repeated_entries(data): current_date = getdate(today()) schedule_date = getdate(doc.next_schedule_date) - while schedule_date <= current_date and not doc.disabled: + if schedule_date == current_date and not doc.disabled: doc.create_documents() schedule_date = get_next_schedule_date(schedule_date, doc.frequency, doc.repeat_on_day, doc.repeat_on_last_day, doc.end_date) From f4b68b4c25af69027dfa7f5f75ca839dec922ee7 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 29 Nov 2019 18:27:42 +0530 Subject: [PATCH 153/226] test: next schedule date --- .../doctype/auto_repeat/test_auto_repeat.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py index cb98d4a8fd..95f95f3e7d 100644 --- a/frappe/automation/doctype/auto_repeat/test_auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/test_auto_repeat.py @@ -96,6 +96,21 @@ class TestAutoRepeat(unittest.TestCase): linked_comm = frappe.db.exists("Communication", dict(reference_doctype="ToDo", reference_name=new_todo)) self.assertTrue(linked_comm) + def test_next_schedule_date(self): + current_date = getdate(today()) + todo = frappe.get_doc( + dict(doctype='ToDo', description='test next schedule date todo', assigned_by='Administrator')).insert() + doc = make_auto_repeat(frequency='Monthly', reference_document=todo.name, start_date=add_months(today(), -2)) + + #check next_schedule_date is set as per current date + #it should not be a previous month's date + self.assertEqual(doc.next_schedule_date, current_date) + data = get_auto_repeat_entries(current_date) + create_repeated_entries(data) + docnames = frappe.get_all(doc.reference_doctype, {'auto_repeat': doc.name}) + #the original doc + the repeated doc + self.assertEqual(len(docnames), 2) + def make_auto_repeat(**args): args = frappe._dict(args) From 450f5c378515fdf7177ca38bbc142510cfed221a Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 29 Nov 2019 20:26:00 +0530 Subject: [PATCH 154/226] chore: moved 'get_html_for_route' to frappe.utils --- frappe/tests/test_website.py | 6 ------ frappe/utils/__init__.py | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index a8f74dcf0d..d114f7d1b2 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -7,12 +7,6 @@ from frappe.website import render from frappe.utils import set_request -def get_html_for_route(route): - set_request(method='GET', path=route) - response = render.render() - html = frappe.safe_decode(response.get_data()) - return html - class TestWebsite(unittest.TestCase): def test_page_load(self): frappe.set_user('Guest') diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 22a87f612f..e69e6b145b 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -685,3 +685,10 @@ def set_request(**kwargs): from werkzeug.wrappers import Request builder = EnvironBuilder(**kwargs) frappe.local.request = Request(builder.get_environ()) + +def get_html_for_route(route): + from frappe.website.render import render + set_request(method='GET', path=route) + response = render.render() + html = frappe.safe_decode(response.get_data()) + return html \ No newline at end of file From e9a6927039e6b282fc9cc23fe900533b23fdb8de Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 29 Nov 2019 20:27:12 +0530 Subject: [PATCH 155/226] chore: fixed imports after module restructure --- frappe/tests/test_recorder.py | 2 +- frappe/tests/test_sitemap.py | 2 +- frappe/tests/test_twofactor.py | 2 +- frappe/utils/__init__.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_recorder.py b/frappe/tests/test_recorder.py index bffddc4ea1..d45ef12e86 100644 --- a/frappe/tests/test_recorder.py +++ b/frappe/tests/test_recorder.py @@ -7,7 +7,7 @@ from __future__ import unicode_literals import unittest import frappe import frappe.recorder -from .test_website import set_request +from frappe.utils import set_request import sqlparse diff --git a/frappe/tests/test_sitemap.py b/frappe/tests/test_sitemap.py index 6f98e3ed48..455a80eb3e 100644 --- a/frappe/tests/test_sitemap.py +++ b/frappe/tests/test_sitemap.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import frappe, unittest -from frappe.tests.test_website import get_html_for_route +from frappe.utils import get_html_for_route class TestSitemap(unittest.TestCase): def test_sitemap(self): diff --git a/frappe/tests/test_twofactor.py b/frappe/tests/test_twofactor.py index 27129d9832..34e12851f7 100644 --- a/frappe/tests/test_twofactor.py +++ b/frappe/tests/test_twofactor.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import unittest, frappe, pyotp from frappe.auth import HTTPRequest from frappe.utils import cint -from frappe.tests import set_request +from frappe.utils import set_request from frappe.auth import validate_ip_address from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, get_cached_user_pass, two_factor_is_enabled_for_, confirm_otp_token, get_otpsecret_for_, get_verification_obj) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index e69e6b145b..82e6ea1b45 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -687,7 +687,7 @@ def set_request(**kwargs): frappe.local.request = Request(builder.get_environ()) def get_html_for_route(route): - from frappe.website.render import render + from frappe.website import render set_request(method='GET', path=route) response = render.render() html = frappe.safe_decode(response.get_data()) From a8b16f1176ffad2755251744e75818e8e57fd5a2 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Sat, 30 Nov 2019 13:58:59 +0530 Subject: [PATCH 156/226] fix: multiple ui fixes --- .../setup_wizard_slide/setup_wizard_slide.json | 2 +- .../company_letter_head.json | 8 ++++---- .../public/js/frappe/ui/onboarding_dialog.js | 14 +++----------- frappe/public/js/frappe/ui/slides.js | 18 ++++++++++++++---- frappe/public/less/desk.less | 14 +++++++++++--- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json index 94d94851c3..31d03253c4 100644 --- a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json +++ b/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json @@ -157,7 +157,7 @@ "label": "Fields" } ], - "modified": "2019-11-26 17:33:34.553367", + "modified": "2019-11-30 13:58:05.688981", "modified_by": "Administrator", "module": "Desk", "name": "Setup Wizard Slide", diff --git a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json index 3644a54089..eb01c619a4 100644 --- a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json +++ b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json @@ -7,19 +7,19 @@ "domains": [], "help_links": [ { - "label": "Know more about printing and branding through letterhead", + "label": "Need Help?", "video_id": "cKZHcx1znMc" } ], "idx": 0, - "image_src": "/assets/erpnext/images/illustrations/letterhead.png", + "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard-2.png", "max_count": 0, - "modified": "2019-11-27 11:39:56.213373", + "modified": "2019-11-30 13:06:59.910747", "modified_by": "Administrator", "name": "Company Letter Head", "owner": "Administrator", "ref_doctype": "Letter Head", - "slide_desc": "Attach Letterhead: (Keep it web friendly as 1024px by 128px)", + "slide_desc": "

    The letter head will appear across all print formats and PDFs

    \n

    Keep it web friendly as 1024px by 128px

    ", "slide_fields": [ { "align": "center", diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index 1798d0fe68..cee5216085 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -24,7 +24,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { before_show() { (this.id === 0) ? - this.$next_btn.text(__('Start')) : this.$next_btn.text(__('Next')); + this.$next_btn.text(__('Let\'s Start')) : this.$next_btn.text(__('Next')); //last slide if (this.id === this.parent[0].children.length-1) { this.$complete_btn.removeClass('hide').addClass('action primary'); @@ -74,10 +74,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { setup_help_links() { this.help_links.map(link => { let $link = $( - `    ${link.label} - - - ` + `${link.label || __("Need Help?")}` ); if (link.video_id) { $link.on('click', () => { @@ -109,7 +106,6 @@ frappe.setup.OnboardingDialog = class OnboardingDialog { this.dialog = new frappe.ui.Dialog({ static: true, minimizable: false, - title: __("Let's Onboard!") }); this.$wrapper = $(this.dialog.$wrapper).addClass('onboarding-dialog'); this.slide_container = new frappe.ui.Slides({ @@ -126,11 +122,7 @@ frappe.setup.OnboardingDialog = class OnboardingDialog { } }); - this.$wrapper.find('.modal-title').prepend( - ` - - ` - ); + this.$wrapper.find('.modal-header').remove(); } show() { diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index d2e504337c..d3b44bbb12 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -27,7 +27,7 @@ frappe.ui.Slide = class Slide {
    - + Add More
    @@ -36,6 +36,7 @@ frappe.ui.Slide = class Slide { this.$content = this.$body.find(".content"); this.$form = this.$body.find(".form"); this.$primary_btn = this.slides_footer.find('.primary'); + this.$form_wrapper = this.$body.find(".form-wrapper"); if(this.image_src) this.$content.append( $(``)); @@ -57,18 +58,25 @@ frappe.ui.Slide = class Slide { } setup_form() { + const fields = this.get_atomic_fields() this.form = new frappe.ui.FieldGroup({ - fields: this.get_atomic_fields(), + fields: fields, body: this.$form[0], no_submit_on_enter: true }); this.form.make(); + if (fields.length == 1 ) { + this.$form_wrapper.addClass("text-center") + } else { + this.$form_wrapper.removeClass("text-center") + } if(this.add_more) this.bind_more_button(); this.set_reqd_fields(); if(this.onload) { this.onload(this); } this.set_reqd_fields(); + window.foorm = this.form } setup_done_state() {} @@ -86,7 +94,7 @@ frappe.ui.Slide = class Slide { field.reqd = 1; } if(!field.static) { - if(field.label) field.label += ' 1'; + if(field.label) field.label; } return field; }); @@ -121,14 +129,16 @@ frappe.ui.Slide = class Slide { .on('click', () => { this.count++; var fields = JSON.parse(JSON.stringify(this.fields)); + this.form.add_fields(fields.map(field => { if(field.fieldname) field.fieldname += '_' + this.count; if(!field.static) { - if(field.label) field.label += ' ' + this.count; + if(field.label) field.label; } field.reqd = 0; return field; })); + if(this.count === this.max_count) { this.$more.addClass('hide'); } diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index d8f5a141f4..cbc63886ec 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -897,6 +897,13 @@ input[type="checkbox"] { &:focus { outline: none; } + + .slide-body { + width: 65%; + margin-right: auto; + margin-left: auto; + } + .fa-circle { font-size: 10px; margin: 0px 2px; @@ -928,6 +935,7 @@ input[type="checkbox"] { } .lead { margin-top: 20px; + font-weight: 500; } .success-state { margin-bottom: 20px; @@ -969,7 +977,7 @@ input[type="checkbox"] { } .onboarding-icon { - color: #3246F5; + color: @text-muted; margin-right: 5px; } @@ -980,8 +988,8 @@ input[type="checkbox"] { } img { - max-width: 128px; - max-height: 128px; + max-height: 175px; + width: auto; } .slides-progress { From 9ffd909c6d3bab4411e439b5f3b894453bf4dfe7 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Sat, 30 Nov 2019 14:38:28 +0530 Subject: [PATCH 157/226] refactor: change letterhead image --- .../company_letter_head/company_letter_head.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json index eb01c619a4..27f8024c40 100644 --- a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json +++ b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json @@ -12,9 +12,9 @@ } ], "idx": 0, - "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard-2.png", + "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard.png", "max_count": 0, - "modified": "2019-11-30 13:06:59.910747", + "modified": "2019-11-30 14:28:49.857639", "modified_by": "Administrator", "name": "Company Letter Head", "owner": "Administrator", From 5a2c2b8ec01c357756f5a9fd1f774c3ef75d5ff2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Sat, 30 Nov 2019 17:19:00 +0530 Subject: [PATCH 158/226] fix: Change modified user --- .../doctype/website_route_meta/website_route_meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/website_route_meta/website_route_meta.json b/frappe/website/doctype/website_route_meta/website_route_meta.json index bcaee8c8b0..6e1672c379 100644 --- a/frappe/website/doctype/website_route_meta/website_route_meta.json +++ b/frappe/website/doctype/website_route_meta/website_route_meta.json @@ -18,7 +18,7 @@ } ], "modified": "2019-11-28 17:26:49.068372", - "modified_by": "faris@erpnext.com", + "modified_by": "Administrator", "module": "Website", "name": "Website Route Meta", "owner": "Administrator", @@ -40,4 +40,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +} From 9f3b0b59fc8c1f3c619ade7b1159e03f987db584 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 1 Dec 2019 11:41:11 +0530 Subject: [PATCH 159/226] test: Fix listview test by waiting for clear-cache --- cypress/support/commands.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 464cbbe1d5..5f6d917998 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -162,9 +162,15 @@ Cypress.Commands.add('go_to_list', (doctype) => { }); Cypress.Commands.add('clear_cache', () => { + cy.server(); + cy.route({ + method: 'POST', + url: 'frappe.sessions.clear' + }).as('clear-cache'); cy.window().its('frappe').then(frappe => { frappe.ui.toolbar.clear_cache(); }); + cy.wait(['@clear-cache']); }); Cypress.Commands.add('dialog', (opts) => { From d41ca958aba27408fcb83990f0b3a1fea28a6f28 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 1 Dec 2019 12:36:21 +0530 Subject: [PATCH 160/226] test: Move wait to list_view.js --- cypress/integration/list_view.js | 6 ++++++ cypress/support/commands.js | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index 20a973c1dd..ab2d4a2d86 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -5,7 +5,13 @@ context('List View', () => { cy.window().its('frappe').then(frappe => { frappe.call("frappe.tests.ui_test_helpers.setup_workflow"); }); + cy.server(); + cy.route({ + method: 'POST', + url: 'frappe.sessions.clear' + }).as('clear-cache'); cy.clear_cache(); + cy.wait(['@clear-cache']); }); it('enables "Actions" button', () => { const actions = ['Approve', 'Reject', 'Edit', 'Assign To', 'Apply Assignment Rule', 'Print', 'Delete']; diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 5f6d917998..464cbbe1d5 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -162,15 +162,9 @@ Cypress.Commands.add('go_to_list', (doctype) => { }); Cypress.Commands.add('clear_cache', () => { - cy.server(); - cy.route({ - method: 'POST', - url: 'frappe.sessions.clear' - }).as('clear-cache'); cy.window().its('frappe').then(frappe => { frappe.ui.toolbar.clear_cache(); }); - cy.wait(['@clear-cache']); }); Cypress.Commands.add('dialog', (opts) => { From 7629f07dbf8265b963e8cbc09e4a3c95cd628b0b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 1 Dec 2019 13:32:28 +0530 Subject: [PATCH 161/226] test: Try removing clear-cache --- cypress/integration/list_view.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/cypress/integration/list_view.js b/cypress/integration/list_view.js index ab2d4a2d86..d6627ea9c4 100644 --- a/cypress/integration/list_view.js +++ b/cypress/integration/list_view.js @@ -2,16 +2,9 @@ context('List View', () => { before(() => { cy.login(); cy.visit('/desk'); - cy.window().its('frappe').then(frappe => { - frappe.call("frappe.tests.ui_test_helpers.setup_workflow"); + return cy.window().its('frappe').then(frappe => { + return frappe.xcall("frappe.tests.ui_test_helpers.setup_workflow"); }); - cy.server(); - cy.route({ - method: 'POST', - url: 'frappe.sessions.clear' - }).as('clear-cache'); - cy.clear_cache(); - cy.wait(['@clear-cache']); }); it('enables "Actions" button', () => { const actions = ['Approve', 'Reject', 'Edit', 'Assign To', 'Apply Assignment Rule', 'Print', 'Delete']; From b6418ca059129949cbf72252d647cba1638d44f1 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 2 Dec 2019 13:03:00 +0530 Subject: [PATCH 162/226] style: remove stray code and added semicolon --- frappe/public/js/frappe/ui/slides.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index d3b44bbb12..ceeadb09fa 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -66,9 +66,9 @@ frappe.ui.Slide = class Slide { }); this.form.make(); if (fields.length == 1 ) { - this.$form_wrapper.addClass("text-center") + this.$form_wrapper.addClass("text-center"); } else { - this.$form_wrapper.removeClass("text-center") + this.$form_wrapper.removeClass("text-center"); } if(this.add_more) this.bind_more_button(); @@ -76,7 +76,6 @@ frappe.ui.Slide = class Slide { if(this.onload) { this.onload(this); } this.set_reqd_fields(); - window.foorm = this.form } setup_done_state() {} From d648c4e1b9b4aecd55b9ae7c19993b9be13f2157 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 2 Dec 2019 13:03:39 +0530 Subject: [PATCH 163/226] refactor (breaking): rename Setup Wizard slide to Onboarding Slide --- .../__init__.py | 0 .../onboarding_slide.js} | 4 +- .../onboarding_slide.json} | 4 +- .../onboarding_slide.py} | 8 ++-- .../test_onboarding_slide.py} | 2 +- .../setup_wizard_slide_field.json | 2 +- .../company_letter_head.json | 37 +++++++++++++++++++ .../company_letter_head.json | 2 +- frappe/public/js/frappe/desk.js | 2 +- 9 files changed, 49 insertions(+), 12 deletions(-) rename frappe/desk/doctype/{setup_wizard_slide => onboarding_slide}/__init__.py (100%) rename frappe/desk/doctype/{setup_wizard_slide/setup_wizard_slide.js => onboarding_slide/onboarding_slide.js} (89%) rename frappe/desk/doctype/{setup_wizard_slide/setup_wizard_slide.json => onboarding_slide/onboarding_slide.json} (98%) rename frappe/desk/doctype/{setup_wizard_slide/setup_wizard_slide.py => onboarding_slide/onboarding_slide.py} (91%) rename frappe/desk/doctype/{setup_wizard_slide/test_setup_wizard_slide.py => onboarding_slide/test_onboarding_slide.py} (79%) create mode 100644 frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json diff --git a/frappe/desk/doctype/setup_wizard_slide/__init__.py b/frappe/desk/doctype/onboarding_slide/__init__.py similarity index 100% rename from frappe/desk/doctype/setup_wizard_slide/__init__.py rename to frappe/desk/doctype/onboarding_slide/__init__.py diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js similarity index 89% rename from frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js rename to frappe/desk/doctype/onboarding_slide/onboarding_slide.js index 7a802ad2b6..d9c210f249 100644 --- a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.js +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js @@ -1,7 +1,7 @@ // Copyright (c) 2019, Frappe Technologies and contributors // For license information, please see license.txt -frappe.ui.form.on('Setup Wizard Slide', { +frappe.ui.form.on('Onboarding Slide', { refresh: function(frm) { frm.toggle_reqd('ref_doctype', frm.doc.slide_type!='Information'); frm.toggle_reqd('slide_module', frm.doc.slide_type=='Information'); @@ -33,7 +33,7 @@ frappe.ui.form.on('Setup Wizard Slide', { reqd: 1 }); $.each(fields, function(_i, data) { - let row = frappe.model.add_child(frm.doc, 'Setup Wizard Slide', 'slide_fields'); + let row = frappe.model.add_child(frm.doc, 'Onboarding Slide', 'slide_fields'); row.label = data.label; row.fieldtype = data.fieldtype; row.fieldname = data.fieldname; diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json similarity index 98% rename from frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json rename to frappe/desk/doctype/onboarding_slide/onboarding_slide.json index 31d03253c4..b68cdced69 100644 --- a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.json +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json @@ -68,7 +68,7 @@ "fieldname": "slide_fields", "fieldtype": "Table", "label": "Slide Fields", - "options": "Setup Wizard Slide Field" + "options": "Onboarding Slide Field" }, { "fieldname": "section_break_10", @@ -160,7 +160,7 @@ "modified": "2019-11-30 13:58:05.688981", "modified_by": "Administrator", "module": "Desk", - "name": "Setup Wizard Slide", + "name": "Onboarding Slide", "owner": "Administrator", "permissions": [ { diff --git a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py similarity index 91% rename from frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py rename to frappe/desk/doctype/onboarding_slide/onboarding_slide.py index 9109d52a85..1aacab2391 100644 --- a/frappe/desk/doctype/setup_wizard_slide/setup_wizard_slide.py +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py @@ -8,22 +8,22 @@ import json from frappe.model.document import Document from frappe.modules.export_file import export_to_files -class SetupWizardSlide(Document): +class OnboardingSlide(Document): def on_update(self): if self.ref_doctype: module = frappe.db.get_value('DocType', self.ref_doctype, 'module') else: module = self.slide_module - export_to_files(record_list=[['Setup Wizard Slide', self.name]], record_module=module) + export_to_files(record_list=[['Onboarding Slide', self.name]], record_module=module) def get_onboarding_slides_as_list(): slides = [] - slide_docs = frappe.get_all('Setup Wizard Slide', + slide_docs = frappe.get_all('Onboarding Slide', filters={'slide_order': ('!=', 0)}, order_by='slide_order') for entry in slide_docs: # using get_doc because child table fields are not fetched in get_all - slide_doc = frappe.get_doc('Setup Wizard Slide', entry.name) + slide_doc = frappe.get_doc('Onboarding Slide', entry.name) if frappe.scrub(slide_doc.app) in frappe.get_installed_apps(): slides.append(frappe._dict( slide_type=slide_doc.slide_type, diff --git a/frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py b/frappe/desk/doctype/onboarding_slide/test_onboarding_slide.py similarity index 79% rename from frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py rename to frappe/desk/doctype/onboarding_slide/test_onboarding_slide.py index 58652c4ec2..d78b9b6158 100644 --- a/frappe/desk/doctype/setup_wizard_slide/test_setup_wizard_slide.py +++ b/frappe/desk/doctype/onboarding_slide/test_onboarding_slide.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe import unittest -class TestSetupWizardSlide(unittest.TestCase): +class TestOnboardingSlide(unittest.TestCase): pass diff --git a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json b/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json index 03d58d842b..3ae91912da 100644 --- a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json +++ b/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json @@ -66,7 +66,7 @@ "modified": "2019-11-25 16:50:53.994656", "modified_by": "Administrator", "module": "Desk", - "name": "Setup Wizard Slide Field", + "name": "Onboarding Slide Field", "owner": "Administrator", "permissions": [], "sort_field": "modified", diff --git a/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json b/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json new file mode 100644 index 0000000000..6b4ad815e4 --- /dev/null +++ b/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json @@ -0,0 +1,37 @@ +{ + "add_more_button": 0, + "app": "ERPNext", + "creation": "2019-11-22 13:25:42.892593", + "docstatus": 0, + "doctype": "Onboarding Slide", + "domains": [], + "help_links": [ + { + "label": "Need Help?", + "video_id": "cKZHcx1znMc" + } + ], + "idx": 0, + "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard.png", + "max_count": 0, + "modified": "2019-12-02 12:57:41.353913", + "modified_by": "Administrator", + "name": "Company Letter Head", + "owner": "Administrator", + "ref_doctype": "Letter Head", + "slide_desc": "

    The letter head will appear across all print formats and PDFs

    \n

    Keep it web friendly as 1024px by 128px

    ", + "slide_fields": [ + { + "align": "center", + "fieldname": "letterhead", + "fieldtype": "Attach Image", + "label": "Attach Letterhead", + "options": "image", + "reqd": 0 + } + ], + "slide_order": 20, + "slide_title": "Company Letter Head", + "slide_type": "Create", + "submit_method": "" +} \ No newline at end of file diff --git a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json index 27f8024c40..183a9fd09c 100644 --- a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json +++ b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json @@ -3,7 +3,7 @@ "app": "ERPNext", "creation": "2019-11-22 13:25:42.892593", "docstatus": 0, - "doctype": "Setup Wizard Slide", + "doctype": "Onboarding Slide", "domains": [], "help_links": [ { diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 206094dd71..6c7a748822 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -88,7 +88,7 @@ frappe.Application = Class.extend({ } this.show_update_available(); - if (frappe.boot.is_first_startup) { + if (frappe.boot.is_first_startup || true) { this.setup_onboarding_wizard(); } From 9c57d8076934b0b4a077eb0c572e7c5de2acdb43 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Mon, 2 Dec 2019 13:05:06 +0530 Subject: [PATCH 164/226] fix: rename function to set --- .../doctype/global_search_settings/global_search_settings.py | 4 ++-- frappe/utils/global_search.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py index 42ac5db8d2..e39bf18efe 100644 --- a/frappe/desk/doctype/global_search_settings/global_search_settings.py +++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py @@ -30,9 +30,9 @@ class GlobalSearchSettings(Document): frappe.throw(_("Document Type {0} has been repeated.").format(repeated_dts)) def on_update(self): - get_doctypes_for_global_search() + set_doctypes_for_global_search() -def get_doctypes_for_global_search(): +def set_doctypes_for_global_search(): doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC") if not doctypes: return [] diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index c127a55619..32f2f09326 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -415,7 +415,7 @@ def search(text, start=0, limit=20, doctype=""): :param limit: number of results to return, default 20 :return: Array of result objects """ - from frappe.desk.doctype.global_search_settings.global_search_settings import get_doctypes_for_global_search + from frappe.desk.doctype.global_search_settings.global_search_settings import set_doctypes_for_global_search results = [] sorted_results = [] @@ -424,7 +424,7 @@ def search(text, start=0, limit=20, doctype=""): allowed_doctypes = frappe.cache().hget("global_search", "allowed_doctypes") if not priorities or not allowed_doctypes: - priorities, allowed_doctypes = get_doctypes_for_global_search() + priorities, allowed_doctypes = set_doctypes_for_global_search() for text in set(text.split('&')): text = text.strip() From 1aa7824af5437078458ff403fc5a1d4f46a1f841 Mon Sep 17 00:00:00 2001 From: Saqib Date: Mon, 2 Dec 2019 13:05:46 +0530 Subject: [PATCH 165/226] fix(IntControl): Check for arithmetic expression before eval (#8813) * fix: int eval_expression only checks for comma * fix: get_number_format called for int fields * int control doesn't have get_number_format * fix(Numeric fields): Only match valid arithmetic expressions --- .../js/frappe/form/controls/currency.js | 17 +------------- .../public/js/frappe/form/controls/float.js | 4 ++-- frappe/public/js/frappe/form/controls/int.js | 22 +++++++++---------- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/currency.js b/frappe/public/js/frappe/form/controls/currency.js index 196ae5fd43..4d6b37aede 100644 --- a/frappe/public/js/frappe/form/controls/currency.js +++ b/frappe/public/js/frappe/form/controls/currency.js @@ -1,21 +1,6 @@ frappe.ui.form.ControlCurrency = frappe.ui.form.ControlFloat.extend({ - eval_expression: function(value) { - if (typeof value ==='string' && value.match(/^[0-9+-/* ]+$/)) { - // Removes seperator - value = strip_number_groups(value, this.get_number_format()); - - try { - return eval(value); - } catch (e) { - return value; - } - } - // If not string - return value; - }, - format_for_input: function(value) { - var formatted_value = format_number(parseFloat(value), this.get_number_format(), this.get_precision()); + var formatted_value = format_number(value, this.get_number_format(), this.get_precision()); return isNaN(parseFloat(value)) ? "" : formatted_value; }, diff --git a/frappe/public/js/frappe/form/controls/float.js b/frappe/public/js/frappe/form/controls/float.js index d32f29e28a..308d970f6e 100644 --- a/frappe/public/js/frappe/form/controls/float.js +++ b/frappe/public/js/frappe/form/controls/float.js @@ -1,7 +1,7 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ parse: function(value) { value = this.eval_expression(value); - return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision(), + return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision(), // While parsing currency, get_number_format passes currency's number_format // In case of parsing float, it passes global number_format this.get_number_format()); @@ -12,7 +12,7 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ if (this.df.fieldtype==="Float" && this.df.options && this.df.options.trim()) { number_format = this.get_number_format(); } - var formatted_value = format_number(parseFloat(value), number_format, this.get_precision()); + var formatted_value = format_number(value, number_format, this.get_precision()); return isNaN(parseFloat(value)) ? "" : formatted_value; }, diff --git a/frappe/public/js/frappe/form/controls/int.js b/frappe/public/js/frappe/form/controls/int.js index ead48a996c..5639e5f132 100644 --- a/frappe/public/js/frappe/form/controls/int.js +++ b/frappe/public/js/frappe/form/controls/int.js @@ -20,20 +20,18 @@ frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({ }); }, eval_expression: function(value) { - if (typeof value==='string' - && value.match(/^[0-9+-/* ]+$/) - // strings with commas are evaluated incorrectly - // for e.g 47,186.00 -> 186 - && !value.includes(',')) { - try { - return eval(value); - } catch (e) { - // bad expression - return value; + if (typeof value === 'string') { + if (value.match(/^[0-9\+\-\/\* ]+$/)) { + // If it is a string containing operators + try { + return eval(value); + } catch (e) { + // bad expression + return value; + } } - } else { - return value; } + return value; }, parse: function(value) { return cint(this.eval_expression(value), null); From 7e1834548c714a1e53d8f5a0f705ce706e1c1910 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 2 Dec 2019 14:22:17 +0530 Subject: [PATCH 166/226] fix: Codacy --- frappe/tests/ui_test_helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index d3e6193699..8eec644115 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -71,6 +71,6 @@ def create_contact_phone_nos_records(): doc = frappe.new_doc('Contact') doc.first_name = 'Test Contact' - for x in range(1000): - doc.append('phone_nos', {'phone': '123456789'}) + for index in range(1000): + doc.append('phone_nos', {'phone': '123456{}'.format(index)}) doc.insert() \ No newline at end of file From 398d5bad6f7ad95e04d3451ee0b9bec5879cb77e Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 2 Dec 2019 14:58:09 +0530 Subject: [PATCH 167/226] fix: do not allow bulk update for core, single doctypes and doctypes from inactive domains --- frappe/desk/doctype/bulk_update/bulk_update.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/desk/doctype/bulk_update/bulk_update.js b/frappe/desk/doctype/bulk_update/bulk_update.js index 6f2a9c3dde..fec853ca98 100644 --- a/frappe/desk/doctype/bulk_update/bulk_update.js +++ b/frappe/desk/doctype/bulk_update/bulk_update.js @@ -3,6 +3,16 @@ frappe.ui.form.on('Bulk Update', { refresh: function(frm) { + frm.set_query("document_type", function() { + return { + filters: [ + ['DocType', 'issingle', '=', 0], + ['DocType', 'name', 'not in', frappe.model.core_doctypes_list], + ['DocType', 'restrict_to_domain', 'in', frappe.boot.active_domains] + ] + }; + }); + frm.page.set_primary_action(__('Update'), function() { if (!frm.doc.update_value) { frappe.throw(__('Field "value" is mandatory. Please specify value to be updated')); From 5aad587a4a89d148c293d49e6ff73e929ebc432a Mon Sep 17 00:00:00 2001 From: Anurag Mishra <32095923+Anurag810@users.noreply.github.com> Date: Mon, 2 Dec 2019 16:33:58 +0530 Subject: [PATCH 168/226] fix: Showing quotes in string (#8904) --- frappe/utils/data.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 8e407736bd..77d43b3778 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -681,13 +681,13 @@ def pretty_date(iso_datetime): else: return '{0} years ago'.format(cint(math.floor(dt_diff_days / 365.0))) -def comma_or(some_list): - return comma_sep(some_list, frappe._("{0} or {1}")) +def comma_or(some_list, add_quotes=True): + return comma_sep(some_list, frappe._("{0} or {1}"), add_quotes) -def comma_and(some_list): - return comma_sep(some_list, frappe._("{0} and {1}")) +def comma_and(some_list ,add_quotes=True): + return comma_sep(some_list, frappe._("{0} and {1}"), add_quotes) -def comma_sep(some_list, pattern): +def comma_sep(some_list, pattern, add_quotes=True): if isinstance(some_list, (list, tuple)): # list(some_list) is done to preserve the existing list some_list = [text_type(s) for s in list(some_list)] @@ -696,7 +696,7 @@ def comma_sep(some_list, pattern): elif len(some_list) == 1: return some_list[0] else: - some_list = ["'%s'" % s for s in some_list] + some_list = ["'%s'" % s for s in some_list] if add_quotes else ["%s" % s for s in some_list] return pattern.format(", ".join(frappe._(s) for s in some_list[:-1]), some_list[-1]) else: return some_list From 5b16efd1e734157949f7fb1af6c3923862a37fac Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Mon, 2 Dec 2019 17:23:13 +0530 Subject: [PATCH 169/226] chore: code cleanup for the old doctype Setup Wizard Slide --- .../onboarding_slide/onboarding_slide.json | 4 +- .../__init__.py | 0 .../onboarding_slide_field.json} | 14 +++---- .../onboarding_slide_field.py} | 2 +- .../__init__.py | 0 .../onboarding_slide_help_link.json} | 2 +- .../onboarding_slide_help_link.py} | 2 +- frappe/model/sync.py | 8 ++-- .../company_letter_head.json | 37 ------------------- frappe/public/js/frappe/desk.js | 4 +- .../public/js/frappe/ui/onboarding_dialog.js | 2 +- 11 files changed, 19 insertions(+), 56 deletions(-) rename frappe/desk/doctype/{setup_wizard_help_link => onboarding_slide_field}/__init__.py (100%) rename frappe/desk/doctype/{setup_wizard_slide_field/setup_wizard_slide_field.json => onboarding_slide_field/onboarding_slide_field.json} (97%) rename frappe/desk/doctype/{setup_wizard_help_link/setup_wizard_help_link.py => onboarding_slide_field/onboarding_slide_field.py} (86%) rename frappe/desk/doctype/{setup_wizard_slide_field => onboarding_slide_help_link}/__init__.py (100%) rename frappe/desk/doctype/{setup_wizard_help_link/setup_wizard_help_link.json => onboarding_slide_help_link/onboarding_slide_help_link.json} (94%) rename frappe/desk/doctype/{setup_wizard_slide_field/setup_wizard_slide_field.py => onboarding_slide_help_link/onboarding_slide_help_link.py} (85%) delete mode 100644 frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.json b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json index b68cdced69..c5497070ed 100644 --- a/frappe/desk/doctype/onboarding_slide/onboarding_slide.json +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json @@ -90,7 +90,7 @@ "fieldname": "help_links", "fieldtype": "Table", "label": "Help Links", - "options": "Setup Wizard Help Link" + "options": "Onboarding Slide Help Link" }, { "fieldname": "action_section_break", @@ -157,7 +157,7 @@ "label": "Fields" } ], - "modified": "2019-11-30 13:58:05.688981", + "modified": "2019-12-02 16:17:17.368741", "modified_by": "Administrator", "module": "Desk", "name": "Onboarding Slide", diff --git a/frappe/desk/doctype/setup_wizard_help_link/__init__.py b/frappe/desk/doctype/onboarding_slide_field/__init__.py similarity index 100% rename from frappe/desk/doctype/setup_wizard_help_link/__init__.py rename to frappe/desk/doctype/onboarding_slide_field/__init__.py diff --git a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.json similarity index 97% rename from frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json rename to frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.json index 3ae91912da..0992aed092 100644 --- a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.json +++ b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.json @@ -33,12 +33,6 @@ "in_list_view": 1, "label": "Fieldname" }, - { - "fieldname": "options", - "fieldtype": "Text", - "in_list_view": 1, - "label": "Options" - }, { "fieldname": "align", "fieldtype": "Select", @@ -60,10 +54,16 @@ { "fieldname": "column_break_4", "fieldtype": "Column Break" + }, + { + "fieldname": "options", + "fieldtype": "Text", + "in_list_view": 1, + "label": "Options" } ], "istable": 1, - "modified": "2019-11-25 16:50:53.994656", + "modified": "2019-12-02 16:43:51.930018", "modified_by": "Administrator", "module": "Desk", "name": "Onboarding Slide Field", diff --git a/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.py similarity index 86% rename from frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py rename to frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.py index fbb96bbd91..74b6782ff8 100644 --- a/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.py +++ b/frappe/desk/doctype/onboarding_slide_field/onboarding_slide_field.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe from frappe.model.document import Document -class SetupWizardHelpLink(Document): +class OnboardingSlideField(Document): pass diff --git a/frappe/desk/doctype/setup_wizard_slide_field/__init__.py b/frappe/desk/doctype/onboarding_slide_help_link/__init__.py similarity index 100% rename from frappe/desk/doctype/setup_wizard_slide_field/__init__.py rename to frappe/desk/doctype/onboarding_slide_help_link/__init__.py diff --git a/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.json similarity index 94% rename from frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json rename to frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.json index b97b482cac..a09ba50553 100644 --- a/frappe/desk/doctype/setup_wizard_help_link/setup_wizard_help_link.json +++ b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.json @@ -25,7 +25,7 @@ "modified": "2019-11-19 13:39:57.716248", "modified_by": "Administrator", "module": "Desk", - "name": "Setup Wizard Help Link", + "name": "Onboarding Slide Help Link", "owner": "Administrator", "permissions": [], "quick_entry": 1, diff --git a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.py similarity index 85% rename from frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py rename to frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.py index 1b880ef916..6ee5e4f7d7 100644 --- a/frappe/desk/doctype/setup_wizard_slide_field/setup_wizard_slide_field.py +++ b/frappe/desk/doctype/onboarding_slide_help_link/onboarding_slide_help_link.py @@ -6,5 +6,5 @@ from __future__ import unicode_literals # import frappe from frappe.model.document import Document -class SetupWizardSlideField(Document): +class OnboardingSlideHelpLink(Document): pass diff --git a/frappe/model/sync.py b/frappe/model/sync.py index b17c7db5c7..0c9c464695 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -42,9 +42,9 @@ def sync_for(app_name, force=0, sync_everything = False, verbose=False, reset_pe ("data_migration", "data_migration_mapping"), ("data_migration", "data_migration_plan_mapping"), ("data_migration", "data_migration_plan"), - ("desk", "setup_wizard_slide_field"), - ("desk", "setup_wizard_help_link"), - ("desk", "setup_wizard_slide")): + ("desk", "onboarding_slide_field"), + ("desk", "onboarding_slide_help_link"), + ("desk", "onboarding_slide")): files.append(os.path.join(frappe.get_app_path("frappe"), d[0], "doctype", d[1], d[1] + ".json")) @@ -73,7 +73,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F # load in sequence - warning for devs document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'website_theme', 'web_form', 'notification', 'print_style', - 'data_migration_mapping', 'data_migration_plan', 'setup_wizard_slide'] + 'data_migration_mapping', 'data_migration_plan', 'onboarding_slide'] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) if os.path.exists(doctype_path): diff --git a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json b/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json deleted file mode 100644 index 183a9fd09c..0000000000 --- a/frappe/printing/setup_wizard_slide/company_letter_head/company_letter_head.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "add_more_button": 0, - "app": "ERPNext", - "creation": "2019-11-22 13:25:42.892593", - "docstatus": 0, - "doctype": "Onboarding Slide", - "domains": [], - "help_links": [ - { - "label": "Need Help?", - "video_id": "cKZHcx1znMc" - } - ], - "idx": 0, - "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard.png", - "max_count": 0, - "modified": "2019-11-30 14:28:49.857639", - "modified_by": "Administrator", - "name": "Company Letter Head", - "owner": "Administrator", - "ref_doctype": "Letter Head", - "slide_desc": "

    The letter head will appear across all print formats and PDFs

    \n

    Keep it web friendly as 1024px by 128px

    ", - "slide_fields": [ - { - "align": "center", - "fieldname": "letterhead", - "fieldtype": "Attach Image", - "label": "Attach Letterhead", - "options": "image", - "reqd": 0 - } - ], - "slide_order": 20, - "slide_title": "Company Letter Head", - "slide_type": "Create", - "submit_method": "" -} \ No newline at end of file diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 6c7a748822..ebc5973c73 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -88,7 +88,7 @@ frappe.Application = Class.extend({ } this.show_update_available(); - if (frappe.boot.is_first_startup || true) { + if (frappe.boot.is_first_startup) { this.setup_onboarding_wizard(); } @@ -487,7 +487,7 @@ frappe.Application = Class.extend({ setup_onboarding_wizard: () => { var me = this; - frappe.call('frappe.desk.doctype.setup_wizard_slide.setup_wizard_slide.get_onboarding_slides').then(res => { + frappe.call('frappe.desk.doctype.onboarding_slide.onboarding_slide.get_onboarding_slides').then(res => { if (res.message) { let slides = res.message; if (slides.length) { diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index cee5216085..c5299e745a 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -40,7 +40,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { this.$action_button.addClass('disabled'); if (me.add_more) me.values.max_count = me.max_count; frappe.call({ - method: 'frappe.desk.doctype.setup_wizard_slide.setup_wizard_slide.create_onboarding_docs', + method: 'frappe.desk.doctype.onboarding_slide.onboarding_slide.create_onboarding_docs', args: { values: me.values, doctype: me.ref_doctype, From a8914a2cbd8930a1a65bd5e6ba15426a2aa09b8c Mon Sep 17 00:00:00 2001 From: Ben Knowles Date: Tue, 3 Dec 2019 00:44:11 -0600 Subject: [PATCH 170/226] fix: REST API utf-8 decoding on creates/updates (#8875) * fix: REST API utf-8 decoding on creates/updates Creating or updating a document via the REST API would generate an error of: `TypeError: the JSON object must be str, not 'bytes'` Because get_data() returns bytes which must be explicitly converted to a string before parsing as JSON. Defect introduced by efe94886a and a71a92341e * fix: switch to safe_decode --- frappe/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/api.py b/frappe/api.py index b61c535edd..95a9a408a5 100644 --- a/frappe/api.py +++ b/frappe/api.py @@ -82,7 +82,7 @@ def handle(): if frappe.local.request.method=="PUT": if frappe.local.form_dict.data is None: - data = json.loads(frappe.local.request.get_data()) + data = json.loads(frappe.safe_decode(frappe.local.request.get_data())) else: data = json.loads(frappe.local.form_dict.data) doc = frappe.get_doc(doctype, name) @@ -117,7 +117,7 @@ def handle(): if frappe.local.request.method=="POST": if frappe.local.form_dict.data is None: - data = json.loads(frappe.local.request.get_data()) + data = json.loads(frappe.safe_decode(frappe.local.request.get_data())) else: data = json.loads(frappe.local.form_dict.data) data.update({ From 1898b2fb0e6c5f5624ad9021faa7d1c57772444e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 3 Dec 2019 12:41:04 +0530 Subject: [PATCH 171/226] fix: use hasattr to verify links (#8938) * fix: use hasattr to verify links * fix: verify length explicitly * style: remove unnecessary call to len --- frappe/model/meta.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 97e526c4e0..927a56b6b8 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -433,7 +433,7 @@ class Meta(Document): def add_doctype_links(self, data): '''add `links` child table in standard link dashboard format''' - if self.links: + if hasattr(self, 'links') and self.links: if not data.transactions: # init groups data.transactions = [] From de6ec7985a03fb26d722c6393003481932166a92 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 3 Dec 2019 12:41:35 +0530 Subject: [PATCH 172/226] fix(integration): Social Login Key add missing field --- .../social_login_key/social_login_key.json | 827 ++++-------------- 1 file changed, 155 insertions(+), 672 deletions(-) diff --git a/frappe/integrations/doctype/social_login_key/social_login_key.json b/frappe/integrations/doctype/social_login_key/social_login_key.json index 8e415e6c20..290aae0e4e 100644 --- a/frappe/integrations/doctype/social_login_key/social_login_key.json +++ b/frappe/integrations/doctype/social_login_key/social_login_key.json @@ -1,700 +1,183 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 1, - "allow_rename": 0, - "beta": 0, - "creation": "2017-11-18 15:36:09.676722", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 1, - "engine": "InnoDB", + "allow_import": 1, + "creation": "2017-11-18 15:36:09.676722", + "doctype": "DocType", + "document_type": "Document", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "enable_social_login", + "client_credentials", + "social_login_provider", + "client_id", + "column_break_0", + "provider_name", + "client_secret", + "sb_identity_details", + "icon", + "column_break_1", + "base_url", + "client_urls", + "authorize_url", + "access_token_url", + "column_break_3", + "redirect_url", + "api_endpoint", + "custom_base_url", + "client_information", + "api_endpoint_args", + "auth_url_data", + "user_id_property" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "enable_social_login", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Enable Social Login", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "enable_social_login", + "fieldtype": "Check", + "label": "Enable Social Login" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": "eval:doc.enable_social_login", - "columns": 0, - "fieldname": "client_credentials", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Client Credentials", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.enable_social_login", + "fieldname": "client_credentials", + "fieldtype": "Section Break", + "label": "Client Credentials" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Custom", - "depends_on": "eval:doc.custom!=1", - "fieldname": "social_login_provider", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Social Login Provider", - "length": 0, - "no_copy": 0, - "options": "Custom\nFacebook\nFrappe\nGitHub\nGoogle\nOffice 365\nSalesforce\nfairlogin", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 1, - "unique": 0 - }, + "default": "Custom", + "depends_on": "eval:doc.custom!=1", + "fieldname": "social_login_provider", + "fieldtype": "Select", + "label": "Social Login Provider", + "options": "Custom\nFacebook\nFrappe\nGitHub\nGoogle\nOffice 365\nSalesforce\nfairlogin", + "set_only_once": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "client_id", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Client ID", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "client_id", + "fieldtype": "Data", + "label": "Client ID" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_0", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "column_break_0", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "provider_name", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Provider Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 1, - "unique": 0 - }, + "fieldname": "provider_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Provider Name", + "reqd": 1, + "set_only_once": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "client_secret", - "fieldtype": "Password", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Client Secret", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "client_secret", + "fieldtype": "Password", + "label": "Client Secret" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": "eval:doc.custom_base_url", - "columns": 0, - "depends_on": "", - "fieldname": "sb_identity_details", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Identity Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.custom_base_url", + "fieldname": "sb_identity_details", + "fieldtype": "Section Break", + "label": "Identity Details" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "icon", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Icon", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "icon", + "fieldtype": "Data", + "label": "Icon" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_1", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "column_break_1", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "base_url", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Base URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "base_url", + "fieldtype": "Data", + "label": "Base URL" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"", - "columns": 0, - "depends_on": "", - "fieldname": "client_urls", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Client URLs", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"", + "fieldname": "client_urls", + "fieldtype": "Section Break", + "label": "Client URLs" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "authorize_url", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Authorize URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "authorize_url", + "fieldtype": "Data", + "label": "Authorize URL" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "access_token_url", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Access Token URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "access_token_url", + "fieldtype": "Data", + "label": "Access Token URL" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "column_break_3", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "column_break_3", + "fieldtype": "Column Break" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "redirect_url", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Redirect URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "redirect_url", + "fieldtype": "Data", + "label": "Redirect URL" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "api_endpoint", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "API Endpoint", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "api_endpoint", + "fieldtype": "Data", + "label": "API Endpoint" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "custom_base_url", - "fieldtype": "Check", - "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Custom Base URL", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "0", + "fieldname": "custom_base_url", + "fieldtype": "Check", + "hidden": 1, + "label": "Custom Base URL" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 1, - "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"", - "columns": 0, - "depends_on": "", - "fieldname": "client_information", - "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Client Information", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "collapsible": 1, + "collapsible_depends_on": "eval:doc.social_login_provider===\"Custom\"", + "fieldname": "client_information", + "fieldtype": "Section Break", + "label": "Client Information" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "api_endpoint_args", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "API Endpoint Args", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "api_endpoint_args", + "fieldtype": "Code", + "label": "API Endpoint Args" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "auth_url_data", - "fieldtype": "Code", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Auth URL Data", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldname": "auth_url_data", + "fieldtype": "Code", + "label": "Auth URL Data" + }, + { + "depends_on": "eval:doc.social_login_provider===\"Custom\"", + "fieldname": "user_id_property", + "fieldtype": "Data", + "label": "User ID Property" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-09-15 09:00:00.000000", - "modified_by": "Administrator", - "module": "Integrations", - "name": "Social Login Key", - "name_case": "", - "owner": "Administrator", + ], + "modified": "2019-12-03 12:35:55.115260", + "modified_by": "Administrator", + "module": "Integrations", + "name": "Social Login Key", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "provider_name", - "track_changes": 1, - "track_seen": 0 -} + ], + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "provider_name", + "track_changes": 1 +} \ No newline at end of file From 65402bc2fa8413387e3427bf883fe39d8ebb5027 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Tue, 3 Dec 2019 15:27:10 +0530 Subject: [PATCH 173/226] tests: fix results being return --- frappe/tests/test_global_search.py | 2 +- frappe/utils/global_search.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/tests/test_global_search.py b/frappe/tests/test_global_search.py index 3fcf1fe9ed..01067c85dd 100644 --- a/frappe/tests/test_global_search.py +++ b/frappe/tests/test_global_search.py @@ -80,7 +80,7 @@ class TestGlobalSearch(unittest.TestCase): make_property_setter(doctype, "repeat_on", "in_global_search", 1, "Int") global_search.rebuild_for_doctype(doctype) results = global_search.search('Monthly') - self.assertEqual(len(results), 2) + self.assertEqual(len(results), 3) def test_delete_doc(self): self.insert_test_events() diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 48fd719f3b..b934195863 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -478,7 +478,7 @@ def search(text, start=0, limit=20, doctype=""): sorted_results.extend([r]) - return sorted_results or results + return sorted_results @frappe.whitelist(allow_guest=True) def web_search(text, scope=None, start=0, limit=20): From bc577d5a9f1f0c35f592f8ce21fa7897447ae83d Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 3 Dec 2019 16:09:30 +0530 Subject: [PATCH 174/226] fix: don't set filter for restrict_to_domain in Bulk Update Tool --- frappe/desk/doctype/bulk_update/bulk_update.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/desk/doctype/bulk_update/bulk_update.js b/frappe/desk/doctype/bulk_update/bulk_update.js index fec853ca98..bb9cf2af51 100644 --- a/frappe/desk/doctype/bulk_update/bulk_update.js +++ b/frappe/desk/doctype/bulk_update/bulk_update.js @@ -7,8 +7,7 @@ frappe.ui.form.on('Bulk Update', { return { filters: [ ['DocType', 'issingle', '=', 0], - ['DocType', 'name', 'not in', frappe.model.core_doctypes_list], - ['DocType', 'restrict_to_domain', 'in', frappe.boot.active_domains] + ['DocType', 'name', 'not in', frappe.model.core_doctypes_list] ] }; }); From c06be49f6c83377fe2c695f6e6c45c39acd5c79d Mon Sep 17 00:00:00 2001 From: DeeMysterio Date: Tue, 3 Dec 2019 16:58:33 +0530 Subject: [PATCH 175/226] feat(tags): accept click to enter tags (#8826) * feat(tags): accept click to enter tags * fix: refactor code * fix: refactor code * style: Fix Codacy --- frappe/public/js/frappe/ui/tags.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js index f549aaae5c..d6c85bb043 100644 --- a/frappe/public/js/frappe/ui/tags.js +++ b/frappe/public/js/frappe/ui/tags.js @@ -34,13 +34,17 @@ frappe.ui.Tags = class { } bind() { + const me = this; + const select_tag = function() { + const tagValue = frappe.utils.xss_sanitise(me.$input.val()); + me.addTag(tagValue); + me.$input.val(''); + } + this.$input.keypress((e) => { - if(e.which == 13 || e.keyCode == 13) { - const tagValue = frappe.utils.xss_sanitise(this.$input.val()); - this.addTag(tagValue); - this.$input.val(''); - } + if (e.which == 13 || e.keyCode == 13) select_tag(); }); + this.$input.focusout(select_tag); this.$input.on('blur', () => { this.deactivate(); From 8b746287700098d95960a1dca21e34aa5174c704 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 4 Dec 2019 11:27:30 +0530 Subject: [PATCH 176/226] fix: Color not working in the calendar --- frappe/public/js/frappe/views/calendar/calendar.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index b84d37cff4..71ac175ba0 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -308,6 +308,7 @@ frappe.views.Calendar = Class.extend({ doctype: this.doctype, start: this.get_system_datetime(start), end: this.get_system_datetime(end), + fields: this.fields, filters: this.list_view.filter_area.get(), field_map: this.field_map }; @@ -356,9 +357,13 @@ frappe.views.Calendar = Class.extend({ prepare_colors: function(d) { let color, color_name; if(this.get_css_class) { - color_name = this.color_map[this.get_css_class(d)]; - color_name = frappe.ui.color.validate_hex(color_name) ? - color_name : 'blue'; + color_name = this.color_map[this.get_css_class(d)] || 'blue'; + + if (color_name.startsWith("#")) { + color_name = frappe.ui.color.validate_hex(color_name) ? + color_name : 'blue'; + } + d.backgroundColor = frappe.ui.color.get(color_name, 'extra-light'); d.textColor = frappe.ui.color.get(color_name, 'dark'); } else { From 146c4d46cb88674558737e63f4f77b1b07c702a9 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 4 Dec 2019 11:59:35 +0530 Subject: [PATCH 177/226] fix: change function name to go_to_last_page_to_add_row --- frappe/public/js/frappe/form/grid.js | 4 ++-- frappe/public/js/frappe/form/grid_pagination.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 3175995e1e..38818b18aa 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -569,7 +569,7 @@ export default class Grid { add_new_row(idx, callback, show, copy_doc, go_to_last_page=false) { if (this.is_editable()) { if (go_to_last_page) { - this.grid_pagination.go_to_last_page(); + this.grid_pagination.go_to_last_page_to_add_row(); } if (this.frm) { var d = frappe.model.add_child(this.frm.doc, this.df.options, this.df.fieldname, idx); @@ -748,7 +748,7 @@ export default class Grid { target: this, txt: "" }); - this.grid_pagination.go_to_last_page(); + this.grid_pagination.go_to_last_page_to_add_row(); return false; }); this.multiple_set = true; diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index 80cf5502a0..8884c772ab 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -44,7 +44,7 @@ export default class GridPagination { }); this.last_page_button.on('click', () => { - this.go_to_last_page(); + this.go_to_page(this.total_pages); }); } @@ -112,7 +112,7 @@ export default class GridPagination { this.update_page_numbers(); } - go_to_last_page() { + go_to_last_page_to_add_row() { let total_pages = this.total_pages; let page_length = this.page_length; if (this.grid.data.length == page_length*total_pages) { From 5414f1897f5c756da8e7191300d19ed07387f976 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 4 Dec 2019 12:41:42 +0530 Subject: [PATCH 178/226] fix: query report chart options --- frappe/public/js/frappe/views/reports/query_report.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index a7505ff8f3..431b482173 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -507,6 +507,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { }) }; } + options.axisOptions = { + shortenYAxisNumbers: 1 + } return options; } @@ -561,7 +564,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { get_possible_chart_options() { const columns = this.columns; const rows = this.raw_data.result.filter(value => Object.keys(value).length); - const first_row = Array.isArray(rows[0]) ? rows[0] : Object.values(rows[0]); + const first_row = Array.isArray(rows[0]) ? rows[0] : columns.map(col => rows[0][col.fieldname]); const me = this const indices = first_row.reduce((accumulator, current_value, current_index) => { From 71b398c7c6e496b5e028bea461f807660bd25555 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 4 Dec 2019 13:11:03 +0530 Subject: [PATCH 179/226] style: aded semi colon --- frappe/public/js/frappe/views/reports/query_report.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 431b482173..0771306298 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -509,7 +509,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } options.axisOptions = { shortenYAxisNumbers: 1 - } + }; return options; } From d9bbd103822bc45d4a3b257e955cd39a4c9fe0bd Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 15:59:38 +0530 Subject: [PATCH 180/226] fix: added a 'Continue' type slide --- .../onboarding_slide/onboarding_slide.json | 34 +++++----- .../onboarding_slide/onboarding_slide.py | 68 ++++++++++++++----- .../company_letter_head.json | 5 +- frappe/public/js/frappe/desk.js | 5 -- .../public/js/frappe/ui/onboarding_dialog.js | 27 +++++++- 5 files changed, 95 insertions(+), 44 deletions(-) diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.json b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json index c5497070ed..3f6f0d719f 100644 --- a/frappe/desk/doctype/onboarding_slide/onboarding_slide.json +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.json @@ -15,7 +15,6 @@ "slide_desc", "action_section_break", "slide_type", - "submit_method", "column_break_6", "max_count", "add_more_button", @@ -25,7 +24,8 @@ "section_break_10", "domains", "column_break_12", - "help_links" + "help_links", + "is_completed" ], "fields": [ { @@ -36,13 +36,6 @@ "reqd": 1, "unique": 1 }, - { - "depends_on": "eval:doc.slide_type!='Information'", - "description": "By default the code inside `create_onboarding_docs` method of the `Reference Document Type` is executed. If your method is not on the doctype level, place this method in {app_name}.utilities.onboarding_utils.{method_name} and specify the method name here", - "fieldname": "submit_method", - "fieldtype": "Data", - "label": "Submit Method" - }, { "fieldname": "slide_desc", "fieldtype": "HTML Editor", @@ -58,13 +51,13 @@ }, { "default": "0", - "depends_on": "eval:doc.slide_type!='Information'", + "depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'", "fieldname": "add_more_button", "fieldtype": "Check", "label": "Add More Button" }, { - "depends_on": "eval:doc.slide_type!='Information'", + "depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'", "fieldname": "slide_fields", "fieldtype": "Table", "label": "Slide Fields", @@ -98,11 +91,11 @@ "label": "Action Settings" }, { - "description": "If slide type is Action there should be a submit method bound to be executed after the slide is completed.", + "description": "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.", "fieldname": "slide_type", "fieldtype": "Select", "label": "Slide Type", - "options": "Information\nCreate\nSettings", + "options": "Information\nCreate\nSettings\nContinue", "reqd": 1 }, { @@ -131,7 +124,7 @@ "label": "Description" }, { - "depends_on": "eval:doc.slide_type!='Information'", + "depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'", "fieldname": "ref_doctype", "fieldtype": "Link", "label": "Reference Document Type", @@ -145,19 +138,28 @@ "label": "Slide Order" }, { - "depends_on": "eval:doc.slide_type=='Information'", + "depends_on": "eval:doc.slide_type=='Information' || doc.slide_type=='Continue'", "fieldname": "slide_module", "fieldtype": "Link", "label": "Module", "options": "Module Def" }, { + "collapsible_depends_on": "eval:doc.slide_type=='Create' || doc.slide_type=='Settings'", "fieldname": "section_break_18", "fieldtype": "Section Break", "label": "Fields" + }, + { + "default": "0", + "fieldname": "is_completed", + "fieldtype": "Check", + "hidden": 1, + "label": "Is Completed", + "print_hide": 1 } ], - "modified": "2019-12-02 16:17:17.368741", + "modified": "2019-12-04 10:50:43.528901", "modified_by": "Administrator", "module": "Desk", "name": "Onboarding Slide", diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.py b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py index 1aacab2391..7f1f3e9e7b 100644 --- a/frappe/desk/doctype/onboarding_slide/onboarding_slide.py +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py @@ -5,10 +5,15 @@ from __future__ import unicode_literals import frappe import json +from frappe import _ from frappe.model.document import Document from frappe.modules.export_file import export_to_files class OnboardingSlide(Document): + def validate(self): + if frappe.db.exists('Onboarding Slide', {'slide_type': 'Continue', 'name': ('!=', self.name)}): + frappe.throw(_("An Onboarding Slide of Slide Type Continue already exists.")) + def on_update(self): if self.ref_doctype: module = frappe.db.get_value('DocType', self.ref_doctype, 'module') @@ -18,14 +23,19 @@ class OnboardingSlide(Document): def get_onboarding_slides_as_list(): slides = [] - slide_docs = frappe.get_all('Onboarding Slide', - filters={'slide_order': ('!=', 0)}, + slide_docs = frappe.db.get_all('Onboarding Slide', + filters={'is_completed': 0}, + or_filters={'slide_order': ('!=', 0), 'slide_type': 'Continue'}, order_by='slide_order') + + # to check if continue slide is required + first_slide = get_first_slide() + for entry in slide_docs: # using get_doc because child table fields are not fetched in get_all slide_doc = frappe.get_doc('Onboarding Slide', entry.name) if frappe.scrub(slide_doc.app) in frappe.get_installed_apps(): - slides.append(frappe._dict( + slide = frappe._dict( slide_type=slide_doc.slide_type, title=slide_doc.slide_title, help=slide_doc.slide_desc, @@ -33,11 +43,16 @@ def get_onboarding_slides_as_list(): help_links=get_help_links(slide_doc), add_more=slide_doc.add_more_button, max_count=slide_doc.max_count, - submit_method=slide_doc.submit_method, image_src=get_slide_image(slide_doc), ref_doctype=slide_doc.ref_doctype, app=slide_doc.app - )) + ) + if slide.slide_type == 'Continue': + if is_continue_slide_required(first_slide): + slides.insert(0, slide) + else: + slides.append(slide) + return slides @frappe.whitelist() @@ -65,21 +80,26 @@ def get_slide_image(slide_doc): return slide_doc.image_src return None +def is_continue_slide_required(first_slide): + # check if first slide itself is not completed + if not first_slide.is_completed: + return False + + # check if there is any active slide which is not completed + return frappe.db.exists('Onboarding Slide', { + 'is_completed': 0, + 'slide_order': ('!=', 0), + 'slide_type': ('!=', 'Continue') + }) + @frappe.whitelist() -def create_onboarding_docs(values, doctype=None, submit_method=None, app=None, slide_type=None): +def create_onboarding_docs(values, doctype=None, app=None, slide_type=None): data = json.loads(values) - if submit_method: - try: - method = frappe.scrub(app) + '.utilities.onboarding_utils.' + submit_method - frappe.call(method, data) - except AttributeError: - create_generic_onboarding_doc(data, doctype, slide_type) + doc = frappe.new_doc(doctype) + if hasattr(doc, 'create_onboarding_docs'): + doc.create_onboarding_docs(data) else: - doc = frappe.new_doc(doctype) - if hasattr(doc, 'create_onboarding_docs'): - doc.create_onboarding_docs(data) - else: - create_generic_onboarding_doc(data, doctype, slide_type) + create_generic_onboarding_doc(data, doctype, slide_type) def create_generic_onboarding_doc(data, doctype, slide_type): if slide_type == 'Settings': @@ -94,4 +114,16 @@ def create_generic_onboarding_doc(data, doctype, slide_type): doc.set(entry, data.get(entry)) doc.flags.ignore_mandatory = True doc.flags.ignore_links = True - doc.insert() \ No newline at end of file + doc.insert() + +@frappe.whitelist() +def mark_slide_as_completed(slide_title): + frappe.db.set_value('Onboarding Slide', slide_title, 'is_completed', 1) + +def get_first_slide(): + slides = frappe.db.get_all('Onboarding Slide', + filters={'slide_order': ('!=', 0), 'slide_type': ('!=', 'Continue')}, + order_by='slide_order', + fields=['name', 'is_completed'] + ) + return slides[0] \ No newline at end of file diff --git a/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json b/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json index 6b4ad815e4..2f51d2e18a 100644 --- a/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json +++ b/frappe/printing/onboarding_slide/company_letter_head/company_letter_head.json @@ -14,7 +14,7 @@ "idx": 0, "image_src": "/assets/erpnext/images/illustrations/letterhead-onboard.png", "max_count": 0, - "modified": "2019-12-02 12:57:41.353913", + "modified": "2019-12-03 22:54:57.618989", "modified_by": "Administrator", "name": "Company Letter Head", "owner": "Administrator", @@ -32,6 +32,5 @@ ], "slide_order": 20, "slide_title": "Company Letter Head", - "slide_type": "Create", - "submit_method": "" + "slide_type": "Create" } \ No newline at end of file diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index ebc5973c73..dbdb698ebb 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -496,11 +496,6 @@ frappe.Application = Class.extend({ slides: slides }); me.progress_dialog.show(); - frappe.call({ - method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup", - args: {}, - callback: () => {} - }); }); } } diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index c5299e745a..be6f0fc91b 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -44,12 +44,12 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { args: { values: me.values, doctype: me.ref_doctype, - submit_method: me.submit_method, app: me.app, slide_type: me.slide_type }, callback: function() { if (me.id === me.parent[0].children.length-1) { + me.reset_is_first_startup(); $('.onboarding-dialog').modal('toggle'); frappe.msgprint({ message: __('You are all set up!'), @@ -86,11 +86,34 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { } setup_action_button() { - if (this.slide_type !== 'Information') { + if (this.slide_type === 'Create' || this.slide_type == 'Settings' || this.id === this.parent[0].children.length-1) { this.$action_button.addClass('primary'); } else { this.$action_button.removeClass('primary'); } + + this.$action_button.on('click', () => { + if (this.slide_type != 'Continue') { + this.mark_as_completed(); + } + }); + } + + mark_as_completed() { + frappe.call({ + method: 'frappe.desk.doctype.onboarding_slide.onboarding_slide.mark_slide_as_completed', + args: {slide_title: this.title}, + callback: () => {}, + freeze: true + }); + } + + reset_is_first_startup() { + frappe.call({ + method: "frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup", + args: {}, + callback: () => {} + }); } }; From 36dd074dcc8f74ba5de1710401d402e457cd595b Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 16:21:18 +0530 Subject: [PATCH 181/226] fix: added is_last_slide method in slides --- frappe/desk/doctype/onboarding_slide/onboarding_slide.js | 4 ++-- frappe/public/js/frappe/ui/onboarding_dialog.js | 6 +++--- frappe/public/js/frappe/ui/slides.js | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.js b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js index d9c210f249..dc91f42913 100644 --- a/frappe/desk/doctype/onboarding_slide/onboarding_slide.js +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.js @@ -3,8 +3,8 @@ frappe.ui.form.on('Onboarding Slide', { refresh: function(frm) { - frm.toggle_reqd('ref_doctype', frm.doc.slide_type!='Information'); - frm.toggle_reqd('slide_module', frm.doc.slide_type=='Information'); + frm.toggle_reqd('ref_doctype', (frm.doc.slide_type=='Create' || frm.doc.slide_type=='Settings')); + frm.toggle_reqd('slide_module', (frm.doc.slide_type=='Information' || frm.doc.slide_type=='Continue')); }, ref_doctype: function(frm) { diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index be6f0fc91b..a007784f58 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -26,7 +26,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { (this.id === 0) ? this.$next_btn.text(__('Let\'s Start')) : this.$next_btn.text(__('Next')); //last slide - if (this.id === this.parent[0].children.length-1) { + if (this.is_last_slide()) { this.$complete_btn.removeClass('hide').addClass('action primary'); this.$next_btn.removeClass('action primary'); this.$action_button = this.$complete_btn; @@ -48,7 +48,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { slide_type: me.slide_type }, callback: function() { - if (me.id === me.parent[0].children.length-1) { + if (me.is_last_slide()) { me.reset_is_first_startup(); $('.onboarding-dialog').modal('toggle'); frappe.msgprint({ @@ -86,7 +86,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { } setup_action_button() { - if (this.slide_type === 'Create' || this.slide_type == 'Settings' || this.id === this.parent[0].children.length-1) { + if (this.slide_type === 'Create' || this.slide_type == 'Settings' || this.is_last_slide()) { this.$action_button.addClass('primary'); } else { this.$action_button.removeClass('primary'); diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index ceeadb09fa..d1c34faf6c 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -182,6 +182,13 @@ frappe.ui.Slide = class Slide { }); } + is_last_slide() { + if (this.id === this.parent[0].children.length-1) { + return true; + } + return false; + } + before_show() { } show_slide() { From a8076cfefeeef51e622e9c9888538a124da3bdbc Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 17:11:29 +0530 Subject: [PATCH 182/226] feat: added validation for slide with same order --- frappe/desk/doctype/onboarding_slide/onboarding_slide.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/onboarding_slide/onboarding_slide.py b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py index 7f1f3e9e7b..8c75d10b9a 100644 --- a/frappe/desk/doctype/onboarding_slide/onboarding_slide.py +++ b/frappe/desk/doctype/onboarding_slide/onboarding_slide.py @@ -11,8 +11,13 @@ from frappe.modules.export_file import export_to_files class OnboardingSlide(Document): def validate(self): - if frappe.db.exists('Onboarding Slide', {'slide_type': 'Continue', 'name': ('!=', self.name)}): - frappe.throw(_("An Onboarding Slide of Slide Type Continue already exists.")) + if self.slide_type == 'Continue' and frappe.db.exists('Onboarding Slide', {'slide_type': 'Continue', 'name': ('!=', self.name)}): + frappe.throw(_('An Onboarding Slide of Slide Type Continue already exists.')) + + if self.slide_order: + same_order_slide = frappe.db.exists('Onboarding Slide', {'slide_order': self.slide_order, 'name': ('!=', self.name)}) + if same_order_slide: + frappe.throw(_('An Onboarding Slide {0} with the same slide order already exists').format(same_order_slide)) def on_update(self): if self.ref_doctype: From 74fe3c71f719c81d1589567abdeb69622aa6cbdc Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 17:20:22 +0530 Subject: [PATCH 183/226] feat: style only onboarding wizard --- frappe/public/js/frappe/ui/onboarding_dialog.js | 10 ++++++++++ frappe/public/js/frappe/ui/slides.js | 8 +------- frappe/public/less/desk.less | 12 ++++++------ 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index a007784f58..b8e0db893c 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -22,6 +22,16 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { } } + setup_form() { + super.setup_form(); + const fields = this.get_atomic_fields() + if (fields.length == 1) { + this.$form_wrapper.addClass("text-center"); + } else { + this.$form_wrapper.removeClass("text-center"); + } + } + before_show() { (this.id === 0) ? this.$next_btn.text(__('Let\'s Start')) : this.$next_btn.text(__('Next')); diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index d1c34faf6c..3212b1af48 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -58,18 +58,12 @@ frappe.ui.Slide = class Slide { } setup_form() { - const fields = this.get_atomic_fields() this.form = new frappe.ui.FieldGroup({ - fields: fields, + fields: this.get_atomic_fields(), body: this.$form[0], no_submit_on_enter: true }); this.form.make(); - if (fields.length == 1 ) { - this.$form_wrapper.addClass("text-center"); - } else { - this.$form_wrapper.removeClass("text-center"); - } if(this.add_more) this.bind_more_button(); this.set_reqd_fields(); diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index cbc63886ec..0a8062efa2 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -898,12 +898,6 @@ input[type="checkbox"] { outline: none; } - .slide-body { - width: 65%; - margin-right: auto; - margin-left: auto; - } - .fa-circle { font-size: 10px; margin: 0px 2px; @@ -970,6 +964,12 @@ input[type="checkbox"] { // Onboarding Dialog .onboarding-dialog { + .slide-body { + width: 65%; + margin-right: auto; + margin-left: auto; + } + .modal-dialog { width: 50%; height: 80%; From 0b19bc3790c90799d60a56c8c71071379503b808 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 17:56:05 +0530 Subject: [PATCH 184/226] refactor: simplified calls --- frappe/public/js/frappe/desk.js | 10 ++--- .../public/js/frappe/ui/onboarding_dialog.js | 44 ++++++++----------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index dbdb698ebb..c67325181a 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -486,17 +486,15 @@ frappe.Application = Class.extend({ }, setup_onboarding_wizard: () => { - var me = this; frappe.call('frappe.desk.doctype.onboarding_slide.onboarding_slide.get_onboarding_slides').then(res => { if (res.message) { let slides = res.message; if (slides.length) { - frappe.require("assets/frappe/js/frappe/ui/onboarding_dialog.js", () => { - me.progress_dialog = new frappe.setup.OnboardingDialog({ - slides: slides - }); - me.progress_dialog.show(); + this.progress_dialog = new frappe.setup.OnboardingDialog({ + slides: slides }); + this.progress_dialog.show(); + frappe.call('frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup'); } } }); diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index b8e0db893c..d37882a8f0 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -45,33 +45,27 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { } primary_action() { - let me = this; if (this.set_values()) { this.$action_button.addClass('disabled'); - if (me.add_more) me.values.max_count = me.max_count; - frappe.call({ - method: 'frappe.desk.doctype.onboarding_slide.onboarding_slide.create_onboarding_docs', - args: { - values: me.values, - doctype: me.ref_doctype, - app: me.app, - slide_type: me.slide_type - }, - callback: function() { - if (me.is_last_slide()) { - me.reset_is_first_startup(); - $('.onboarding-dialog').modal('toggle'); - frappe.msgprint({ - message: __('You are all set up!'), - indicator: 'green', - title: __('Success') - }); - } - }, - onerror: function() { - me.slides_footer.find('.primary').removeClass('disabled'); - }, - freeze: true + const primary_method = 'frappe.desk.doctype.onboarding_slide.onboarding_slide.create_onboarding_docs'; + if (this.add_more) { + this.values.max_count = this.max_count; + } + frappe.call(primary_method, { + values: this.values, + doctype: this.ref_doctype, + app: this.app, + slide_type: this.slide_type + }).then(() => { + if (this.is_last_slide()) { + this.reset_is_first_startup(); + $('.onboarding-dialog').modal('toggle'); + frappe.msgprint({ + message: __('You are all set up!'), + indicator: 'green', + title: __('Success') + }); + } }); } } From e1454c20ecb207345829c26788e3cd05da559477 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 18:19:15 +0530 Subject: [PATCH 185/226] fix: codacy fixes --- .../public/js/frappe/ui/onboarding_dialog.js | 2 +- frappe/public/js/frappe/ui/slides.js | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frappe/public/js/frappe/ui/onboarding_dialog.js b/frappe/public/js/frappe/ui/onboarding_dialog.js index d37882a8f0..962cf988e8 100644 --- a/frappe/public/js/frappe/ui/onboarding_dialog.js +++ b/frappe/public/js/frappe/ui/onboarding_dialog.js @@ -24,7 +24,7 @@ frappe.setup.OnboardingSlide = class OnboardingSlide extends frappe.ui.Slide { setup_form() { super.setup_form(); - const fields = this.get_atomic_fields() + const fields = this.get_atomic_fields(); if (fields.length == 1) { this.$form_wrapper.addClass("text-center"); } else { diff --git a/frappe/public/js/frappe/ui/slides.js b/frappe/public/js/frappe/ui/slides.js index 3212b1af48..19a6cf9263 100644 --- a/frappe/public/js/frappe/ui/slides.js +++ b/frappe/public/js/frappe/ui/slides.js @@ -80,14 +80,14 @@ frappe.ui.Slide = class Slide { if(this.add_more) { this.count = 1; fields = fields.map((field, i) => { - if(field.fieldname) { + if (field.fieldname) { field.fieldname += '_1'; } - if(i === 1 && this.mandatory_entry) { + if (i === 1 && this.mandatory_entry) { field.reqd = 1; } - if(!field.static) { - if(field.label) field.label; + if (!field.static) { + if (field.label) field.label; } return field; }); @@ -107,10 +107,10 @@ frappe.ui.Slide = class Slide { set_values() { this.values = this.form.get_values(); - if(this.values===null) { + if (this.values===null) { return false; } - if(this.validate && !this.validate()) { + if (this.validate && !this.validate()) { return false; } return true; @@ -124,9 +124,9 @@ frappe.ui.Slide = class Slide { var fields = JSON.parse(JSON.stringify(this.fields)); this.form.add_fields(fields.map(field => { - if(field.fieldname) field.fieldname += '_' + this.count; - if(!field.static) { - if(field.label) field.label; + if (field.fieldname) field.fieldname += '_' + this.count; + if (!field.static) { + if (field.label) field.label; } field.reqd = 0; return field; @@ -159,7 +159,7 @@ frappe.ui.Slide = class Slide { var empty_fields = this.reqd_fields.filter((field) => { return !field.get_value(); }); - if(empty_fields.length) { + if (empty_fields.length) { this.slides_footer.find('.action').addClass('disabled'); } else { this.slides_footer.find('.action').removeClass('disabled'); From 65ac0f3982fd26593943ea234f594ae71257e3d3 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 4 Dec 2019 19:30:14 +0530 Subject: [PATCH 186/226] fix: resume after reload broken --- frappe/public/js/frappe/desk.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index c67325181a..92194acdca 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -494,7 +494,6 @@ frappe.Application = Class.extend({ slides: slides }); this.progress_dialog.show(); - frappe.call('frappe.desk.page.setup_wizard.setup_wizard.reset_is_first_startup'); } } }); From c336424fa4731522ccb9b26ff7e3a9df21f3330b Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Wed, 4 Dec 2019 23:13:43 +0530 Subject: [PATCH 187/226] fix: codacy fixes --- .../doctype/global_search_settings/global_search_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py index e39bf18efe..bce41b072b 100644 --- a/frappe/desk/doctype/global_search_settings/global_search_settings.py +++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py @@ -29,7 +29,6 @@ class GlobalSearchSettings(Document): repeated_dts = (", ".join([frappe.bold(dt) for dt in repeated_dts])) frappe.throw(_("Document Type {0} has been repeated.").format(repeated_dts)) - def on_update(self): set_doctypes_for_global_search() def set_doctypes_for_global_search(): From 3b61a6cb28f393ab968ad313277946f2ba1dc61b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 6 Dec 2019 07:46:49 +0530 Subject: [PATCH 188/226] fix: Code cleanup - Pass values so that db cursor can handle escaping --- .../global_search_settings.py | 18 ++++------ frappe/utils/global_search.py | 36 +++++++++---------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py index bce41b072b..1cdbf11224 100644 --- a/frappe/desk/doctype/global_search_settings/global_search_settings.py +++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py @@ -29,20 +29,16 @@ class GlobalSearchSettings(Document): repeated_dts = (", ".join([frappe.bold(dt) for dt in repeated_dts])) frappe.throw(_("Document Type {0} has been repeated.").format(repeated_dts)) - set_doctypes_for_global_search() + # reset cache + frappe.cache().hdel('global_search', 'search_priorities') -def set_doctypes_for_global_search(): - doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC") - if not doctypes: - return [] +def get_doctypes_for_global_search(): + def get_from_db(): + doctypes = frappe.get_list("Global Search DocType", fields=["document_type"], order_by="idx ASC") + return [d.document_type for d in doctypes] or [] - priorities = [d.document_type for d in doctypes] - allowed_doctypes = ",".join(["'{0}'".format(dt) for dt in priorities]) + return frappe.cache().hget("global_search", "search_priorities", get_from_db) - frappe.cache().hset("global_search", "search_priorities", priorities) - frappe.cache().hset("global_search", "allowed_doctypes", allowed_doctypes) - - return priorities, allowed_doctypes @frappe.whitelist() def reset_global_search_settings_doctypes(): diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index b934195863..3150295ccc 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -415,37 +415,34 @@ def search(text, start=0, limit=20, doctype=""): :param limit: number of results to return, default 20 :return: Array of result objects """ - from frappe.desk.doctype.global_search_settings.global_search_settings import set_doctypes_for_global_search + from frappe.desk.doctype.global_search_settings.global_search_settings import get_doctypes_for_global_search results = [] sorted_results = [] - priorities = frappe.cache().hget("global_search", "search_priorities") - allowed_doctypes = frappe.cache().hget("global_search", "allowed_doctypes") - - if not priorities or not allowed_doctypes: - priorities, allowed_doctypes = set_doctypes_for_global_search() + allowed_doctypes = get_doctypes_for_global_search() for text in set(text.split('&')): text = text.strip() if not text: continue - mariadb_conditions = '' - postgres_conditions = '' + conditions = '1=1' offset = '' - if doctype: - mariadb_conditions = postgres_conditions = '`doctype` = {} AND '.format(frappe.db.escape(doctype)) - mariadb_text = frappe.db.escape('+' + text + '*') mariadb_fields = '`doctype`, `name`, `content`, MATCH (`content`) AGAINST ({} IN BOOLEAN MODE) AS rank'.format(mariadb_text) postgres_fields = '`doctype`, `name`, `content`, TO_TSVECTOR("content") @@ PLAINTO_TSQUERY({}) AS rank'.format(frappe.db.escape(text)) - if allowed_doctypes: - mariadb_conditions += '`doctype` IN ({})'.format(allowed_doctypes) - postgres_conditions += '`doctype` IN ({})'.format(allowed_doctypes) + values = {} + + if doctype: + conditions = '`doctype` = %(doctype)s' + values['doctype'] = doctype + elif allowed_doctypes: + conditions = '`doctype` IN %(allowed_doctypes)s' + values['allowed_doctypes'] = allowed_doctypes if int(start) > 0: offset = 'OFFSET {}'.format(start) @@ -460,15 +457,16 @@ def search(text, start=0, limit=20, doctype=""): """ result = frappe.db.multisql({ - 'mariadb': common_query.format(fields=mariadb_fields, conditions=mariadb_conditions, limit=limit, offset=offset), - 'postgres': common_query.format(fields=postgres_fields, conditions=postgres_conditions, limit=limit, offset=offset) - }, as_dict=True) + 'mariadb': common_query.format(fields=mariadb_fields, conditions=conditions, limit=limit, offset=offset), + 'postgres': common_query.format(fields=postgres_fields, conditions=conditions, limit=limit, offset=offset) + }, values=values, as_dict=True) results.extend(result) - for priority in priorities: + # sort results based on allowed_doctype's priority + for doctype in allowed_doctypes: for index, r in enumerate(results): - if r.doctype == priority and r.rank > 0.0: + if r.doctype == doctype and r.rank > 0.0: try: meta = frappe.get_meta(r.doctype) if meta.image_field: From 10701738d85d1a1d9bd4d79f2f2bac58d51567b1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Fri, 6 Dec 2019 08:29:02 +0530 Subject: [PATCH 189/226] fix: Convert list to tuple --- frappe/utils/global_search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 3150295ccc..7012b737c0 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -442,7 +442,7 @@ def search(text, start=0, limit=20, doctype=""): values['doctype'] = doctype elif allowed_doctypes: conditions = '`doctype` IN %(allowed_doctypes)s' - values['allowed_doctypes'] = allowed_doctypes + values['allowed_doctypes'] = tuple(allowed_doctypes) if int(start) > 0: offset = 'OFFSET {}'.format(start) From 59d6be6446d7a9ea572e45b8d78b40ace37ff632 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 6 Dec 2019 09:21:24 +0530 Subject: [PATCH 190/226] fix: revert changes made to get_default_address function --- frappe/contacts/doctype/address/address.py | 5 +---- frappe/public/js/frappe/ui/notifications/notifications.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py index 40b5f55fa6..dfe02edee4 100644 --- a/frappe/contacts/doctype/address/address.py +++ b/frappe/contacts/doctype/address/address.py @@ -77,7 +77,7 @@ class Address(Document): return False @frappe.whitelist() -def get_default_address(doctype, name, sort_key='is_primary_address', existing_address=None): +def get_default_address(doctype, name, sort_key='is_primary_address'): '''Returns default Address name for the given doctype, name''' if sort_key not in ['is_shipping_address', 'is_primary_address']: return None @@ -91,9 +91,6 @@ def get_default_address(doctype, name, sort_key='is_primary_address', existing_a dl.link_name = %s and ifnull(addr.disabled, 0) = 0 """ %(sort_key, '%s', '%s'), (doctype, name)) - if existing_address: - if existing_address in [d[0] for d in out]: - return existing_address if out: return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(y[1], x[1])))[0][0] diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js index 2420d6772e..76da0593a3 100644 --- a/frappe/public/js/frappe/ui/notifications/notifications.js +++ b/frappe/public/js/frappe/ui/notifications/notifications.js @@ -49,7 +49,7 @@ frappe.ui.Notifications = class Notifications { this.get_notifications_list(this.max_length).then(list => { this.dropdown_items = list; this.render_notifications_dropdown(); - if (this.notifications_settings.seen == 0) { + if (this.notification_settings && this.notifications_settings.seen == 0) { this.$notification_indicator.show(); } }); From b4bff1d0096166037f672cdd086b370e9b995225 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 6 Dec 2019 09:23:48 +0530 Subject: [PATCH 191/226] fix: Remove changes in notifications --- frappe/contacts/doctype/address/address.py | 1 - frappe/public/js/frappe/ui/notifications/notifications.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py index dfe02edee4..75fd0ad8c6 100644 --- a/frappe/contacts/doctype/address/address.py +++ b/frappe/contacts/doctype/address/address.py @@ -91,7 +91,6 @@ def get_default_address(doctype, name, sort_key='is_primary_address'): dl.link_name = %s and ifnull(addr.disabled, 0) = 0 """ %(sort_key, '%s', '%s'), (doctype, name)) - if out: return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(y[1], x[1])))[0][0] else: diff --git a/frappe/public/js/frappe/ui/notifications/notifications.js b/frappe/public/js/frappe/ui/notifications/notifications.js index 76da0593a3..2420d6772e 100644 --- a/frappe/public/js/frappe/ui/notifications/notifications.js +++ b/frappe/public/js/frappe/ui/notifications/notifications.js @@ -49,7 +49,7 @@ frappe.ui.Notifications = class Notifications { this.get_notifications_list(this.max_length).then(list => { this.dropdown_items = list; this.render_notifications_dropdown(); - if (this.notification_settings && this.notifications_settings.seen == 0) { + if (this.notifications_settings.seen == 0) { this.$notification_indicator.show(); } }); From 84d8db2dffcc6990e8fb37781d112ce96e6eb0a7 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 6 Dec 2019 11:43:02 +0530 Subject: [PATCH 192/226] fix: fix ambiguous column error when going to next doc --- frappe/desk/form/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/form/utils.py b/frappe/desk/form/utils.py index 6676bd1908..cf2a8f0879 100644 --- a/frappe/desk/form/utils.py +++ b/frappe/desk/form/utils.py @@ -105,7 +105,7 @@ def get_next(doctype, value, prev, filters, sort_order, sort_field): res = frappe.get_list(doctype, fields = ["name"], filters = filters, - order_by = sort_field + " " + sort_order, + order_by = "`tab{0}`.{1}".format(doctype, sort_field) + " " + sort_order, limit_start=0, limit_page_length=1, as_list=True) if not res: From e07f5ffafe32d98ce14bf4b461e1144896961411 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 6 Dec 2019 12:29:09 +0530 Subject: [PATCH 193/226] fix: spacing Co-Authored-By: Shivam Mishra --- frappe/model/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/model/sync.py b/frappe/model/sync.py index 0c9c464695..c489f2dde8 100644 --- a/frappe/model/sync.py +++ b/frappe/model/sync.py @@ -73,7 +73,7 @@ def get_doc_files(files, start_path, force=0, sync_everything = False, verbose=F # load in sequence - warning for devs document_types = ['doctype', 'page', 'report', 'dashboard_chart_source', 'print_format', 'website_theme', 'web_form', 'notification', 'print_style', - 'data_migration_mapping', 'data_migration_plan', 'onboarding_slide'] + 'data_migration_mapping', 'data_migration_plan', 'onboarding_slide'] for doctype in document_types: doctype_path = os.path.join(start_path, doctype) if os.path.exists(doctype_path): From 54e55380657a97540fcdd12041d6621881fc87e0 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 6 Dec 2019 15:18:54 +0530 Subject: [PATCH 194/226] fix: patch --- frappe/patches/v11_0/drop_column_apply_user_permissions.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/patches/v11_0/drop_column_apply_user_permissions.py b/frappe/patches/v11_0/drop_column_apply_user_permissions.py index 4f46bc0907..fd1a975eaf 100644 --- a/frappe/patches/v11_0/drop_column_apply_user_permissions.py +++ b/frappe/patches/v11_0/drop_column_apply_user_permissions.py @@ -10,6 +10,7 @@ def execute(): if column in frappe.db.get_table_columns(doctype): frappe.db.sql("alter table `tab{0}` drop column {1}".format(doctype, column)) + frappe.reload_doc('core', 'doctype', 'doctype_link', force=True) frappe.reload_doc('core', 'doctype', 'docperm', force=True) frappe.reload_doc('core', 'doctype', 'custom_docperm', force=True) From 8590ff04770b12e2b581a49866ea99c92791dff9 Mon Sep 17 00:00:00 2001 From: Rohan Bansal Date: Fri, 6 Dec 2019 15:20:10 +0530 Subject: [PATCH 195/226] fix: add default role on sign up via SSO --- frappe/utils/oauth.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/utils/oauth.py b/frappe/utils/oauth.py index 79bcee7a74..969623c369 100644 --- a/frappe/utils/oauth.py +++ b/frappe/utils/oauth.py @@ -283,6 +283,12 @@ def update_oauth_user(user, data, provider): if save: user.flags.ignore_permissions = True user.flags.no_welcome_mail = True + + # set default signup role as per Portal Settings + default_role = frappe.db.get_single_value("Portal Settings", "default_role") + if default_role: + user.add_roles(default_role) + user.save() def get_first_name(data): From e6664bfba9e5e8c248106dfb065457eef7cabf89 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 6 Dec 2019 16:13:10 +0530 Subject: [PATCH 196/226] fix: scheduler log cold start --- .../scheduled_job_type/scheduled_job_type.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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 38123cea33..5d5bd35eec 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -23,7 +23,6 @@ class ScheduledJobType(Document): def enqueue(self): # enqueue event if last execution is done if self.is_event_due(): - self.update_last_execution() if frappe.flags.enqueued_jobs: frappe.flags.enqueued_jobs.append(self.method) @@ -39,11 +38,8 @@ class ScheduledJobType(Document): def is_event_due(self, current_time = None): '''Return true if event is due based on time lapsed since last execution''' - # save last execution in expected execution time as per cron - self.last_execution = self.get_next_execution() - # if the next scheduled event is before NOW, then its due! - return self.last_execution <= (current_time or now_datetime()) + return self.get_next_execution() <= (current_time or now_datetime()) def is_job_in_queue(self): queued_jobs = get_jobs(site=frappe.local.site, key='job_type')[frappe.local.site] @@ -68,7 +64,7 @@ class ScheduledJobType(Document): self.cron_format = CRON_MAP[self.frequency] return croniter(self.cron_format, - get_datetime(self.last_execution)).get_next(datetime) + get_datetime(self.last_execution or datetime(2000, 1, 1))).get_next(datetime) def execute(self): self.scheduler_log = None @@ -94,15 +90,16 @@ class ScheduledJobType(Document): self.scheduler_log.db_set('status', status) if status == 'Failed': self.scheduler_log.db_set('details', frappe.get_traceback()) - frappe.db.commit() - - def update_last_execution(self): - self.db_set('last_execution', self.last_execution, update_modified=False) + if status == 'Start': + self.db_set('last_execution', now_datetime(), update_modified=False) frappe.db.commit() def get_queue_name(self): return 'long' if ('Long' in self.frequency) else 'default' + def on_trash(self): + frappe.db.sql('delete from `tabScheduled Job Log` where scheduled_job_type=%s', self.name) + @frappe.whitelist() def execute_event(doc): frappe.only_for('System Manager') From 2d4d8538880562b0039f2a081db0a74cb9a902df Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 6 Dec 2019 17:09:31 +0530 Subject: [PATCH 197/226] test: list view child table filter with created by filter --- frappe/tests/test_listview.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_listview.py b/frappe/tests/test_listview.py index 5c0657e9ee..3a73301608 100644 --- a/frappe/tests/test_listview.py +++ b/frappe/tests/test_listview.py @@ -6,7 +6,7 @@ import unittest import frappe import json -from frappe.desk.listview import get_list_settings, set_list_settings +from frappe.desk.listview import get_list_settings, set_list_settings, get_group_by_count class TestListView(unittest.TestCase): def setUp(self): @@ -51,3 +51,13 @@ class TestListView(unittest.TestCase): self.assertEqual(settings.disable_count, 0) self.assertEqual(settings.disable_sidebar_stats, 0) + def test_list_view_child_table_filter_with_created_by_filter(self): + if frappe.db.exists("Note", "Test created by filter with child table filter"): + frappe.delete_doc("Note", "Test created by filter with child table filter") + + doc = frappe.get_doc({"doctype": "Note", "title": "Test created by filter with child table filter", "public": 1}) + doc.append("seen_by", {"user": "Administrator"}) + doc.insert() + + data = {d.name: d.count for d in get_group_by_count('Note', '[["Note Seen By","user","=","Administrator"]]', 'owner')} + self.assertEqual(data['Administrator'], 1) \ No newline at end of file From 86ecf4fbc1522afe4a29eb42420b0f4cd370924d Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 6 Dec 2019 18:06:52 +0530 Subject: [PATCH 198/226] fix: patch --- frappe/patches.txt | 2 +- frappe/patches/v11_0/drop_column_apply_user_permissions.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 603df8d778..df704a1c4f 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -6,11 +6,11 @@ frappe.patches.v8_0.update_global_search_table frappe.patches.v7_0.update_auth frappe.patches.v8_0.drop_in_dialog #2017-09-22 frappe.patches.v7_2.remove_in_filter -frappe.patches.v11_0.drop_column_apply_user_permissions execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22 execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20 execute:frappe.reload_doc('core', 'doctype', 'doctype_action', force=True) #2019-09-23 execute:frappe.reload_doc('core', 'doctype', 'doctype_link', force=True) #2019-09-23 +frappe.patches.v11_0.drop_column_apply_user_permissions execute:frappe.reload_doc('core', 'doctype', 'custom_docperm') execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29 execute:frappe.reload_doc('core', 'doctype', 'comment') diff --git a/frappe/patches/v11_0/drop_column_apply_user_permissions.py b/frappe/patches/v11_0/drop_column_apply_user_permissions.py index fd1a975eaf..4f46bc0907 100644 --- a/frappe/patches/v11_0/drop_column_apply_user_permissions.py +++ b/frappe/patches/v11_0/drop_column_apply_user_permissions.py @@ -10,7 +10,6 @@ def execute(): if column in frappe.db.get_table_columns(doctype): frappe.db.sql("alter table `tab{0}` drop column {1}".format(doctype, column)) - frappe.reload_doc('core', 'doctype', 'doctype_link', force=True) frappe.reload_doc('core', 'doctype', 'docperm', force=True) frappe.reload_doc('core', 'doctype', 'custom_docperm', force=True) From f772e6ab224325bbc7a74f3341018fb7284c2c69 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 6 Dec 2019 18:22:46 +0530 Subject: [PATCH 199/226] fix: patch --- frappe/patches.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index df704a1c4f..90abc8c31d 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -6,10 +6,10 @@ frappe.patches.v8_0.update_global_search_table frappe.patches.v7_0.update_auth frappe.patches.v8_0.drop_in_dialog #2017-09-22 frappe.patches.v7_2.remove_in_filter -execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22 -execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20 execute:frappe.reload_doc('core', 'doctype', 'doctype_action', force=True) #2019-09-23 execute:frappe.reload_doc('core', 'doctype', 'doctype_link', force=True) #2019-09-23 +execute:frappe.reload_doc('core', 'doctype', 'doctype', force=True) #2017-09-22 +execute:frappe.reload_doc('core', 'doctype', 'docfield', force=True) #2018-02-20 frappe.patches.v11_0.drop_column_apply_user_permissions execute:frappe.reload_doc('core', 'doctype', 'custom_docperm') execute:frappe.reload_doc('core', 'doctype', 'docperm') #2018-05-29 From 196b2ad2549ba65dfeb5e72ac8e6cb3f09639373 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 6 Dec 2019 22:43:49 +0530 Subject: [PATCH 200/226] fix: use get_status for rq job status job.status has been replaced with job.get_status() in the latest release (1.0) https://github.com/rq/rq/releases/tag/v1.0 Signed-off-by: Chinmay D. Pai --- frappe/core/page/background_jobs/background_jobs.html | 2 +- frappe/core/page/background_jobs/background_jobs.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/core/page/background_jobs/background_jobs.html b/frappe/core/page/background_jobs/background_jobs.html index c5d598ccd3..08177ecf8a 100644 --- a/frappe/core/page/background_jobs/background_jobs.html +++ b/frappe/core/page/background_jobs/background_jobs.html @@ -11,7 +11,7 @@ {% for j in jobs %} - {{ j.queue.split(".").slice(-1)[0] }} + {{ j.queue.split(".").slice(-1)[0] }}
    {{ frappe.utils.encode_tags(j.job_name) }} diff --git a/frappe/core/page/background_jobs/background_jobs.py b/frappe/core/page/background_jobs/background_jobs.py index 10cb7b97ac..c8a2352968 100644 --- a/frappe/core/page/background_jobs/background_jobs.py +++ b/frappe/core/page/background_jobs/background_jobs.py @@ -29,9 +29,9 @@ def get_info(show_failed=False): jobs.append({ 'job_name': j.kwargs.get('kwargs', {}).get('playbook_method') \ or str(j.kwargs.get('job_name')), - 'status': j.status, 'queue': name, + 'status': j.get_status(), 'queue': name, 'creation': format_datetime(convert_utc_to_user_timezone(j.created_at)), - 'color': colors[j.status] + 'color': colors[j.get_status()] }) if j.exc_info: jobs[-1]['exc_info'] = j.exc_info From 80f87a37fb5d97d06c8c73287cb952f4dc0b185c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sat, 7 Dec 2019 12:50:23 +0530 Subject: [PATCH 201/226] fix: not able to download XML file --- frappe/utils/response.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 8169986e44..1dfbbe5516 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -210,7 +210,7 @@ def send_private_file(path): blacklist = ['.svg', '.html', '.htm', '.xml'] if extension.lower() in blacklist: - response.headers.add(b'Content-Disposition', b'attachment', filename=filename.encode("utf-8")) + response.headers.add('Content-Disposition', 'attachment', filename=filename.encode("utf-8")) response.mimetype = mimetypes.guess_type(filename)[0] or 'application/octet-stream' From 35024c18fc86d51e0e414068c3494510d2ad14e3 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Sat, 7 Dec 2019 19:00:54 +0530 Subject: [PATCH 202/226] fix(security): invalidate reset_password_key on password reset currently there is no way to invalidate reset_password_key on updating password through the user settings. so whenever the user sets a new password we'll invalidate the reset_password_key, so that existing links to reset user passwords cannot be used. Signed-off-by: Chinmay D. Pai --- frappe/core/doctype/user/user.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 7de2bb20e5..35495954b4 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -97,7 +97,9 @@ class User(Document): self.share_with_self() clear_notifications(user=self.name) frappe.clear_cache(user=self.name) - self.send_password_notification(self.__new_password) + if self.__new_password: + self.send_password_notification(self.__new_password) + self.reset_password_key = '' create_contact(self, ignore_mandatory=True) if self.name not in ('Administrator', 'Guest') and not self.user_image: frappe.enqueue('frappe.core.doctype.user.user.update_gravatar', name=self.name) @@ -1071,4 +1073,4 @@ def generate_keys(user): user_details.save() return {"api_secret": api_secret} - frappe.throw(frappe._("Not Permitted"), frappe.PermissionError) \ No newline at end of file + frappe.throw(frappe._("Not Permitted"), frappe.PermissionError) From ae418b90c543a05c728c4e8739c832921747a47e Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 9 Dec 2019 11:13:45 +0530 Subject: [PATCH 203/226] fix: add hourly long frequency to scheduled job type --- .../core/doctype/scheduled_job_type/scheduled_job_type.json | 4 ++-- 1 file changed, 2 insertions(+), 2 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 1aafdb47b0..e2ec921679 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.json @@ -60,7 +60,7 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Frequency", - "options": "All\nHourly\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", + "options": "All\nHourly\nHourly Long\nDaily\nDaily Long\nWeekly\nWeekly Long\nMonthly\nMonthly Long\nCron\nYearly\nAnnual", "read_only": 1, "reqd": 1 } @@ -72,7 +72,7 @@ "link_fieldname": "scheduled_job_type" } ], - "modified": "2019-09-27 12:19:23.259989", + "modified": "2019-12-09 11:10:21.259929", "modified_by": "Administrator", "module": "Core", "name": "Scheduled Job Type", From d3fecebd833535fdea1fa21245cbaf84e3b08e39 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 9 Dec 2019 11:28:44 +0530 Subject: [PATCH 204/226] feat: summary tag should have cursor pointer --- 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 0f49c43de1..d6dc56cf6c 100644 --- a/frappe/public/less/common.less +++ b/frappe/public/less/common.less @@ -28,6 +28,10 @@ p { margin: 10px 0; } +details > summary { + cursor: pointer; +} + .text-color { color: @text-color !important; } From 2477d5eb373ea52b2018b1e64fbf7f3d5f8ec9bc Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 6 Dec 2019 17:35:13 +0530 Subject: [PATCH 205/226] fix: padding for progress bar in dashboard --- frappe/public/less/form.less | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less index 9c40131067..37570a0073 100644 --- a/frappe/public/less/form.less +++ b/frappe/public/less/form.less @@ -239,6 +239,18 @@ .progress-area { padding-top: 15px; padding-bottom: 15px; + + .progress-chart { + padding-top: 20px; + } + + .progress { + margin-bottom: 5px; + } + + .progress-message { + margin-top: 0px; + } } .form-links { From 7328abe30d7e6bec6e4c5fd694922d649eea2dc2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 9 Dec 2019 18:19:02 +0530 Subject: [PATCH 206/226] fix: make padding a bit more consistent --- frappe/public/less/form.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less index 37570a0073..9a0eec46ea 100644 --- a/frappe/public/less/form.less +++ b/frappe/public/less/form.less @@ -241,7 +241,7 @@ padding-bottom: 15px; .progress-chart { - padding-top: 20px; + padding-top: 15px; } .progress { From 3bd310b2e1f02dffdbef4eb42819148287b75205 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 9 Dec 2019 18:56:40 +0530 Subject: [PATCH 207/226] fix(tests): add UI test for next previous document navigation --- cypress/integration/form.js | 27 +++++++++++++++++++++++++-- frappe/tests/ui_test_helpers.py | 18 ++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/cypress/integration/form.js b/cypress/integration/form.js index b7ddd6ecb7..5a8b85d19e 100644 --- a/cypress/integration/form.js +++ b/cypress/integration/form.js @@ -1,9 +1,15 @@ context('Form', () => { - before(() => { + beforeEach(() => { cy.login(); cy.visit('/desk'); }); - + before(() => { + cy.login(); + cy.visit('/desk'); + cy.window().its('frappe').then(frappe => { + frappe.call("frappe.tests.ui_test_helpers.create_contact_records"); + }); + }); it('create a new form', () => { cy.visit('/desk#Form/ToDo/New ToDo 1'); cy.fill_field('description', 'this is a test todo', 'Text Editor').blur(); @@ -13,4 +19,21 @@ context('Form', () => { cy.location('hash').should('eq', '#List/ToDo/List'); cy.get('.list-row').should('contain', 'this is a test todo'); }); + it('navigates between documents with child table list filters applied', () => { + cy.visit('/desk#List/Contact'); + cy.get('.tag-filters-area .btn:contains("Add Filter")').click(); + cy.get('.fieldname-select-area').should('exist'); + cy.get('.fieldname-select-area input').type('Number{enter}', { force: true }); + cy.get('.filter-field .input-with-feedback.form-control').type('123', { force: true }); + cy.get('.filter-box .btn:contains("Apply")').click({ force: true }); + cy.visit('/desk#Form/Contact/Test Form Contact 3'); + cy.get('.prev-doc').click(); + cy.get('.msgprint-dialog .modal-body').contains('No further records').should('be.visible'); + cy.get('.modal-backdrop').click(); + cy.get('.next-doc').click(); + cy.contains('Test Form Contact 2').should('not.exist'); + cy.get('.page-title .title-text').should('contain', 'Test Form Contact 1'); + cy.visit('/desk#List/Contact'); + cy.get('.clear-filters.btn').click(); + }); }); diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 8eec644115..3a58fbc379 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -73,4 +73,22 @@ def create_contact_phone_nos_records(): doc.first_name = 'Test Contact' for index in range(1000): doc.append('phone_nos', {'phone': '123456{}'.format(index)}) + doc.insert() + +@frappe.whitelist() +def create_contact_records(): + if frappe.db.get_all('Contact', {'first_name': 'Test Form Contact 1'}): + return + + insert_contact('Test Form Contact 1', '12345') + insert_contact('Test Form Contact 2', '54321') + insert_contact('Test Form Contact 3', '12345') + + +def insert_contact(first_name, phone_number): + doc = frappe.get_doc({ + 'doctype': 'Contact', + 'first_name': first_name + }) + doc.append('phone_nos', {'phone': phone_number}) doc.insert() \ No newline at end of file From d169f41a54520ab71d9fe07d17a4f6949fe957db Mon Sep 17 00:00:00 2001 From: Chinmay Pai Date: Mon, 9 Dec 2019 19:25:43 +0530 Subject: [PATCH 208/226] fix(email): try to encode email part to utf-8 (#8965) fixes issues with class objects other than str Traceback (most recent call last): File "/home/frappe/frappe-bench/apps/frappe/frappe/email/doctype/email_account/email_account.py", line 281, in receive communication = self.insert_communication(msg, args=args) File "/home/frappe/frappe-bench/apps/frappe/frappe/email/doctype/email_account/email_account.py", line 338, in insert_communication email = Email(raw) File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 372, in __init__ self.parse() File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 393, in parse self.process_part(part) File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 445, in process_part self.text_content += self.get_payload(part) File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 489, in get_payload charset = self.get_charset(part) File "/home/frappe/frappe-bench/apps/frappe/frappe/email/receive.py", line 484, in get_charset charset = chardet.detect(frappe.safe_encode(part))['encoding'] File "/home/frappe/frappe-bench/env/lib/python3.6/site-packages/chardet/__init__.py", line 34, in detect '{0}'.format(type(byte_str))) TypeError: Expected object of type bytes or bytearray, got: Signed-off-by: Chinmay D. Pai --- frappe/email/receive.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/email/receive.py b/frappe/email/receive.py index bccad1fec5..e5c8457b4e 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -456,9 +456,9 @@ class Email: def show_attached_email_headers_in_content(self, part): # get the multipart/alternative message try: - from html import escape # python 3.x + from html import escape # python 3.x except ImportError: - from cgi import escape # python 2.x + from cgi import escape # python 2.x message = list(part.walk())[1] headers = [] @@ -480,7 +480,7 @@ class Email: """Detect chartset.""" charset = part.get_content_charset() if not charset: - charset = chardet.detect(frappe.safe_encode(part))['encoding'] + charset = chardet.detect(cstr(part))['encoding'] return charset @@ -514,7 +514,7 @@ class Email: 'fcontent': fcontent, }) - cid = (part.get("Content-Id") or "").strip("><") + cid = (cstr(part.get("Content-Id")) or "").strip("><") if cid: self.cid_map[fname] = cid From 710947c66c65ffa1aef35783acab137f861ea01f Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 9 Dec 2019 20:47:06 +0530 Subject: [PATCH 209/226] fix(autocomplete): parse options (#8998) * fix(autocomplete): parse options * fix: add ignore validation flag * fix: minor change --- .../js/frappe/form/controls/autocomplete.js | 22 +++++++++++++------ .../public/js/frappe/form/sidebar/review.js | 1 + 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/autocomplete.js b/frappe/public/js/frappe/form/controls/autocomplete.js index 026cdbec25..0b31776caf 100644 --- a/frappe/public/js/frappe/form/controls/autocomplete.js +++ b/frappe/public/js/frappe/form/controls/autocomplete.js @@ -10,13 +10,7 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ set_options() { if (this.df.options) { let options = this.df.options || []; - if (typeof options === 'string') { - options = options.split('\n'); - } - if (typeof options[0] === 'string') { - options = options.map(o => ({ label: o, value: o })); - } - this._data = options; + this._data = this.parse_options(options); } }, @@ -100,6 +94,9 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ }, validate(value) { + if (this.df.ignore_validation) { + return value || ''; + } let valid_values = this.awesomplete._list.map(d => d.value); if (!valid_values.length) { return value; @@ -111,11 +108,22 @@ frappe.ui.form.ControlAutocomplete = frappe.ui.form.ControlData.extend({ } }, + parse_options(options) { + if (typeof options === 'string') { + options = options.split('\n'); + } + if (typeof options[0] === 'string') { + options = options.map(o => ({ label: o, value: o })); + } + return options; + }, + get_data() { return this._data || []; }, set_data(data) { + data = this.parse_options(data); if (this.awesomplete) { this.awesomplete.list = data; } diff --git a/frappe/public/js/frappe/form/sidebar/review.js b/frappe/public/js/frappe/form/sidebar/review.js index f4b8069a6e..e187ca4693 100644 --- a/frappe/public/js/frappe/form/sidebar/review.js +++ b/frappe/public/js/frappe/form/sidebar/review.js @@ -81,6 +81,7 @@ frappe.ui.form.Review = class Review { label: __('To User'), reqd: 1, options: user_options, + ignore_validation: 1, description: __('Only users involved in the document are listed') }, { fieldname: 'review_type', From deaa865fa89f0cfcf835e77bc2bfe449a1c5ac01 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Tue, 10 Dec 2019 09:14:40 +0530 Subject: [PATCH 210/226] fix(patch): auto commit on more than 10000 writes fixes issue where patch fails with: frappe.exceptions.ValidationError: Too many writes in one request. Please send smaller requests Signed-off-by: Chinmay D. Pai --- .../v11_0/make_all_prepared_report_attachments_private.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py index dd212d157e..f7b9e476a9 100644 --- a/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py +++ b/frappe/patches/v11_0/make_all_prepared_report_attachments_private.py @@ -3,6 +3,9 @@ import frappe def execute(): + if frappe.db.count("File", filters={"attached_to_doctype": "Prepared Report", "is_private": 0}) > 10000: + frappe.db.auto_commit_on_many_writes = True + files = frappe.get_all("File", fields=["name", "attached_to_name"], filters={"attached_to_doctype": "Prepared Report", "is_private": 0}) for file_dict in files: # For some reason Prepared Report doc might not exist, check if it exists first @@ -17,3 +20,7 @@ def execute(): else: # If Prepared Report doc doesn't exist then the file doc is useless. Delete it. frappe.delete_doc("File", file_dict.name) + + if frappe.db.auto_commit_on_many_writes: + frappe.db.auto_commit_on_many_writes = False + From 37dba69db09171fde3e697a3557084af5b422e4e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 10 Dec 2019 11:42:25 +0530 Subject: [PATCH 211/226] fix: permission error --- .../doctype/global_search_settings/global_search_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/global_search_settings/global_search_settings.py b/frappe/desk/doctype/global_search_settings/global_search_settings.py index 1cdbf11224..85c9687ab3 100644 --- a/frappe/desk/doctype/global_search_settings/global_search_settings.py +++ b/frappe/desk/doctype/global_search_settings/global_search_settings.py @@ -61,7 +61,7 @@ def update_global_search_doctypes(): if search_doctypes.get(domain): global_search_doctypes.extend(search_doctypes.get(domain)) - doctype_list = set([dt.name for dt in frappe.get_list("DocType")]) + doctype_list = set([dt.name for dt in frappe.get_all("DocType")]) allowed_in_global_search = [] for dt in global_search_doctypes: From a87ca0a6a97e376688de4c7cd423f8d21c7ed7f3 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Tue, 10 Dec 2019 15:19:46 +0530 Subject: [PATCH 212/226] fix(scheduler): import update site config --- frappe/utils/scheduler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index 7c0a642cb3..708bec887f 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -14,6 +14,7 @@ import frappe, os, time import schedule from frappe.utils import now_datetime, get_datetime from frappe.utils import get_sites +from frappe.installer import update_site_config from frappe.core.doctype.user.user import STANDARD_USERS from frappe.utils.background_jobs import get_jobs From b0622255d43a97500e0088d583159ae30e01e210 Mon Sep 17 00:00:00 2001 From: Saqib Date: Tue, 10 Dec 2019 15:50:26 +0530 Subject: [PATCH 213/226] revert: changes in currency formatting (#8996) * fix: reverted currency formatting * ux: added description for currency's number format * It doesn't have any effect on how the currency is formatted. * fix: revert json changes in currency master --- frappe/geo/doctype/currency/currency.js | 5 ----- frappe/public/js/frappe/form/controls/currency.js | 5 ----- frappe/public/js/frappe/form/controls/float.js | 9 +++------ frappe/public/js/frappe/utils/number_format.js | 5 +---- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/frappe/geo/doctype/currency/currency.js b/frappe/geo/doctype/currency/currency.js index 1bc9865999..af2d6ebc4e 100644 --- a/frappe/geo/doctype/currency/currency.js +++ b/frappe/geo/doctype/currency/currency.js @@ -7,10 +7,5 @@ frappe.ui.form.on('Currency', { if(!frm.doc.enabled) { frm.set_intro(__("This Currency is disabled. Enable to use in transactions")); } - }, - - after_save(frm) { - if (frm.doc.enabled) - locals[':Currency'][frm.doc.name] = Object.assign(frm.doc, { doctype: ':Currency' }); } }); diff --git a/frappe/public/js/frappe/form/controls/currency.js b/frappe/public/js/frappe/form/controls/currency.js index 4d6b37aede..5a50ad9de6 100644 --- a/frappe/public/js/frappe/form/controls/currency.js +++ b/frappe/public/js/frappe/form/controls/currency.js @@ -4,11 +4,6 @@ frappe.ui.form.ControlCurrency = frappe.ui.form.ControlFloat.extend({ return isNaN(parseFloat(value)) ? "" : formatted_value; }, - get_number_format: function() { - var currency = frappe.meta.get_field_currency(this.df, this.get_doc()); - return get_number_format(currency); - }, - get_precision: function() { // always round based on field precision or currency's precision // this method is also called in this.parse() diff --git a/frappe/public/js/frappe/form/controls/float.js b/frappe/public/js/frappe/form/controls/float.js index 308d970f6e..027cfebc2a 100644 --- a/frappe/public/js/frappe/form/controls/float.js +++ b/frappe/public/js/frappe/form/controls/float.js @@ -1,10 +1,7 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ parse: function(value) { value = this.eval_expression(value); - return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision(), - // While parsing currency, get_number_format passes currency's number_format - // In case of parsing float, it passes global number_format - this.get_number_format()); + return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision()); }, format_for_input: function(value) { @@ -17,8 +14,8 @@ frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ }, get_number_format: function() { - // In case of 'Float' field currency's number_format shouldn't be used for formatting - return get_number_format(); + var currency = frappe.meta.get_field_currency(this.df, this.get_doc()); + return get_number_format(currency); }, get_precision: function() { diff --git a/frappe/public/js/frappe/utils/number_format.js b/frappe/public/js/frappe/utils/number_format.js index b8a18610bd..57022b22c5 100644 --- a/frappe/public/js/frappe/utils/number_format.js +++ b/frappe/public/js/frappe/utils/number_format.js @@ -144,10 +144,7 @@ function get_currency_symbol(currency) { } function get_number_format(currency) { - let format = null; - if (currency) format = frappe.model.get_value(":Currency", currency, "number_format"); - - return format || (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.number_format) || "#,###.##"; + return (frappe.boot && frappe.boot.sysdefaults && frappe.boot.sysdefaults.number_format) || "#,###.##"; } function get_number_format_info(format) { From b3b70f3b7fcec0e7ac4e17c79569441c8fed3a50 Mon Sep 17 00:00:00 2001 From: Shridhar Date: Tue, 10 Dec 2019 16:51:41 +0530 Subject: [PATCH 214/226] Bug fixed ID value should not be set to 0 by default --- frappe/model/db_query.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 64e242d6af..f9016d7fcf 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -501,6 +501,10 @@ class DatabaseQuery(object): value = f.value or "''" fallback = "''" + elif f.fieldname == 'name': + value = f.value or "''" + fallback = "''" + else: value = flt(f.value) fallback = 0 From 90f89a754a9bdcd4782d5b09b717a4c6211d25cc Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Wed, 11 Dec 2019 21:28:59 +0530 Subject: [PATCH 215/226] fix(Leaderboard): Leaderboard timespan options (#8953) * fix: change leaderboard timespan options and add select from date option * fix: leaderboard timespan options grouping and add quarter_start and quarter_end to datetime.js * fix: codacy * fix: add last month --- frappe/desk/page/leaderboard/leaderboard.css | 8 +++ frappe/desk/page/leaderboard/leaderboard.js | 62 +++++++++++++++----- frappe/public/js/frappe/utils/datetime.js | 8 +++ 3 files changed, 64 insertions(+), 14 deletions(-) diff --git a/frappe/desk/page/leaderboard/leaderboard.css b/frappe/desk/page/leaderboard/leaderboard.css index dbe9cca5b8..a3cb4d09c4 100644 --- a/frappe/desk/page/leaderboard/leaderboard.css +++ b/frappe/desk/page/leaderboard/leaderboard.css @@ -19,6 +19,14 @@ background: #f0f4f7; } +.from-date-field .clearfix{ + display: none; +} + +.from-date-field { + margin-left: 10px; +} + .select-time:focus, .select-doctype:focus, .select-filter:focus, .select-sort:focus { background: #f0f4f7; } diff --git a/frappe/desk/page/leaderboard/leaderboard.js b/frappe/desk/page/leaderboard/leaderboard.js index 3e4c36add0..c64d2dcb4f 100644 --- a/frappe/desk/page/leaderboard/leaderboard.js +++ b/frappe/desk/page/leaderboard/leaderboard.js @@ -41,7 +41,11 @@ class Leaderboard { return field; }); } - this.timespans = ["Week", "Month", "Quarter", "Year", "All Time"]; + this.timespans = [ + "This Week", "This Month", "This Quarter", "This Year", + "Last Week", "Last Month", "Last Quarter", "Last Year", + "All Time", "Select From Date" + ]; // for saving current selected filters const _initial_doctype = frappe.get_route()[1] || this.doctypes[0]; @@ -103,7 +107,8 @@ class Leaderboard { this.timespans.map(d => { return {"label": __(d), value: d }; }) - ); + ); + this.create_from_date_field(); this.type_select = this.page.add_select(__("Field"), this.options.selected_filter.map(d => { @@ -113,7 +118,12 @@ class Leaderboard { this.timespan_select.on("change", (e) => { this.options.selected_timespan = e.currentTarget.value; - this.make_request(); + if (this.options.selected_timespan === 'Select From Date') { + this.from_date_field.show(); + } else { + this.from_date_field.hide(); + this.make_request(); + } }); this.type_select.on("change", (e) => { @@ -122,6 +132,28 @@ class Leaderboard { }); } + create_from_date_field() { + let timespan_field = $(this.parent).find(`.frappe-control[data-original-title='Timespan']`); + this.from_date_field = $(`
    `).insertAfter(timespan_field).hide(); + + let date_field = frappe.ui.form.make_control({ + df: { + fieldtype: 'Date', + fieldname: 'selected_from_date', + placeholder: frappe.datetime.month_start(), + default: frappe.datetime.month_start(), + input_class: 'input-sm', + reqd: 1, + change: () => { + this.selected_from_date = date_field.get_value(); + if (this.selected_from_date) this.make_request(); + } + }, + parent: $(this.parent).find('.from-date-field'), + render_input: 1 + }); + } + render_selected_doctype() { this.$sidebar_list.on("click", "li", (e)=> { @@ -207,7 +239,6 @@ class Leaderboard { this.leaderboard_config[this.options.selected_doctype].method, { 'from_date': this.get_from_date(), - 'timespan': this.options.selected_timespan, 'company': this.options.selected_company, 'field': this.options.selected_filter_item, 'limit': this.leaderboard_limit, @@ -360,17 +391,20 @@ class Leaderboard { get_from_date() { let timespan = this.options.selected_timespan.toLowerCase(); let current_date = frappe.datetime.now_date(); - let date = ''; - if (timespan === "month") { - date = frappe.datetime.add_months(current_date, -1); - } else if (timespan === "quarter") { - date = frappe.datetime.add_months(current_date, -3); - } else if (timespan === "year") { - date = frappe.datetime.add_months(current_date, -12); - } else if (timespan === "week") { - date = frappe.datetime.add_days(current_date, -7); + let get_from_date = { + "this week": frappe.datetime.week_start(), + "this month": frappe.datetime.month_start(), + "this quarter": frappe.datetime.quarter_start(), + "this year": frappe.datetime.year_start(), + "last week": frappe.datetime.add_days(current_date, -7), + "last month": frappe.datetime.add_months(current_date, -1), + "last quarter": frappe.datetime.add_months(current_date, -3), + "last year": frappe.datetime.add_months(current_date, -12), + "all time": "", + "select from date": this.selected_from_date || frappe.datetime.month_start() } - return date; + + return get_from_date[timespan]; } } diff --git a/frappe/public/js/frappe/utils/datetime.js b/frappe/public/js/frappe/utils/datetime.js index 8481fec5c5..12badc5353 100644 --- a/frappe/public/js/frappe/utils/datetime.js +++ b/frappe/public/js/frappe/utils/datetime.js @@ -90,6 +90,14 @@ $.extend(frappe.datetime, { return moment().endOf("month").format(); }, + quarter_start: function() { + return moment().startOf("quarter").format(); + }, + + quarter_end: function() { + return moment().endOf("quarter").format(); + }, + year_start: function(){ return moment().startOf("year").format(); }, From 80fd42aba29bd965bd711c4639dd74e13b0b67ff Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 12 Dec 2019 11:35:22 +0530 Subject: [PATCH 216/226] fix: Hidden columns should be hidden even after refresh --- frappe/public/js/frappe/views/reports/query_report.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 0771306298..c7e976306d 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -452,6 +452,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { render_datatable() { let data = this.data; + let columns = this.columns.filter((col) => !col.hidden); if (this.raw_data.add_total_row) { data = data.slice(); @@ -460,10 +461,10 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { if (this.datatable) { this.datatable.options.treeView = this.tree_report; - this.datatable.refresh(data, this.columns); + this.datatable.refresh(data, columns); } else { let datatable_options = { - columns: this.columns.filter((col) => !col.hidden), + columns: columns, data: data, inlineFilters: true, treeView: this.tree_report, From eeabcb815501270733c52b343e0ac03b2b05c0ad Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 12 Dec 2019 11:51:20 +0530 Subject: [PATCH 217/226] fix: height for null state on list view (#8997) * fix: height for null state on list view * Update list.less --- frappe/public/less/list.less | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index bd6ea7e9d0..ea292daca2 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -10,7 +10,8 @@ // To compensate for percieved centering .null-state { - height: 12em !important; + height: 15rem !important; + max-height: 150px; width: auto; } @@ -616,4 +617,4 @@ input.list-check-all, input.list-row-checkbox { .file-title { margin-top: 5px; -} \ No newline at end of file +} From 8a11fb57cd2a56c9ff28ddcc38dfeb5de019c7dd Mon Sep 17 00:00:00 2001 From: Oshosanya Michael Date: Thu, 12 Dec 2019 08:47:07 +0100 Subject: [PATCH 218/226] feat: Allow full database config on creating site (#8874) * Allow setting db port on install * Allow setting db port on install * Allow full db config on creating site * bug fix * bug fix * Escape character * Update frappe/commands/site.py allow only integer argument Co-Authored-By: Chinmay Pai * Update frappe/database/db_manager.py No need to escape integer variable Co-Authored-By: Chinmay Pai * cast port to integer to surpress pymysql error * cast port to string to surpress pymysql error * Removed type casting --- frappe/commands/site.py | 20 +++++++++++--------- frappe/database/db_manager.py | 6 ++++-- frappe/installer.py | 18 ++++++++++++------ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index e28fd36346..89e9ab7f34 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -13,6 +13,8 @@ from six import text_type @click.argument('site') @click.option('--db-name', help='Database name') @click.option('--db-type', default='mariadb', type=click.Choice(['mariadb', 'postgres']), help='Optional "postgres" or "mariadb". Default is "mariadb"') +@click.option('--db-host', help='Database Host') +@click.option('--db-port', type=int, help='Database Port') @click.option('--mariadb-root-username', default='root', help='Root username for MariaDB') @click.option('--mariadb-root-password', help='Root password for MariaDB') @click.option('--admin-password', help='Administrator password for new site', default=None) @@ -21,22 +23,22 @@ from six import text_type @click.option('--source_sql', help='Initiate database with a SQL file') @click.option('--install-app', multiple=True, help='Install app after installation') def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin_password=None, - verbose=False, install_apps=None, source_sql=None, force=None, install_app=None, - db_name=None, db_type=None): + verbose=False, install_apps=None, source_sql=None, force=None, install_app=None, + db_name=None, db_type=None, db_host=None, db_port=None): "Create a new site" frappe.init(site=site, new_site=True) _new_site(db_name, site, mariadb_root_username=mariadb_root_username, - mariadb_root_password=mariadb_root_password, admin_password=admin_password, - verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force, - db_type=db_type) + mariadb_root_password=mariadb_root_password, admin_password=admin_password, + verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force, + db_type=db_type, db_host=db_host, db_port=db_port) if len(frappe.utils.get_sites()) == 1: use(site) def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=None, - admin_password=None, verbose=False, install_apps=None, source_sql=None, force=False, - reinstall=False, db_type=None): + admin_password=None, verbose=False, install_apps=None, source_sql=None, force=False, + reinstall=False, db_type=None, db_host=None, db_port=None): """Install a new Frappe site""" if not force and os.path.exists(site): @@ -65,8 +67,8 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N installing = touch_file(get_site_path('locks', 'installing.lock')) 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_type=db_type) + db_name=db_name, admin_password=admin_password, verbose=verbose, + source_sql=source_sql, force=force, reinstall=reinstall, db_type=db_type, db_host=db_host, db_port=db_port) apps_to_install = ['frappe'] + (frappe.conf.get("install_apps") or []) + (list(install_apps) or []) for app in apps_to_install: diff --git a/frappe/database/db_manager.py b/frappe/database/db_manager.py index 0447f97273..80236b2dc2 100644 --- a/frappe/database/db_manager.py +++ b/frappe/database/db_manager.py @@ -80,12 +80,14 @@ class DbManager: if pipe: print('Creating Database...') - command = '{pipe} mysql -u {user} -p{password} -h{host} {target} {source}'.format( + command = '{pipe} mysql -u {user} -p{password} -h{host} ' + ('-P{port}' if frappe.db.port else '') + ' {target} {source}' + command = command.format( pipe=pipe, user=esc(user), password=esc(password), host=esc(frappe.db.host), target=esc(target), - source=source + source=source, + port=frappe.db.port ) os.system(command) diff --git a/frappe/installer.py b/frappe/installer.py index f691a6cb22..4b07ab8ce8 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -21,13 +21,13 @@ from frappe.database import setup_database from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs def install_db(root_login="root", root_password=None, db_name=None, source_sql=None, - admin_password=None, verbose=True, force=0, site_config=None, reinstall=False, - db_type=None): + admin_password=None, verbose=True, force=0, site_config=None, reinstall=False, + db_type=None, db_host=None, db_port=None): if not db_type: db_type = frappe.conf.db_type or 'mariadb' - make_conf(db_name, site_config=site_config, db_type=db_type) + make_conf(db_name, site_config=site_config, db_type=db_type, db_host=db_host, db_port=db_port) frappe.flags.in_install_db = True frappe.flags.root_login = root_login @@ -191,14 +191,14 @@ def init_singles(): doc.flags.ignore_validate=True doc.save() -def make_conf(db_name=None, db_password=None, site_config=None, db_type=None): +def make_conf(db_name=None, db_password=None, site_config=None, db_type=None, db_host=None, db_port=None): site = frappe.local.site - make_site_config(db_name, db_password, site_config, db_type=db_type) + make_site_config(db_name, db_password, site_config, db_type=db_type, db_host=db_host, db_port=db_port) sites_path = frappe.local.sites_path frappe.destroy() frappe.init(site, sites_path=sites_path) -def make_site_config(db_name=None, db_password=None, site_config=None, db_type=None): +def make_site_config(db_name=None, db_password=None, site_config=None, db_type=None, db_host=None, db_port=None): frappe.create_folder(os.path.join(frappe.local.site_path)) site_file = get_site_config_path() @@ -209,6 +209,12 @@ def make_site_config(db_name=None, db_password=None, site_config=None, db_type=N if db_type: site_config['db_type'] = db_type + if db_host: + site_config['db_host'] = db_host + + if db_port: + site_config['db_port'] = db_port + with open(site_file, "w") as f: f.write(json.dumps(site_config, indent=1, sort_keys=True)) From 6ab38c2af580cd4e67272b5b7827875abc8ed841 Mon Sep 17 00:00:00 2001 From: Khushal Trivedi Date: Thu, 12 Dec 2019 19:24:17 +0530 Subject: [PATCH 219/226] fix: link field search taking trailing and leading spaces (#9031) --- frappe/desk/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index 7bcfe646ab..c70b650945 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -50,7 +50,7 @@ def sanitize_searchfield(searchfield): # this is called by the Link Field @frappe.whitelist() def search_link(doctype, txt, query=None, filters=None, page_length=20, searchfield=None, reference_doctype=None, ignore_user_permissions=False): - search_widget(doctype, txt, query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions) + search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions) frappe.response['results'] = build_for_autosuggest(frappe.response["values"]) del frappe.response["values"] From d1c0579c705b9d8713fc1237db49baf7d4b787bb Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 12 Dec 2019 20:00:30 +0530 Subject: [PATCH 220/226] fix(file): Public-private issue (#9029) * fix: Pass file's is_private for doc creation * fix: File is_private and file_url mismatch * fix: Check if file_url exists * fix: Validation check * fix(postgres): Convert is_private to int * fix: File path for content_hash --- frappe/core/doctype/communication/email.py | 6 ++-- frappe/core/doctype/file/file.py | 32 ++++++++++++++-------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index 361030d07a..1848136bee 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -398,7 +398,7 @@ def get_bcc(doc, recipients=None, fetched_from_email_account=False): return bcc def add_attachments(name, attachments): - '''Add attachments to the given Communiction''' + '''Add attachments to the given Communication''' # loop through attachments for a in attachments: if isinstance(a, string_types): @@ -411,7 +411,9 @@ def add_attachments(name, attachments): "file_url": attach.file_url, "attached_to_doctype": "Communication", "attached_to_name": name, - "folder": "Home/Attachments"}) + "folder": "Home/Attachments", + "is_private": attach.is_private + }) _file.save(ignore_permissions=True) def filter_email_list(doc, email_list, exclude, is_cc=False, is_bcc=False): diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index ee139000e1..041b8c3011 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -89,8 +89,9 @@ class File(Document): def validate(self): if self.is_new(): + self.set_is_private() + self.set_file_name() self.validate_duplicate_entry() - self.validate_file_name() self.validate_folder() if not self.file_url and not self.flags.ignore_file_validate: @@ -133,6 +134,9 @@ class File(Document): frappe.db.set_value(self.attached_to_doctype, self.attached_to_name, self.attached_to_field, self.file_url) + if self.file_url and (self.is_private != self.file_url.startswith('/private')): + frappe.throw(_('Invalid file URL. Please contact System Administrator.')) + def set_folder_name(self): """Make parent folders if not exists based on reference doctype and name""" if self.attached_to_doctype and not self.folder: @@ -157,9 +161,11 @@ class File(Document): def validate_duplicate_entry(self): if not self.flags.ignore_duplicate_entry_error and not self.is_folder: - # check duplicate name + if not self.content_hash: + self.generate_content_hash() - # check duplicate assignement + # check duplicate name + # check duplicate assignment filters = { 'content_hash': self.content_hash, 'is_private': self.is_private, @@ -184,21 +190,20 @@ class File(Document): else: self.file_url = duplicate_file.file_url - def validate_file_name(self): + def set_file_name(self): if not self.file_name and self.file_url: self.file_name = self.file_url.split('/')[-1] def generate_content_hash(self): - if self.content_hash or not self.file_url: + if self.content_hash or not self.file_url or self.file_url.startswith('http'): return - if self.file_url.startswith("/files/"): - try: - with open(get_files_path(self.file_name.lstrip("/")), "rb") as f: - self.content_hash = get_content_hash(f.read()) - except IOError: - frappe.msgprint(_("File {0} does not exist").format(self.file_url)) - raise + try: + with open(get_files_path(self.file_name.lstrip("/"), is_private=self.is_private), "rb") as f: + self.content_hash = get_content_hash(f.read()) + except IOError: + frappe.msgprint(_("File {0} does not exist").format(self.file_url)) + raise def on_trash(self): if self.is_home_folder or self.is_attachments_folder: @@ -563,6 +568,9 @@ class File(Document): except frappe.DoesNotExistError: frappe.clear_messages() + def set_is_private(self): + if self.file_url: + self.is_private = cint(self.file_url.startswith('/private')) def on_doctype_update(): frappe.db.add_index("File", ["attached_to_doctype", "attached_to_name"]) From f9777268b844b07bb42d727aeccd06307197c377 Mon Sep 17 00:00:00 2001 From: Himanshu Date: Thu, 12 Dec 2019 21:40:56 +0530 Subject: [PATCH 221/226] feat: add default email account for email linking (#8833) * feat: add default email account for email linking * fix: remove unused import * fix: remove try-catch --- .../desk/page/setup_wizard/install_fixtures.py | 16 +++++++--------- frappe/patches.txt | 3 ++- frappe/patches/v12_0/setup_email_linking.py | 6 ++++++ 3 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 frappe/patches/v12_0/setup_email_linking.py diff --git a/frappe/desk/page/setup_wizard/install_fixtures.py b/frappe/desk/page/setup_wizard/install_fixtures.py index bb598ab180..e93b71291f 100644 --- a/frappe/desk/page/setup_wizard/install_fixtures.py +++ b/frappe/desk/page/setup_wizard/install_fixtures.py @@ -10,6 +10,7 @@ from frappe.desk.doctype.global_search_settings.global_search_settings import up def install(): update_genders_and_salutations() update_global_search_doctypes() + setup_email_linking() @frappe.whitelist() def update_genders_and_salutations(): @@ -20,13 +21,10 @@ def update_genders_and_salutations(): for record in records: doc = frappe.new_doc(record.get("doctype")) doc.update(record) + doc.insert(ignore_permissions=True, ignore_if_duplicate=True) - try: - doc.insert(ignore_permissions=True) - except frappe.DuplicateEntryError as e: - # pass DuplicateEntryError and continue - if e.args and e.args[0]==doc.doctype and e.args[1]==doc.name: - # make sure DuplicateEntryError is for the exact same doc and not a related doc - pass - else: - raise \ No newline at end of file +def setup_email_linking(): + doc = frappe.get_doc({ + "doctype": "Email Account", + "email_id": "email_linking@example.com", + }).insert(ignore_permissions=True, ignore_if_duplicate=True) \ No newline at end of file diff --git a/frappe/patches.txt b/frappe/patches.txt index 90abc8c31d..0ca7d8b048 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -260,4 +260,5 @@ frappe.patches.v12_0.update_auto_repeat_status_and_not_submittable frappe.patches.v12_0.copy_to_parent_for_tags frappe.patches.v12_0.create_notification_settings_for_user frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26 -execute:frappe.delete_doc("Test Runner") \ No newline at end of file +execute:frappe.delete_doc("Test Runner") +frappe.patches.v12_0.setup_email_linking diff --git a/frappe/patches/v12_0/setup_email_linking.py b/frappe/patches/v12_0/setup_email_linking.py new file mode 100644 index 0000000000..08f57ca5e4 --- /dev/null +++ b/frappe/patches/v12_0/setup_email_linking.py @@ -0,0 +1,6 @@ +from __future__ import unicode_literals + +from frappe.desk.page.setup_wizard.install_fixtures import setup_email_linking + +def execute(): + setup_email_linking() \ No newline at end of file From 129bc14495dc6b500b30cee282f2c522e8c10c77 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 13 Dec 2019 14:09:23 +0530 Subject: [PATCH 222/226] fix: Add a patch to fix all user's home settings --- frappe/patches.txt | 1 + .../v12_0/fix_home_settings_for_all_users.py | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 frappe/patches/v12_0/fix_home_settings_for_all_users.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 0ca7d8b048..9612994168 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -262,3 +262,4 @@ frappe.patches.v12_0.create_notification_settings_for_user frappe.patches.v11_0.make_all_prepared_report_attachments_private #2019-11-26 execute:frappe.delete_doc("Test Runner") frappe.patches.v12_0.setup_email_linking +frappe.patches.v12_0.fix_home_settings_for_all_users diff --git a/frappe/patches/v12_0/fix_home_settings_for_all_users.py b/frappe/patches/v12_0/fix_home_settings_for_all_users.py new file mode 100644 index 0000000000..9bc05f8e2c --- /dev/null +++ b/frappe/patches/v12_0/fix_home_settings_for_all_users.py @@ -0,0 +1,41 @@ +import frappe +from frappe.config import get_modules_from_all_apps_for_user +import json +def execute(): + users = frappe.get_all('User', fields=['name', 'home_settings'], limit=2) + + for user in users: + + if not user.home_settings: + continue + + home_settings = json.loads(user.home_settings) + + modules_by_category = home_settings.get('modules_by_category') + if not modules_by_category: + continue + visible_modules = [] + category_to_check = [] + + for category, modules in modules_by_category.items(): + visible_modules += modules + category_to_check.append(category) + + all_modules = get_modules_from_all_apps_for_user(user.name) + all_modules = set([m.get('name') or m.get('module_name') or m.get('label') \ + for m in all_modules if m.get('category') in category_to_check]) + + hidden_modules = home_settings['hidden_modules'] + + modules_in_home_settings = set(visible_modules + hidden_modules) + + all_modules = all_modules.union(modules_in_home_settings) + + missing_modules = all_modules - modules_in_home_settings + + if missing_modules: + home_settings['hidden_modules'] += missing_modules + home_settings = json.dumps(home_settings) + frappe.set_value('User', user.name, 'home_settings', home_settings) + + frappe.cache().delete_key('home_settings') From ce7929e1e23bcd76c10b80f06ea25fc92c84b3c5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 13 Dec 2019 15:56:59 +0530 Subject: [PATCH 223/226] fix: grid file upload fix --- frappe/public/js/frappe/form/grid.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 38818b18aa..fa65e77afe 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -755,6 +755,7 @@ export default class Grid { } setup_allow_bulk_edit() { + let me = this; if (this.frm && this.frm.get_docfield(this.df.fieldname).allow_bulk_edit) { // download this.setup_download(); @@ -769,8 +770,7 @@ export default class Grid { var data = frappe.utils.csv_to_array(frappe.utils.get_decoded_string(file.dataurl)); // row #2 contains fieldnames; var fieldnames = data[2]; - - this.frm.clear_table(this.df.fieldname); + me.frm.clear_table(me.df.fieldname); $.each(data, (i, row) => { if (i > 6) { var blank_row = true; @@ -782,10 +782,10 @@ export default class Grid { }); if (!blank_row) { - var d = this.frm.add_child(this.df.fieldname); + var d = me.frm.add_child(me.df.fieldname); $.each(row, (ci, value) => { var fieldname = fieldnames[ci]; - var df = frappe.meta.get_docfield(this.df.options, fieldname); + var df = frappe.meta.get_docfield(me.df.options, fieldname); // convert date formatting if (df.fieldtype==="Date" && value) { @@ -802,7 +802,7 @@ export default class Grid { } }); - this.frm.refresh_field(this.df.fieldname); + me.frm.refresh_field(me.df.fieldname); frappe.msgprint({message: __('Table updated'), title: __('Success'), indicator: 'green'}); } }); From e5c1f800718a90bda34587011a3eb1dcd1830494 Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Fri, 13 Dec 2019 22:35:29 +0530 Subject: [PATCH 224/226] fix(Grid): Child table pagination fixes (#9034) * fix: don't render result if grid_rows is undefined and fix truncate_rows * fix: change page length to 50 * fix: grid pagination ui test * fix: confirm before deleting all child table rows --- cypress/integration/grid_pagination.js | 15 +++++++------ frappe/public/js/frappe/form/grid.js | 22 +++++++++++-------- .../public/js/frappe/form/grid_pagination.js | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/cypress/integration/grid_pagination.js b/cypress/integration/grid_pagination.js index cf41e31ee6..67fdb8acf0 100644 --- a/cypress/integration/grid_pagination.js +++ b/cypress/integration/grid_pagination.js @@ -14,15 +14,15 @@ context('Grid Pagination', () => { cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('.current-page-number').should('contain', '1'); - cy.get('@table').find('.total-page-number').should('contain', '50'); - cy.get('@table').find('.grid-body .grid-row').should('have.length', 20); + cy.get('@table').find('.total-page-number').should('contain', '20'); + cy.get('@table').find('.grid-body .grid-row').should('have.length', 50); }); it('goes to the next and previous page', () => { cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('.next-page').click(); cy.get('@table').find('.current-page-number').should('contain', '2'); - cy.get('@table').find('.grid-body .grid-row').first().should('have.attr', 'data-idx', '21'); + cy.get('@table').find('.grid-body .grid-row').first().should('have.attr', 'data-idx', '51'); cy.get('@table').find('.prev-page').click(); cy.get('@table').find('.current-page-number').should('contain', '1'); cy.get('@table').find('.grid-body .grid-row').first().should('have.attr', 'data-idx', '1'); @@ -32,19 +32,20 @@ context('Grid Pagination', () => { cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('button.grid-add-row').click(); cy.get('@table').find('.grid-body .row-index').should('contain', 1001); - cy.get('@table').find('.current-page-number').should('contain', '51'); - cy.get('@table').find('.total-page-number').should('contain', '51'); + cy.get('@table').find('.current-page-number').should('contain', '21'); + cy.get('@table').find('.total-page-number').should('contain', '21'); cy.get('@table').find('.grid-body .grid-row .grid-row-check').click({force: true}); cy.get('@table').find('button.grid-remove-rows').click(); cy.get('@table').find('.grid-body .row-index').last().should('contain', 1000); - cy.get('@table').find('.current-page-number').should('contain', '50'); - cy.get('@table').find('.total-page-number').should('contain', '50'); + cy.get('@table').find('.current-page-number').should('contain', '20'); + cy.get('@table').find('.total-page-number').should('contain', '20'); }); it('deletes all rows', ()=> { cy.visit('/desk#Form/Contact/Test Contact'); cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table'); cy.get('@table').find('.grid-heading-row .grid-row-check').click({force: true}); cy.get('@table').find('button.grid-remove-all-rows').click(); + cy.get('.modal-dialog .btn-primary').contains('Yes').click(); cy.get('@table').find('.grid-body .grid-row').should('have.length', 0); }); }); \ No newline at end of file diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index fa65e77afe..6da742638a 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -195,11 +195,14 @@ export default class Grid { } delete_all_rows() { - this.frm.doc[this.df.fieldname] = []; - $(this.parent).find('.rows').empty(); - this.grid_rows = []; - this.refresh(); - frappe.utils.scroll_to(this.wrapper); + frappe.confirm(__("Are you sure you want to delete all rows?"), () => { + this.frm.doc[this.df.fieldname] = []; + $(this.parent).find('.rows').empty(); + this.grid_rows = []; + this.refresh(); + frappe.utils.scroll_to(this.wrapper); + }); + } select_row(name) { @@ -304,11 +307,12 @@ export default class Grid { render_result_rows($rows, append_row) { - let result_length = this.grid_pagination.get_result_length(); let page_index = this.grid_pagination.page_index; let page_length = this.grid_pagination.page_length; - + if (!this.grid_rows) { + return; + } for (var ri = (page_index-1)*page_length; ri < result_length; ri++) { var d = this.data[ri]; if (!d) { @@ -364,9 +368,9 @@ export default class Grid { truncate_rows() { if (this.grid_rows.length > this.data.length) { // remove extra rows - for (var i=this.data.length; i < this.grid_rows.length; i++) { + for (var i = this.data.length; i < this.grid_rows.length; i++) { var grid_row = this.grid_rows[i]; - grid_row.wrapper.remove(); + if (grid_row) grid_row.wrapper.remove(); } this.grid_rows.splice(this.data.length); } diff --git a/frappe/public/js/frappe/form/grid_pagination.js b/frappe/public/js/frappe/form/grid_pagination.js index 8884c772ab..190a58c5fe 100644 --- a/frappe/public/js/frappe/form/grid_pagination.js +++ b/frappe/public/js/frappe/form/grid_pagination.js @@ -6,7 +6,7 @@ export default class GridPagination { } setup_pagination() { - this.page_length = 20; + this.page_length = 50; this.page_index = 1; this.total_pages = Math.ceil(this.grid.data.length/this.page_length); From 310233c56a2955c6a4bb82dfbbb8128d0dae6e02 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Sat, 14 Dec 2019 17:34:04 +0530 Subject: [PATCH 225/226] fix: Show default currency as a fallback for currency fieldtype (#8944) * fix: Show default currency as a fallback for currency fieldtype * test: Add a test for currency formatting --- frappe/tests/test_formatter.py | 25 +++++++++++++++++++++++++ frappe/utils/formatters.py | 11 +++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 frappe/tests/test_formatter.py diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py new file mode 100644 index 0000000000..5257e1c717 --- /dev/null +++ b/frappe/tests/test_formatter.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +import frappe +from frappe import format +import unittest + +class TestFormatter(unittest.TestCase): + def test_currency_formatting(self): + df = frappe._dict({ + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'options': 'currency' + }) + + doc = frappe._dict({ + 'amount': 5 + }) + frappe.db.set_default("currency", 'INR') + + # if currency field is not passed then default currency should be used. + self.assertEqual(format(100, df, doc), '₹ 100.00') + + doc.currency = 'USD' + self.assertEqual(format(100, df, doc), "$ 100.00") + + frappe.db.set_default("currency", None) \ No newline at end of file diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 1574ae9ace..46e3694e6f 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -55,12 +55,15 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): # this is required to show 0 as blank in table columns return "" - elif df.get("fieldtype") == "Currency" or (df.get("fieldtype")=="Float" and (df.options or "").strip()): - return fmt_money(value, precision=get_field_precision(df, doc), - currency=currency if currency else (get_field_currency(df, doc) if doc else None)) + elif df.get("fieldtype") == "Currency": + default_currency = frappe.db.get_default("currency") + currency = currency or get_field_currency(df, doc) or default_currency + return fmt_money(value, precision=get_field_precision(df, doc), currency=currency) elif df.get("fieldtype") == "Float": precision = get_field_precision(df, doc) + # I don't know why we support currency option for float + currency = currency or get_field_currency(df, doc) # show 1.000000 as 1 # options should not specified @@ -69,7 +72,7 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): if len(temp)==1 or cint(temp[1])==0: precision = 0 - return fmt_money(value, precision=precision) + return fmt_money(value, precision=precision, currency=currency) elif df.get("fieldtype") == "Percent": return "{}%".format(flt(value, 2)) From 09ec275c2bfb0a1f528ce05ccbc7d029a7ab0fc7 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 14 Dec 2019 17:44:17 +0530 Subject: [PATCH 226/226] fix: Remove limit --- frappe/patches/v12_0/fix_home_settings_for_all_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v12_0/fix_home_settings_for_all_users.py b/frappe/patches/v12_0/fix_home_settings_for_all_users.py index 9bc05f8e2c..8a6bcca9a0 100644 --- a/frappe/patches/v12_0/fix_home_settings_for_all_users.py +++ b/frappe/patches/v12_0/fix_home_settings_for_all_users.py @@ -2,7 +2,7 @@ import frappe from frappe.config import get_modules_from_all_apps_for_user import json def execute(): - users = frappe.get_all('User', fields=['name', 'home_settings'], limit=2) + users = frappe.get_all('User', fields=['name', 'home_settings']) for user in users: