From 072f0026c26b9821f615c8c470daf72f90a79b78 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 27 Jul 2020 20:38:29 +0530 Subject: [PATCH 001/142] fix: Handle directories in unzip --- frappe/core/doctype/file/file.py | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 1748c60020..6adda307a4 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -278,25 +278,26 @@ class File(Document): base_url = os.path.dirname(self.file_url) files = [] - with zipfile.ZipFile(zip_path) as zf: - zf.extractall(os.path.dirname(zip_path)) - for info in zf.infolist(): - if not info.filename.startswith('__MACOSX'): - file_url = file_url = base_url + '/' + info.filename - file_name = frappe.db.get_value('File', dict(file_url=file_url)) - if file_name: - file_doc = frappe.get_doc('File', file_name) - else: - file_doc = frappe.new_doc("File") - file_doc.file_name = info.filename - file_doc.file_size = info.file_size - file_doc.folder = self.folder - file_doc.is_private = self.is_private - file_doc.file_url = file_url - file_doc.attached_to_doctype = self.attached_to_doctype - file_doc.attached_to_name = self.attached_to_name - file_doc.save() - files.append(file_doc) + with zipfile.ZipFile(zip_path) as z: + for file in z.filelist: + if file.is_dir() or file.filename.startswith('__MACOSX/'): + # skip directories and macos hidden directory + continue + + filename = os.path.basename(file.filename) + if filename.startswith('.'): + # skip hidden files + continue + + file_doc = frappe.new_doc('File') + file_doc.content = z.read(file.filename) + file_doc.file_name = filename + file_doc.folder = self.folder + file_doc.is_private = self.is_private + file_doc.attached_to_doctype = self.attached_to_doctype + file_doc.attached_to_name = self.attached_to_name + file_doc.save() + files.append(file_doc) frappe.delete_doc('File', self.name) return files From 0eae494dc3200c0c1a0b1e20d6dcdd5790d12f85 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 12 Aug 2020 18:28:40 +0530 Subject: [PATCH 002/142] fix: email formatting in communication and email queue Co-authored-by: Sahil Khan --- frappe/patches.txt | 1 + .../patches/v12_0/fix_email_id_formatting.py | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 frappe/patches/v12_0/fix_email_id_formatting.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 68b4e5d99c..2b729ad87c 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -298,3 +298,4 @@ frappe.patches.v13_0.create_custom_dashboards_cards_and_charts frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart frappe.patches.v13_0.generate_theme_files_in_public_folder frappe.patches.v13_0.increase_password_length +frappe.patches.v12_0.fix_email_id_formatting diff --git a/frappe/patches/v12_0/fix_email_id_formatting.py b/frappe/patches/v12_0/fix_email_id_formatting.py new file mode 100644 index 0000000000..03f606e0cc --- /dev/null +++ b/frappe/patches/v12_0/fix_email_id_formatting.py @@ -0,0 +1,44 @@ +import frappe + +def execute(): + fix_communications() + fix_show_as_cc_email_queue() + fix_email_queue_recipients() + +def fix_communications(): + for communication in frappe.db.sql('''select name, recipients, cc, bcc from tabCommunication + where creation > '2020-06-01' + and communication_medium='Email' + and communication_type='Communication' + and (cc like '%<%' or bcc like '%<%' or recipients like '%<%') + ''', as_dict=1): + + communication['recipients'] = format_email_id(communication.recipients) + communication['cc'] = format_email_id(communication.cc) + communication['bcc'] = format_email_id(communication.bcc) + + frappe.db.sql('''update `tabCommunication` set recipients=%s,cc=%s,bcc=%s + where name =%s ''', (communication['recipients'], communication['cc'], + communication['bcc'], communication['name'])) + +def fix_show_as_cc_email_queue(): + for queue in frappe.get_all("Email Queue", {'creation': ['>', '2020-06-01'], + 'status': 'Not Sent', 'show_as_cc': ['like', '%<%']}, + ['name', 'show_as_cc']): + + frappe.db.set_value('Email Queue', queue['name'], + 'show_as_cc', format_email_id(queue['show_as_cc'])) + +def fix_email_queue_recipients(): + for recipient in frappe.db.sql('''select recipient, name from + `tabEmail Queue Recipient` where recipient like '%<%' + and status='Not Sent' and creation > '2020-06-01' ''', as_dict=1): + + frappe.db.set_value('Email Queue Recipient', recipient['name'], + 'recipient', format_email_id(recipient['recipient'])) + +def format_email_id(email): + if email and ('<' in email and '>' in email): + return email.replace('>', '>').replace('<', '<') + + return email From aae0309cedf567ef4a2f3c4dd7c9ca5eb79096e9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 19 Aug 2020 14:19:52 +0530 Subject: [PATCH 003/142] feat: Allow me to execute anything console would allow --- frappe/commands/utils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 721376016c..17e6e53c51 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -133,6 +133,7 @@ def reset_perms(context): def execute(context, method, args=None, kwargs=None, profile=False): "Execute a function" for site in context.sites: + ret = "" try: frappe.init(site=site) frappe.connect() @@ -154,7 +155,10 @@ def execute(context, method, args=None, kwargs=None, profile=False): pr = cProfile.Profile() pr.enable() - ret = frappe.get_attr(method)(*args, **kwargs) + try: + ret = frappe.get_attr(method)(*args, **kwargs) + except Exception: + ret = frappe.safe_eval(method + "()", eval_globals=globals(), eval_locals=locals()) if profile: pr.disable() From 022b6e356b4f4ebd95224818acffe3fa6a353227 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 19 Aug 2020 15:11:39 +0530 Subject: [PATCH 004/142] fix: Create backups folder if doesn't exist Backups fail silently if the default `backups` folder doesn't exist under private --- frappe/utils/backups.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index a64ba8c3a7..c7b1523ac0 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -48,10 +48,23 @@ class BackupGenerator: site = frappe.local.site or frappe.generate_hash(length=8) self.site_slug = site.replace('.', '_') - self.verbose = verbose + self.setup_backup_directory() _verbose = verbose + def setup_backup_directory(self): + specified = self.backup_path_db or self.backup_path_files or self.backup_path_private_files + + if not specified: + backups_folder = get_backup_path() + if not os.path.exists(backups_folder): + os.makedirs(backups_folder) + else: + for file_path in [self.backup_path_files, self.backup_path_db, self.backup_path_private_files]: + dir = os.path.dirname(file_path) + os.makedirs(dir) + + def get_backup(self, older_than=24, ignore_files=False, force=False): """ Takes a new dump if existing file is old From a7af5d0a09aa55a0d806631d7f32e44ba636bedf Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 19 Aug 2020 15:45:10 +0530 Subject: [PATCH 005/142] fix: Re-connect to database in case connection is closed --- frappe/database/mariadb/setup_db.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/database/mariadb/setup_db.py b/frappe/database/mariadb/setup_db.py index 6370990098..a4e4d624ae 100644 --- a/frappe/database/mariadb/setup_db.py +++ b/frappe/database/mariadb/setup_db.py @@ -92,6 +92,8 @@ def bootstrap_database(db_name, verbose, source_sql=None): sys.exit(1) import_db_from_sql(source_sql, verbose) + + frappe.connect(db_name=db_name) if not 'tabDefaultValue' in frappe.db.get_tables(): print('''Database not installed, this can due to lack of permission, or that the database name exists. Check your mysql root password, or use --force to reinstall''') From ee0bb635deb8bd63e375c55085e421fb0ef55c2c Mon Sep 17 00:00:00 2001 From: Anupam K Date: Wed, 19 Aug 2020 17:53:09 +0530 Subject: [PATCH 006/142] fix: newsletter fix --- .../email/doctype/newsletter/newsletter.json | 39 ++++++++++++++++--- frappe/email/doctype/newsletter/newsletter.py | 34 ++++++++-------- frappe/patches.txt | 1 + .../v13_0/update_newsletter_content_type.py | 12 ++++++ 4 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 frappe/patches/v13_0/update_newsletter_content_type.py diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json index 01f75be954..6babf212aa 100644 --- a/frappe/email/doctype/newsletter/newsletter.json +++ b/frappe/email/doctype/newsletter/newsletter.json @@ -15,7 +15,10 @@ "email_sent", "newsletter_content", "subject", + "content_type", "message", + "message_md", + "message_html", "send_unsubscribe_link", "send_attachments", "published", @@ -50,7 +53,8 @@ }, { "fieldname": "newsletter_content", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Content" }, { "fieldname": "subject", @@ -61,11 +65,12 @@ "reqd": 1 }, { + "depends_on": "eval: doc.content_type === 'Rich Text'", "fieldname": "message", "fieldtype": "Text Editor", "in_list_view": 1, "label": "Message", - "reqd": 1 + "mandatory_depends_on": "eval: doc.content_type === 'Rich Text'" }, { "default": "1", @@ -87,16 +92,20 @@ "read_only": 1 }, { + "collapsible": 1, "fieldname": "test_the_newsletter", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Testing" }, { "description": "A Lead with this Email Address should exist", "fieldname": "test_email_id", "fieldtype": "Data", - "label": "Test Email Address" + "label": "Test Email Address", + "options": "Email" }, { + "depends_on": "eval: doc.test_email_id", "fieldname": "test_send", "fieldtype": "Button", "label": "Test", @@ -127,6 +136,26 @@ "fieldname": "send_attachments", "fieldtype": "Check", "label": "Send Attachments" + }, + { + "fieldname": "content_type", + "fieldtype": "Select", + "label": "Content Type", + "options": "Rich Text\nMarkdown\nHTML" + }, + { + "depends_on": "eval:doc.content_type === 'Markdown'", + "fieldname": "message_md", + "fieldtype": "Markdown Editor", + "label": "Message (Markdown)", + "mandatory_depends_on": "eval:doc.content_type === 'Markdown'" + }, + { + "depends_on": "eval:doc.content_type === 'HTML'", + "fieldname": "message_html", + "fieldtype": "HTML Editor", + "label": "Message (HTML)", + "mandatory_depends_on": "eval:doc.content_type === 'HTML'" } ], "has_web_view": 1, @@ -135,7 +164,7 @@ "is_published_field": "published", "links": [], "max_attachments": 3, - "modified": "2020-05-12 18:09:40.137138", + "modified": "2020-08-19 17:54:13.290593", "modified_by": "Administrator", "module": "Email", "name": "Newsletter", diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 48688afdb6..08a0e3d247 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -11,7 +11,7 @@ from frappe.utils.verified_command import get_signed_params, verify_request from frappe.utils.background_jobs import enqueue from frappe.email.queue import send from frappe.email.doctype.email_group.email_group import add_subscribers -from frappe.utils import parse_addr, now_datetime +from frappe.utils import parse_addr, now_datetime, markdown from frappe.utils import validate_email_address @@ -29,8 +29,8 @@ class Newsletter(WebsiteGenerator): def test_send(self, doctype="Lead"): self.recipients = frappe.utils.split_emails(self.test_email_id) - self.queue_all() - frappe.msgprint(_("Scheduled to send to {0}").format(self.test_email_id)) + self.queue_all(test_email=True) + frappe.msgprint(_("Test email is send to {0}").format(self.test_email_id)) def send_emails(self): """send emails to leads and customers""" @@ -41,20 +41,13 @@ class Newsletter(WebsiteGenerator): if self.recipients: if getattr(frappe.local, "is_ajax", False): - self.validate_send() - # using default queue with a longer timeout as this isn't a scheduled task - enqueue(send_newsletter, queue='default', timeout=6000, event='send_newsletter', - newsletter=self.name) - - else: self.queue_all() - - frappe.msgprint(_("Scheduled to send to {0} recipients").format(len(self.recipients))) + frappe.msgprint(_("Email queued to {0} recipients").format(len(self.recipients))) else: frappe.msgprint(_("Newsletter should have atleast one recipient")) - def queue_all(self): + def queue_all(self, test_email=False): if not self.get("recipients"): # in case it is called via worker self.recipients = self.get_recipients() @@ -80,7 +73,7 @@ class Newsletter(WebsiteGenerator): frappe.throw(_("Unable to find attachment {0}").format(file.name)) send(recipients=self.recipients, sender=sender, - subject=self.subject, message=self.message, + subject=self.subject, message=self.get_message(), reference_doctype=self.doctype, reference_name=self.name, add_unsubscribe_link=self.send_unsubscribe_link, attachments=attachments, unsubscribe_method="/unsubscribe", @@ -90,9 +83,18 @@ class Newsletter(WebsiteGenerator): if not frappe.flags.in_test: frappe.db.auto_commit_on_many_writes = False - self.db_set("email_sent", 1) - self.db_set("schedule_send", now_datetime()) - self.db_set("scheduled_to_send", len(self.recipients)) + if not test_email: + self.db_set("email_sent", 1) + self.db_set("schedule_send", now_datetime()) + self.db_set("scheduled_to_send", len(self.recipients)) + + def get_message(self): + if self.content_type == 'Rich Text': + return self.message + elif self.content_type == 'Markdown': + return markdown(self.message_md) + elif self.content_type == 'HTML': + return self.message_html def get_recipients(self): """Get recipients from Email Group""" diff --git a/frappe/patches.txt b/frappe/patches.txt index 75750ab59c..bf92486cbf 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -297,3 +297,4 @@ frappe.patches.v13_0.replace_old_data_import # 2020-06-24 frappe.patches.v13_0.create_custom_dashboards_cards_and_charts frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart frappe.patches.v13_0.generate_theme_files_in_public_folder +frappe.patches.v13_0.update_newsletter_content_type \ No newline at end of file diff --git a/frappe/patches/v13_0/update_newsletter_content_type.py b/frappe/patches/v13_0/update_newsletter_content_type.py new file mode 100644 index 0000000000..0b32fb49ed --- /dev/null +++ b/frappe/patches/v13_0/update_newsletter_content_type.py @@ -0,0 +1,12 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doc('email', 'doctype', 'Newsletter') + frappe.db.sql(""" + UPDATE tabNewsletter + SET content_type = 'Rich Text' + """) \ No newline at end of file From f48470bb72428a7a9e60c689de2bb03f4094c8ac Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 20 Aug 2020 11:51:56 +0530 Subject: [PATCH 007/142] refactor: Schedule Job Type * Updating Schedule Job Type when scheduler_events in hooks change * Doesn't update objects defined in other functions. Eliminating possible bugs --- .../scheduled_job_type/scheduled_job_type.py | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 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 765ae5fe93..f8b50ea292 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -124,42 +124,49 @@ def run_scheduled_job(job_type): 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) + scheduler_events = frappe.get_hooks('scheduler_events') + all_events = insert_events(scheduler_events) + clear_events(all_events) -def insert_events(all_events, scheduler_events): +def insert_events(scheduler_events): + cron_jobs, event_jobs = [], [] for event_type in scheduler_events: events = scheduler_events.get(event_type) if isinstance(events, dict): - insert_cron_event(events, all_events) + cron_jobs += insert_cron_jobs(events) else: # hourly, daily etc - insert_event_list(events, event_type, all_events) + event_jobs += insert_event_jobs(events, event_type) + return cron_jobs + event_jobs -def insert_cron_event(events, all_events): +def insert_cron_jobs(events): + cron_jobs = [] for cron_format in events: for event in events.get(cron_format): - all_events.append(event) + cron_jobs.append(event) insert_single_event('Cron', event, cron_format) + return cron_jobs -def insert_event_list(events, event_type, all_events): +def insert_event_jobs(events, event_type): + event_jobs = [] for event in events: - all_events.append(event) + event_jobs.append(event) frequency = event_type.replace('_', ' ').title() insert_single_event(frequency, event) + return event_jobs -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, - frequency = frequency - )).insert() +def insert_single_event(frequency, event, cron_format=None): + cron_expr = {'cron_format': cron_format} if cron_format else {} -def clear_events(all_events, scheduler_events): + if not frappe.db.exists('Scheduled Job Type', {'method': event, 'frequency': frequency, **cron_expr }): + frappe.get_doc({ + 'doctype': 'Scheduled Job Type', + 'method': event, + 'cron_format': cron_format, + 'frequency': frequency + }).insert() + +def clear_events(all_events): for event in frappe.get_all('Scheduled Job Type', ('name', 'method')): if event.method not in all_events: frappe.delete_doc('Scheduled Job Type', event.name) From 7bcb0b53773b48a173861bff5e70dbabc62a12f0 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 20 Aug 2020 11:54:29 +0530 Subject: [PATCH 008/142] style: Consistent spacing and quotes --- .../scheduled_job_type/scheduled_job_type.py | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 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 f8b50ea292..649c79df88 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -109,12 +109,14 @@ class ScheduledJobType(Document): 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') doc = json.loads(doc) 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: @@ -122,12 +124,14 @@ def run_scheduled_job(job_type): except Exception: print(frappe.get_traceback()) + def sync_jobs(): - frappe.reload_doc('core', 'doctype', 'scheduled_job_type') - scheduler_events = frappe.get_hooks('scheduler_events') + frappe.reload_doc("core", "doctype", "scheduled_job_type") + scheduler_events = frappe.get_hooks("scheduler_events") all_events = insert_events(scheduler_events) clear_events(all_events) + def insert_events(scheduler_events): cron_jobs, event_jobs = [], [] for event_type in scheduler_events: @@ -139,14 +143,16 @@ def insert_events(scheduler_events): event_jobs += insert_event_jobs(events, event_type) return cron_jobs + event_jobs + def insert_cron_jobs(events): cron_jobs = [] for cron_format in events: for event in events.get(cron_format): cron_jobs.append(event) - insert_single_event('Cron', event, cron_format) + insert_single_event("Cron", event, cron_format) return cron_jobs + def insert_event_jobs(events, event_type): event_jobs = [] for event in events: @@ -155,18 +161,20 @@ def insert_event_jobs(events, event_type): insert_single_event(frequency, event) return event_jobs -def insert_single_event(frequency, event, cron_format=None): - cron_expr = {'cron_format': cron_format} if cron_format else {} - if not frappe.db.exists('Scheduled Job Type', {'method': event, 'frequency': frequency, **cron_expr }): +def insert_single_event(frequency, event, cron_format=None): + cron_expr = {"cron_format": cron_format} if cron_format else {} + + if not frappe.db.exists("Scheduled Job Type", {"method": event, "frequency": frequency, **cron_expr }): frappe.get_doc({ - 'doctype': 'Scheduled Job Type', - 'method': event, - 'cron_format': cron_format, - 'frequency': frequency + "doctype": "Scheduled Job Type", + "method": event, + "cron_format": cron_format, + "frequency": frequency }).insert() + def clear_events(all_events): - for event in frappe.get_all('Scheduled Job Type', ('name', 'method')): + for event in frappe.get_all("Scheduled Job Type", ("name", "method")): if event.method not in all_events: - frappe.delete_doc('Scheduled Job Type', event.name) + frappe.delete_doc("Scheduled Job Type", event.name) From 557bceed027a032c1ec2c3ba6941a4b381b64948 Mon Sep 17 00:00:00 2001 From: gavin Date: Thu, 20 Aug 2020 12:03:03 +0530 Subject: [PATCH 009/142] fix: Allow args and kwargs too Co-authored-by: Aditya Hase --- frappe/commands/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 17e6e53c51..acd25eb166 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -158,7 +158,7 @@ def execute(context, method, args=None, kwargs=None, profile=False): try: ret = frappe.get_attr(method)(*args, **kwargs) except Exception: - ret = frappe.safe_eval(method + "()", eval_globals=globals(), eval_locals=locals()) + ret = frappe.safe_eval(method + "(*args, **kwargs)", eval_globals=globals(), eval_locals=locals()) if profile: pr.disable() From 7c2510eb6ad71b88733938e58695afc1e9fb24ca Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 20 Aug 2020 18:19:23 +0530 Subject: [PATCH 010/142] feat: Mini Test Suite for commands --- frappe/tests/test_commands.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 frappe/tests/test_commands.py diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py new file mode 100644 index 0000000000..b89079889f --- /dev/null +++ b/frappe/tests/test_commands.py @@ -0,0 +1,25 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors + +from __future__ import unicode_literals + +import shlex +import subprocess +import unittest + +import frappe + + +def clean(value): + if isinstance(value, (bytes, str)): + value = value.decode().strip() + return value + + +class BaseTestCommands: + def execute(self, command): + command = command.format(**{"site": frappe.local.site}) + command = shlex.split(command) + self._proc = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + self.stdout = clean(self._proc.stdout) + self.stderr = clean(self._proc.stderr) + self.returncode = clean(self._proc.returncode) From 99496d97f3e00284840d2127556bba0e21d1a99e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 20 Aug 2020 18:20:02 +0530 Subject: [PATCH 011/142] test: Add tests for bench execute --- frappe/tests/test_commands.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index b89079889f..fe0129566b 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -23,3 +23,21 @@ class BaseTestCommands: self.stdout = clean(self._proc.stdout) self.stderr = clean(self._proc.stderr) self.returncode = clean(self._proc.returncode) + + +class TestCommands(BaseTestCommands, unittest.TestCase): + def test_execute(self): + # execute a command expecting a numeric output + self.execute("bench --site {site} execute frappe.db.get_database_size") + self.assertEquals(self.returncode, 0) + self.assertIsInstance(float(self.stdout), float) + + # execute a command expecting an errored output as local won't exist + self.execute("bench --site {site} execute frappe.local.site") + self.assertEquals(self.returncode, 1) + self.assertIsNotNone(self.stderr) + + # execute a command with kwargs + self.execute("""bench --site {site} execute frappe.bold --kwargs '{{"text": "DocType"}}'""") + self.assertEquals(self.returncode, 0) + self.assertEquals(self.stdout[1:-1], frappe.bold(text='DocType')) From 5f299b191d4c9e5773142f2298aef2df1328048c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 20 Aug 2020 18:26:18 +0530 Subject: [PATCH 012/142] chore: Added comments and style --- frappe/tests/test_commands.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index fe0129566b..82c0cdce5c 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -1,11 +1,11 @@ # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors -from __future__ import unicode_literals - +# imports - standard imports import shlex import subprocess import unittest +# imports - module imports import frappe @@ -27,17 +27,20 @@ class BaseTestCommands: class TestCommands(BaseTestCommands, unittest.TestCase): def test_execute(self): - # execute a command expecting a numeric output + # test 1: execute a command expecting a numeric output self.execute("bench --site {site} execute frappe.db.get_database_size") self.assertEquals(self.returncode, 0) self.assertIsInstance(float(self.stdout), float) - # execute a command expecting an errored output as local won't exist + # test 2: execute a command expecting an errored output as local won't exist self.execute("bench --site {site} execute frappe.local.site") self.assertEquals(self.returncode, 1) self.assertIsNotNone(self.stderr) - # execute a command with kwargs + # test 3: execute a command with kwargs + # Note: + # terminal command has been escaped to avoid .format string replacement + # The returned value has quotes which have been trimmed for the test self.execute("""bench --site {site} execute frappe.bold --kwargs '{{"text": "DocType"}}'""") self.assertEquals(self.returncode, 0) self.assertEquals(self.stdout[1:-1], frappe.bold(text='DocType')) From bb11a55b5666957ac2777bec0aed6fb8d5d43c31 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 21 Aug 2020 16:23:20 +0530 Subject: [PATCH 013/142] test: Added tests to check if sync jobs updates on changes in hooks --- .../scheduled_job_type/scheduled_job_type.py | 4 ++-- .../scheduled_job_type/test_scheduled_job_type.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 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 649c79df88..445cf91649 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -125,9 +125,9 @@ def run_scheduled_job(job_type): print(frappe.get_traceback()) -def sync_jobs(): +def sync_jobs(hooks=None): frappe.reload_doc("core", "doctype", "scheduled_job_type") - scheduler_events = frappe.get_hooks("scheduler_events") + scheduler_events = hooks or frappe.get_hooks("scheduler_events") all_events = insert_events(scheduler_events) clear_events(all_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 ec1e70ad6a..3ff639e854 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 @@ -32,6 +32,20 @@ class TestScheduledJobType(unittest.TestCase): self.assertEqual(cron_job.frequency, 'Cron') self.assertEqual(cron_job.cron_format, '0/15 * * * *') + # check if jobs are synced after change in hooks + scheduler_events = { "cron": { "0/15 * * * *": ["frappe.email.queue.flush"] } } + sync_jobs(scheduler_events) + frappe.db.commit() + scheduled_job = frappe.get_doc("Scheduled Job Type", {"method": "frappe.email.queue.flush"}) + self.assertEqual(scheduled_job.frequency, "Cron") + self.assertEqual(scheduled_job.cron_format, "0/15 * * * *") + + updated_scheduler_events = { "hourly": ["frappe.email.queue.flush"] } + sync_jobs(updated_scheduler_events) + frappe.db.commit() + updated_scheduled_job = frappe.get_doc("Scheduled Job Type", {"method": "frappe.email.queue.flush"}) + self.assertEqual(scheduled_job.frequency, "Hourly") + 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') From 5948248740c7880e30cb7c988155f5265ff1f101 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 21 Aug 2020 16:27:52 +0530 Subject: [PATCH 014/142] fix: Use correct document to test --- .../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 3ff639e854..e5e92f9e5b 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 @@ -44,7 +44,7 @@ class TestScheduledJobType(unittest.TestCase): sync_jobs(updated_scheduler_events) frappe.db.commit() updated_scheduled_job = frappe.get_doc("Scheduled Job Type", {"method": "frappe.email.queue.flush"}) - self.assertEqual(scheduled_job.frequency, "Hourly") + self.assertEqual(updated_scheduled_job.frequency, "Hourly") def test_daily_job(self): job = frappe.get_doc('Scheduled Job Type', dict(method = 'frappe.email.queue.clear_outbox')) From e9429aacff56a4fa0cb0a1c6095517926e47b811 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 21 Aug 2020 16:42:26 +0530 Subject: [PATCH 015/142] fix: Remove unnecessary addition --- .../doctype/scheduled_job_type/test_scheduled_job_type.py | 7 ------- 1 file changed, 7 deletions(-) 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 e5e92f9e5b..e580837810 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 @@ -33,13 +33,6 @@ class TestScheduledJobType(unittest.TestCase): self.assertEqual(cron_job.cron_format, '0/15 * * * *') # check if jobs are synced after change in hooks - scheduler_events = { "cron": { "0/15 * * * *": ["frappe.email.queue.flush"] } } - sync_jobs(scheduler_events) - frappe.db.commit() - scheduled_job = frappe.get_doc("Scheduled Job Type", {"method": "frappe.email.queue.flush"}) - self.assertEqual(scheduled_job.frequency, "Cron") - self.assertEqual(scheduled_job.cron_format, "0/15 * * * *") - updated_scheduler_events = { "hourly": ["frappe.email.queue.flush"] } sync_jobs(updated_scheduler_events) frappe.db.commit() From 88e4ab2bcaa74e7f13b89923a332688999d26c4e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 21 Aug 2020 17:12:01 +0530 Subject: [PATCH 016/142] fix: Delete if DuplicateEntry and insert again Sometimes I add a fix for something. After some time, I forget the reason for it. And when something breaks, I remember why I added it in the first place. This is one of those times. --- .../scheduled_job_type/scheduled_job_type.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 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 445cf91649..fa854f579e 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -164,14 +164,19 @@ def insert_event_jobs(events, event_type): def insert_single_event(frequency, event, cron_format=None): cron_expr = {"cron_format": cron_format} if cron_format else {} + doc = frappe.get_doc({ + "doctype": "Scheduled Job Type", + "method": event, + "cron_format": cron_format, + "frequency": frequency + }) if not frappe.db.exists("Scheduled Job Type", {"method": event, "frequency": frequency, **cron_expr }): - frappe.get_doc({ - "doctype": "Scheduled Job Type", - "method": event, - "cron_format": cron_format, - "frequency": frequency - }).insert() + try: + doc.insert() + except frappe.DuplicateEntryError: + doc.delete() + doc.insert() def clear_events(all_events): From e3580357820653946b3875c32e90db56fccfdb9c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 21 Aug 2020 17:44:55 +0530 Subject: [PATCH 017/142] test: Rollback and sync jobs for each test --- .../scheduled_job_type/test_scheduled_job_type.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 e580837810..e7db6f9045 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 @@ -11,11 +11,10 @@ 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() + 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', @@ -35,7 +34,6 @@ class TestScheduledJobType(unittest.TestCase): # check if jobs are synced after change in hooks updated_scheduler_events = { "hourly": ["frappe.email.queue.flush"] } sync_jobs(updated_scheduler_events) - frappe.db.commit() updated_scheduled_job = frappe.get_doc("Scheduled Job Type", {"method": "frappe.email.queue.flush"}) self.assertEqual(updated_scheduled_job.frequency, "Hourly") From 613b91735ef79449232b38874d6b562cfb084478 Mon Sep 17 00:00:00 2001 From: KanchanChauhan Date: Fri, 21 Aug 2020 17:58:37 +0530 Subject: [PATCH 018/142] fix: Image shown as broken in comment if private --- frappe/utils/file_manager.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/utils/file_manager.py b/frappe/utils/file_manager.py index b1eb2b9ab3..e165a4e338 100644 --- a/frappe/utils/file_manager.py +++ b/frappe/utils/file_manager.py @@ -406,6 +406,10 @@ def extract_images_from_html(doc, content): doctype = doc.parenttype if doc.parent else doc.doctype name = doc.parent or doc.name + if doc.doctype == "Comment": + doctype = doc.reference_doctype + name = doc.reference_name + # TODO fix this file_url = save_file(filename, content, doctype, name, decode=True).get("file_url") if not frappe.flags.has_dataurl: From acabfd0b1663fc81d3780b2c6f8bcba7274ec51d Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 24 Aug 2020 00:41:24 +0530 Subject: [PATCH 019/142] fix: group dashboard cards based on label --- frappe/desk/desktop.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 148ae87249..94a38a5304 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -203,7 +203,7 @@ class Workspace: cards = cards + get_custom_reports_and_doctypes(self.doc.module) if len(self.extended_cards): - cards = cards + self.extended_cards + cards = merge_cards_based_on_label(cards + self.extended_cards) default_country = frappe.db.get_default("country") def _doctype_contains_a_record(name): @@ -579,3 +579,16 @@ def update_onboarding_step(name, field, value): """ frappe.db.set_value("Onboarding Step", name, field, value) + +def merge_cards_based_on_label(cards): + """Merge cards with common label.""" + cards_dict = {} + for card in cards: + if card.label in cards_dict: + links = loads(cards_dict[card.label].links) + loads(card.links) + cards_dict[card.label].update(dict(links=dumps(links))) + cards_dict[card.label] = cards_dict.pop(card.label) + else: + cards_dict[card.label] = card + + return list(cards_dict.values()) \ No newline at end of file From 178a576b6a39a252415c9ef5b49a57a7cef2c034 Mon Sep 17 00:00:00 2001 From: Anupam K Date: Mon, 24 Aug 2020 20:11:25 +0530 Subject: [PATCH 020/142] fix: review changes --- frappe/email/doctype/newsletter/newsletter.js | 4 ---- frappe/email/doctype/newsletter/newsletter.json | 8 +++++--- frappe/email/doctype/newsletter/newsletter.py | 14 +++++++------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.js b/frappe/email/doctype/newsletter/newsletter.js index 3d69c0cfad..3277d8e9ee 100644 --- a/frappe/email/doctype/newsletter/newsletter.js +++ b/frappe/email/doctype/newsletter/newsletter.js @@ -14,10 +14,6 @@ frappe.ui.form.on('Newsletter', { }); }, "fa fa-play", "btn-success"); } - if (!doc.__islocal && cint(doc.email_sent)) { - frm.set_df_property('schedule_send', "read_only", 1); - frm.set_df_property('schedule_sending', "read_only", 1); - } frm.events.setup_dashboard(frm); diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json index fac211ab49..1dd6115b43 100644 --- a/frappe/email/doctype/newsletter/newsletter.json +++ b/frappe/email/doctype/newsletter/newsletter.json @@ -125,7 +125,8 @@ "depends_on": "eval: doc.schedule_sending", "fieldname": "schedule_send", "fieldtype": "Datetime", - "label": "Schedule Send" + "label": "Schedule Send", + "read_only_depends_on": "eval: doc.email_sent" }, { "default": "0", @@ -157,7 +158,8 @@ "default": "0", "fieldname": "schedule_sending", "fieldtype": "Check", - "label": "Schedule Sending" + "label": "Schedule Sending", + "read_only_depends_on": "eval: doc.email_sent" } ], "has_web_view": 1, @@ -167,7 +169,7 @@ "is_published_field": "published", "links": [], "max_attachments": 3, - "modified": "2020-08-20 10:22:24.560288", + "modified": "2020-08-24 19:59:37.262500", "modified_by": "Administrator", "module": "Email", "name": "Newsletter", diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index afc0fa638b..929855ea30 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -27,7 +27,7 @@ class Newsletter(WebsiteGenerator): def test_send(self, doctype="Lead"): self.recipients = frappe.utils.split_emails(self.test_email_id) self.queue_all(test_email=True) - frappe.msgprint(_("Test email is send to {0}").format(self.test_email_id)) + frappe.msgprint(_("Test email sent to {0}").format(self.test_email_id)) def send_emails(self): """send emails to leads and customers""" @@ -86,12 +86,12 @@ class Newsletter(WebsiteGenerator): self.db_set("scheduled_to_send", len(self.recipients)) def get_message(self): - if self.content_type == 'Rich Text': - return self.message - elif self.content_type == 'Markdown': - return markdown(self.message_md) - elif self.content_type == 'HTML': - return self.message_html + + return { + 'Rich Text': self.message, + 'Markdown': markdown(self.message_md), + 'HTML': self.message_html + }[self.content_type] def get_recipients(self): """Get recipients from Email Group""" From 1c56732de57f4846e88065623a728108eafe24c6 Mon Sep 17 00:00:00 2001 From: Mangesh-Khairnar Date: Mon, 24 Aug 2020 22:06:12 +0530 Subject: [PATCH 021/142] feat: add option to disable custom script --- .../doctype/custom_script/custom_script.json | 252 ++++++------------ frappe/desk/form/meta.py | 2 +- frappe/patches.txt | 1 + frappe/patches/v13_0/enable_custom_script.py | 13 + 4 files changed, 93 insertions(+), 175 deletions(-) create mode 100644 frappe/patches/v13_0/enable_custom_script.py diff --git a/frappe/custom/doctype/custom_script/custom_script.json b/frappe/custom/doctype/custom_script/custom_script.json index fc086e4b0b..328b247c49 100644 --- a/frappe/custom/doctype/custom_script/custom_script.json +++ b/frappe/custom/doctype/custom_script/custom_script.json @@ -1,187 +1,91 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 1, - "allow_rename": 0, - "autoname": "", - "beta": 0, - "creation": "2013-01-10 16:34:01", - "custom": 0, - "description": "Adds a client custom script to a DocType", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 0, - "engine": "InnoDB", + "actions": [], + "allow_import": 1, + "creation": "2013-01-10 16:34:01", + "description": "Adds a client custom script to a DocType", + "doctype": "DocType", + "document_type": "Document", + "engine": "InnoDB", + "field_order": [ + "dt", + "enabled", + "script", + "sample" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "dt", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "DocType", - "length": 0, - "no_copy": 0, - "oldfieldname": "dt", - "oldfieldtype": "Link", - "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 - }, + "fieldname": "dt", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "DocType", + "oldfieldname": "dt", + "oldfieldtype": "Link", + "options": "DocType", + "reqd": 1, + "show_days": 1, + "show_seconds": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "script", - "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": "Script", - "length": 0, - "no_copy": 0, - "oldfieldname": "script", - "oldfieldtype": "Code", - "options": "JS", - "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 - }, + "fieldname": "script", + "fieldtype": "Code", + "label": "Script", + "oldfieldname": "script", + "oldfieldtype": "Code", + "options": "JS", + "show_days": 1, + "show_seconds": 1 + }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fetch_if_empty": 0, - "fieldname": "sample", - "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": "Sample", - "length": 0, - "no_copy": 0, - "options": "

Custom Script Help

\n

Custom Scripts are executed only on the client-side (i.e. in Forms). Here are some examples to get you started

\n
\n\n// fetch local_tax_no on selection of customer \n// cur_frm.add_fetch(link_field,  source_fieldname,  target_fieldname); \ncur_frm.add_fetch('customer',  'local_tax_no',  'local_tax_no');\n\n// additional validation on dates \nfrappe.ui.form.on('Task',  'validate',  function(frm) {\n    if (frm.doc.from_date < get_today()) {\n        msgprint('You can not select past date in From Date');\n        validated = false;\n    } \n});\n\n// make a field read-only after saving \nfrappe.ui.form.on('Task',  {\n    refresh: function(frm) {\n        // use the __islocal value of doc,  to check if the doc is saved or not\n        frm.set_df_property('myfield',  'read_only',  frm.doc.__islocal ? 0 : 1);\n    } \n});\n\n// additional permission check\nfrappe.ui.form.on('Task',  {\n    validate: function(frm) {\n        if(user=='user1@example.com' && frm.doc.purpose!='Material Receipt') {\n            msgprint('You are only allowed Material Receipt');\n            validated = false;\n        }\n    } \n});\n\n// calculate sales incentive\nfrappe.ui.form.on('Sales Invoice',  {\n    validate: function(frm) {\n        // calculate incentives for each person on the deal\n        total_incentive = 0\n        $.each(frm.doc.sales_team,  function(i,  d) {\n            // calculate incentive\n            var incentive_percent = 2;\n            if(frm.doc.base_grand_total > 400) incentive_percent = 4;\n            // actual incentive\n            d.incentives = flt(frm.doc.base_grand_total) * incentive_percent / 100;\n            total_incentive += flt(d.incentives)\n        });\n        frm.doc.total_incentive = total_incentive;\n    } \n})\n\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 + "fieldname": "sample", + "fieldtype": "HTML", + "label": "Sample", + "options": "

Custom Script Help

\n

Custom Scripts are executed only on the client-side (i.e. in Forms). Here are some examples to get you started

\n
\n\n// fetch local_tax_no on selection of customer \n// cur_frm.add_fetch(link_field,  source_fieldname,  target_fieldname); \ncur_frm.add_fetch('customer',  'local_tax_no',  'local_tax_no');\n\n// additional validation on dates \nfrappe.ui.form.on('Task',  'validate',  function(frm) {\n    if (frm.doc.from_date < get_today()) {\n        msgprint('You can not select past date in From Date');\n        validated = false;\n    } \n});\n\n// make a field read-only after saving \nfrappe.ui.form.on('Task',  {\n    refresh: function(frm) {\n        // use the __islocal value of doc,  to check if the doc is saved or not\n        frm.set_df_property('myfield',  'read_only',  frm.doc.__islocal ? 0 : 1);\n    } \n});\n\n// additional permission check\nfrappe.ui.form.on('Task',  {\n    validate: function(frm) {\n        if(user=='user1@example.com' && frm.doc.purpose!='Material Receipt') {\n            msgprint('You are only allowed Material Receipt');\n            validated = false;\n        }\n    } \n});\n\n// calculate sales incentive\nfrappe.ui.form.on('Sales Invoice',  {\n    validate: function(frm) {\n        // calculate incentives for each person on the deal\n        total_incentive = 0\n        $.each(frm.doc.sales_team,  function(i,  d) {\n            // calculate incentive\n            var incentive_percent = 2;\n            if(frm.doc.base_grand_total > 400) incentive_percent = 4;\n            // actual incentive\n            d.incentives = flt(frm.doc.base_grand_total) * incentive_percent / 100;\n            total_incentive += flt(d.incentives)\n        });\n        frm.doc.total_incentive = total_incentive;\n    } \n})\n\n
", + "show_days": 1, + "show_seconds": 1 + }, + { + "default": "0", + "fieldname": "enabled", + "fieldtype": "Check", + "label": "Enabled", + "show_days": 1, + "show_seconds": 1 } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "icon": "fa fa-glass", - "idx": 1, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "menu_index": 0, - "modified": "2019-03-21 14:26:57.402994", - "modified_by": "Administrator", - "module": "Custom", - "name": "Custom Script", - "owner": "Administrator", + ], + "icon": "fa fa-glass", + "idx": 1, + "index_web_pages_for_search": 1, + "links": [], + "modified": "2020-08-24 21:56:07.719579", + "modified_by": "Administrator", + "module": "Custom", + "name": "Custom Script", + "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, + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, "write": 1 - }, + }, { - "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": "Administrator", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "share": 1, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_order": "ASC", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + ], + "sort_order": "ASC", + "track_changes": 1 } \ No newline at end of file diff --git a/frappe/desk/form/meta.py b/frappe/desk/form/meta.py index ba0e5c2216..c28a40657f 100644 --- a/frappe/desk/form/meta.py +++ b/frappe/desk/form/meta.py @@ -130,7 +130,7 @@ class FormMeta(Meta): def add_custom_script(self): """embed all require files""" # custom script - custom = frappe.db.get_value("Custom Script", {"dt": self.name}, "script") or "" + custom = frappe.db.get_value("Custom Script", {"dt": self.name, "enabled": 1}, "script") or "" self.set("__custom_js", custom) diff --git a/frappe/patches.txt b/frappe/patches.txt index afbd007abc..a00d93fdcd 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -302,3 +302,4 @@ frappe.patches.v13_0.increase_password_length frappe.patches.v13_0.add_toggle_width_in_navbar_settings frappe.patches.v13_0.rename_notification_fields frappe.patches.v13_0.remove_duplicate_navbar_items +frappe.patches.v13_0.enable_custom_script diff --git a/frappe/patches/v13_0/enable_custom_script.py b/frappe/patches/v13_0/enable_custom_script.py new file mode 100644 index 0000000000..92284e6dcc --- /dev/null +++ b/frappe/patches/v13_0/enable_custom_script.py @@ -0,0 +1,13 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + """Enable all the existing custom script""" + frappe.reload_doc("Custom", "doctype", "Custom Script") + + frappe.db.sql(""" + UPDATE `tabCustom Script` SET enabled=1 + """) \ No newline at end of file From 8143f551663cf4c9c478dcedfc41928022acbc73 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 24 Aug 2020 22:22:18 +0530 Subject: [PATCH 022/142] fix: Bundle minified version of vue in libs.min.js --- frappe/public/build.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 997a3092ad..844e436e43 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -128,7 +128,7 @@ "public/js/lib/Sortable.min.js", "public/js/lib/jquery/jquery.hotkeys.js", "public/js/lib/bootstrap.min.js", - "node_modules/vue/dist/vue.js", + "node_modules/vue/dist/vue.min.js", "node_modules/moment/min/moment-with-locales.min.js", "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js", "public/js/lib/socket.io.min.js", From eab928a7110be295a81b1945fb5d8993fbbea137 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 25 Aug 2020 17:40:18 +0530 Subject: [PATCH 023/142] fix: translation --- frappe/translations/fa.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/translations/fa.csv b/frappe/translations/fa.csv index e93fcc4a21..0698897880 100644 --- a/frappe/translations/fa.csv +++ b/frappe/translations/fa.csv @@ -3304,7 +3304,7 @@ Daily Long,روزانه طولانی, Data Import Beta,واردات داده بتا, Default Role on Creation,نقش پیش فرض در آفرینش, Default Theme,موضوع پیش فرض, -Default {0},پیش فرض {0, +Default {0},پیش فرض {0}, Delete All,حذف همه, "Determines the order of the slide in the wizard. If the slide is not to be displayed, priority should be set to 0.",ترتیب اسلاید در جادوگر را تعیین می کند. اگر اسلاید نمایش داده نمی شود ، اولویت باید بر روی 0 تنظیم شود., Do you want to cancel all linked documents?,آیا می خواهید کلیه اسناد مرتبط را لغو کنید؟, From 77bb439429ac0a625395db280d2639ba34a4577b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 4 Aug 2020 13:54:54 +0530 Subject: [PATCH 024/142] feat: don't let users override route for blog category --- frappe/website/doctype/blog_category/blog_category.py | 3 +-- frappe/website/doctype/blog_post/blog_post.py | 2 +- frappe/website/doctype/blog_post/templates/blog_post.html | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py index a293158a09..aa5287bcb6 100644 --- a/frappe/website/doctype/blog_category/blog_category.py +++ b/frappe/website/doctype/blog_category/blog_category.py @@ -14,6 +14,5 @@ class BlogCategory(WebsiteGenerator): clear_cache() def validate(self): - if not self.route: - self.route = 'blog/' + self.scrub(self.name) + self.route = 'blog/' + self.scrub(self.name) super(BlogCategory, self).validate() diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index beffcdca25..bd9c801b08 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -99,7 +99,7 @@ class BlogPost(WebsiteGenerator): self.load_comments(context) context.category = frappe.db.get_value("Blog Category", - context.doc.blog_category, ["title", "route"], as_dict=1) + context.doc.blog_category, ["title", "name"], as_dict=1) context.parents = [{"name": _("Home"), "route":"/"}, {"name": "Blog", "route": "/blog"}, {"label": context.category.title, "route":context.category.route}] diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index dd3e59c3c1..c5580603d0 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -12,7 +12,7 @@

{{ title }}

From 494e95d0735debc9e75504721197d5b6ddec0a72 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 4 Aug 2020 14:01:54 +0530 Subject: [PATCH 025/142] feat: enhancements to blog category * changed order of fields * make route read only * add description to category name --- .../website/doctype/blog_category/blog_category.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/blog_category/blog_category.json b/frappe/website/doctype/blog_category/blog_category.json index b2180047cd..ec5b48cdf1 100644 --- a/frappe/website/doctype/blog_category/blog_category.json +++ b/frappe/website/doctype/blog_category/blog_category.json @@ -8,13 +8,14 @@ "document_type": "Setup", "engine": "InnoDB", "field_order": [ - "category_name", "title", + "category_name", "published", "route" ], "fields": [ { + "description": "Name used in URLs, example \"product-updates\"", "fieldname": "category_name", "fieldtype": "Data", "in_list_view": 1, @@ -31,7 +32,7 @@ "reqd": 1 }, { - "default": "0", + "default": "1", "fieldname": "published", "fieldtype": "Check", "in_list_view": 1, @@ -42,15 +43,17 @@ "fieldname": "route", "fieldtype": "Data", "label": "Route", + "read_only": 1, "unique": 1 } ], "has_web_view": 1, "icon": "fa fa-tag", "idx": 1, + "index_web_pages_for_search": 1, "is_published_field": "published", "links": [], - "modified": "2020-07-29 21:14:47.210446", + "modified": "2020-08-04 14:00:19.842606", "modified_by": "Administrator", "module": "Website", "name": "Blog Category", @@ -78,5 +81,6 @@ "quick_entry": 1, "sort_field": "modified", "sort_order": "DESC", + "title_field": "title", "track_changes": 1 } \ No newline at end of file From 2e81bccd3c693a97ccb3f519d1b3882cb13b8865 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 4 Aug 2020 14:02:14 +0530 Subject: [PATCH 026/142] feat: don't let users override route --- frappe/website/doctype/blog_category/blog_category.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py index aa5287bcb6..47b363383a 100644 --- a/frappe/website/doctype/blog_category/blog_category.py +++ b/frappe/website/doctype/blog_category/blog_category.py @@ -13,6 +13,5 @@ class BlogCategory(WebsiteGenerator): def on_update(self): clear_cache() - def validate(self): + def set_route(self): self.route = 'blog/' + self.scrub(self.name) - super(BlogCategory, self).validate() From 88c4838458a19672853862bd85cf6f99b457e2c0 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 4 Aug 2020 14:07:43 +0530 Subject: [PATCH 027/142] feat: patch to set route for blog category --- frappe/patches.txt | 1 + frappe/patches/v13_0/set_route_for_blog_category.py | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 frappe/patches/v13_0/set_route_for_blog_category.py diff --git a/frappe/patches.txt b/frappe/patches.txt index 985911314e..310f88baa9 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -304,3 +304,4 @@ frappe.patches.v13_0.increase_password_length frappe.patches.v13_0.add_toggle_width_in_navbar_settings frappe.patches.v13_0.rename_notification_fields frappe.patches.v13_0.remove_duplicate_navbar_items +frappe.patches.v13_0.set_route_for_blog_category diff --git a/frappe/patches/v13_0/set_route_for_blog_category.py b/frappe/patches/v13_0/set_route_for_blog_category.py new file mode 100644 index 0000000000..7ea26bc2c0 --- /dev/null +++ b/frappe/patches/v13_0/set_route_for_blog_category.py @@ -0,0 +1,8 @@ +import frappe + +def execute(): + categories = frappe.get_list("Blog Category") + for category in categories: + doc = frappe.get_doc("Blog Category", category["name"]) + doc.set_route() + doc.save() From de0bde046a0546c89295855960055e1d43ed7e69 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 4 Aug 2020 14:07:57 +0530 Subject: [PATCH 028/142] feat: add test to check blog route --- frappe/website/doctype/blog_category/blog_category.py | 1 + .../website/doctype/blog_category/test_blog_category.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py index 47b363383a..b036b561d0 100644 --- a/frappe/website/doctype/blog_category/blog_category.py +++ b/frappe/website/doctype/blog_category/blog_category.py @@ -14,4 +14,5 @@ class BlogCategory(WebsiteGenerator): clear_cache() def set_route(self): + # Override blog route since it has to been templated self.route = 'blog/' + self.scrub(self.name) diff --git a/frappe/website/doctype/blog_category/test_blog_category.py b/frappe/website/doctype/blog_category/test_blog_category.py index d033b84786..6b0bd60c82 100644 --- a/frappe/website/doctype/blog_category/test_blog_category.py +++ b/frappe/website/doctype/blog_category/test_blog_category.py @@ -4,4 +4,11 @@ from __future__ import unicode_literals import frappe -test_records = frappe.get_test_records('Blog Category') \ No newline at end of file +class TestBlogCategory(unittest.TestCase): + def test_route(self): + cat = frappe.new_doc("Blog Categroy", { + "title": "_Yet Another Category", + "category_name": "test-category-yet-another-category", + }) + cat.insert() + self.assertEqual(cat.route, 'blog/test-category-yet-another-category') From 57b5f2fbbbf67206538a77a2d48be9bafa26365e Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 11 Aug 2020 11:51:51 +0530 Subject: [PATCH 029/142] feat: don't scrub name when setting route --- frappe/website/doctype/blog_category/blog_category.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py index b036b561d0..323217dad1 100644 --- a/frappe/website/doctype/blog_category/blog_category.py +++ b/frappe/website/doctype/blog_category/blog_category.py @@ -15,4 +15,4 @@ class BlogCategory(WebsiteGenerator): def set_route(self): # Override blog route since it has to been templated - self.route = 'blog/' + self.scrub(self.name) + self.route = 'blog/' + self.name From 2dc96252bd7126a6af1a98b3be5774470abbe6f5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 11 Aug 2020 14:23:47 +0530 Subject: [PATCH 030/142] feat(blog): remove category name field --- .../doctype/blog_category/blog_category.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/frappe/website/doctype/blog_category/blog_category.json b/frappe/website/doctype/blog_category/blog_category.json index ec5b48cdf1..c5114a811b 100644 --- a/frappe/website/doctype/blog_category/blog_category.json +++ b/frappe/website/doctype/blog_category/blog_category.json @@ -2,27 +2,16 @@ "actions": [], "allow_guest_to_view": 1, "allow_import": 1, - "autoname": "field:category_name", "creation": "2013-03-08 09:41:11", "doctype": "DocType", "document_type": "Setup", "engine": "InnoDB", "field_order": [ "title", - "category_name", "published", "route" ], "fields": [ - { - "description": "Name used in URLs, example \"product-updates\"", - "fieldname": "category_name", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Category Name", - "reqd": 1, - "unique": 1 - }, { "fieldname": "title", "fieldtype": "Data", @@ -53,7 +42,7 @@ "index_web_pages_for_search": 1, "is_published_field": "published", "links": [], - "modified": "2020-08-04 14:00:19.842606", + "modified": "2020-08-11 11:57:19.672807", "modified_by": "Administrator", "module": "Website", "name": "Blog Category", From 5df22dcdcc26ebcca71253798ea9d67a2f588c76 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 11 Aug 2020 14:29:06 +0530 Subject: [PATCH 031/142] feat: update test records --- frappe/core/doctype/user_permission/test_user_permission.py | 3 +-- frappe/website/doctype/blog_category/test_blog_category.py | 3 +-- frappe/website/doctype/blog_category/test_records.json | 3 --- frappe/website/doctype/blog_post/test_blog_post.py | 3 +-- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/user_permission/test_user_permission.py b/frappe/core/doctype/user_permission/test_user_permission.py index 5ccc8752cf..82dd2ab27e 100644 --- a/frappe/core/doctype/user_permission/test_user_permission.py +++ b/frappe/core/doctype/user_permission/test_user_permission.py @@ -26,8 +26,7 @@ class TestUserPermission(unittest.TestCase): user = create_user('test_user_perm1@example.com', 'Website Manager') for category in ['general', 'public']: if not frappe.db.exists('Blog Category', category): - frappe.get_doc({'doctype': 'Blog Category', - 'category_name': category, 'title': category}).insert() + frappe.get_doc({'doctype': 'Blog Category', 'title': category}).insert() param = get_params(user, 'Blog Category', 'general', is_default=1) add_user_permissions(param) diff --git a/frappe/website/doctype/blog_category/test_blog_category.py b/frappe/website/doctype/blog_category/test_blog_category.py index 6b0bd60c82..d9c001ee73 100644 --- a/frappe/website/doctype/blog_category/test_blog_category.py +++ b/frappe/website/doctype/blog_category/test_blog_category.py @@ -7,8 +7,7 @@ import frappe class TestBlogCategory(unittest.TestCase): def test_route(self): cat = frappe.new_doc("Blog Categroy", { - "title": "_Yet Another Category", - "category_name": "test-category-yet-another-category", + "title": "Test Category Yet Another Category", }) cat.insert() self.assertEqual(cat.route, 'blog/test-category-yet-another-category') diff --git a/frappe/website/doctype/blog_category/test_records.json b/frappe/website/doctype/blog_category/test_records.json index 3334bbc4f9..4bd4ac35b7 100644 --- a/frappe/website/doctype/blog_category/test_records.json +++ b/frappe/website/doctype/blog_category/test_records.json @@ -1,18 +1,15 @@ [ { - "category_name": "_Test Blog Category", "doctype": "Blog Category", "parent_website_route": "blog", "title": "_Test Blog Category" }, { - "category_name": "_Test Blog Category 1", "doctype": "Blog Category", "parent_website_route": "blog", "title": "_Test Blog Category 1" }, { - "category_name": "_Test Blog Category 2", "doctype": "Blog Category", "parent_website_route": "blog", "title": "_Test Blog Category 2" diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 15634a7caf..c73cf2caa0 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -36,7 +36,6 @@ def make_test_blog(): if not frappe.db.exists('Blog Category', 'Test Blog Category'): frappe.get_doc(dict( doctype = 'Blog Category', - category_name = 'Test Blog Category', title='Test Blog Category')).insert() if not frappe.db.exists('Blogger', 'test-blogger'): frappe.get_doc(dict( @@ -45,7 +44,7 @@ def make_test_blog(): full_name='Test Blogger')).insert() test_blog = frappe.get_doc(dict( doctype = 'Blog Post', - blog_category = 'Test Blog Category', + blog_category = 'test-blog-category', blogger = 'test-blogger', title = random_string(20), route = random_string(20), From fa6ef9731d33c8477c92dcc7d4edb2edcc85df33 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 11 Aug 2020 14:29:18 +0530 Subject: [PATCH 032/142] feat: set name using scrubbed title --- frappe/website/doctype/blog_category/blog_category.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py index 323217dad1..375ba5b6a3 100644 --- a/frappe/website/doctype/blog_category/blog_category.py +++ b/frappe/website/doctype/blog_category/blog_category.py @@ -8,7 +8,7 @@ from frappe.website.render import clear_cache class BlogCategory(WebsiteGenerator): def autoname(self): # to override autoname of WebsiteGenerator - self.name = self.category_name + self.name = self.scrub(self.title) def on_update(self): clear_cache() From 425d29f314e61833aa1aea72758c42ab9ec36140 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Sat, 18 Jul 2020 16:56:07 +0530 Subject: [PATCH 033/142] test(blog): Blog Post should have correct link to the Blog Category page --- .../doctype/blog_post/test_blog_post.py | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index c73cf2caa0..4b4d062a2d 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import frappe import unittest +from bs4 import BeautifulSoup from frappe.utils import set_request from frappe.website.render import render @@ -32,8 +33,36 @@ class TestBlogPost(unittest.TestCase): self.assertTrue(response.status_code, 404) + def test_category_link(self): + # Make a temporary Blog Post (and a Blog Category) + blog = make_test_blog() + + # Visit the blog post page + set_request(path=blog.route) + blog_page_response = render() + blog_page_html = frappe.safe_decode(blog_page_response.get_data()) + + # On blog post page find link to the category page + soup = BeautifulSoup(blog_page_html, "lxml") + category_title = frappe.db.get_value("Blog Category", blog.blog_category, "title") + category_page_link = list(soup.find_all('a', string=category_title))[0] + category_page_url = category_page_link["href"] + + # Visit the category page (by following the link found in above stage) + set_request(path=category_page_url) + category_page_response = render() + category_page_html = frappe.safe_decode(category_page_response.get_data()) + + # Category page should contain the blog post title + self.assertIn(blog.title, category_page_html) + + # Cleanup afterwords + frappe.delete_doc("Blog Post", blog.name) + frappe.delete_doc("Blog Category", blog.blog_category) + def make_test_blog(): if not frappe.db.exists('Blog Category', 'Test Blog Category'): + # Set different title and name for the category frappe.get_doc(dict( doctype = 'Blog Category', title='Test Blog Category')).insert() From 534cdb4c83b9ae784c02f3daa95deeaeda55ab97 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 21 Aug 2020 12:06:24 +0530 Subject: [PATCH 034/142] feat: allow renaming blog category --- frappe/website/doctype/blog_category/blog_category.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_category/blog_category.json b/frappe/website/doctype/blog_category/blog_category.json index c5114a811b..67e17f49fb 100644 --- a/frappe/website/doctype/blog_category/blog_category.json +++ b/frappe/website/doctype/blog_category/blog_category.json @@ -2,6 +2,7 @@ "actions": [], "allow_guest_to_view": 1, "allow_import": 1, + "allow_rename": 1, "creation": "2013-03-08 09:41:11", "doctype": "DocType", "document_type": "Setup", @@ -42,7 +43,7 @@ "index_web_pages_for_search": 1, "is_published_field": "published", "links": [], - "modified": "2020-08-11 11:57:19.672807", + "modified": "2020-08-21 11:40:36.919321", "modified_by": "Administrator", "module": "Website", "name": "Blog Category", From 43c8d9886c49802dbba2759fcf70ddf579da796a Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 21 Aug 2020 12:06:43 +0530 Subject: [PATCH 035/142] feat: remove test --- frappe/website/doctype/blog_category/test_blog_category.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/frappe/website/doctype/blog_category/test_blog_category.py b/frappe/website/doctype/blog_category/test_blog_category.py index d9c001ee73..38b7ea31a0 100644 --- a/frappe/website/doctype/blog_category/test_blog_category.py +++ b/frappe/website/doctype/blog_category/test_blog_category.py @@ -5,9 +5,4 @@ from __future__ import unicode_literals import frappe class TestBlogCategory(unittest.TestCase): - def test_route(self): - cat = frappe.new_doc("Blog Categroy", { - "title": "Test Category Yet Another Category", - }) - cat.insert() - self.assertEqual(cat.route, 'blog/test-category-yet-another-category') + pass From 5d15dff428716646f90ec7c14fdb873da164f578 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 21 Aug 2020 12:07:05 +0530 Subject: [PATCH 036/142] feat: use category route directly --- frappe/website/doctype/blog_post/blog_post.py | 2 +- frappe/website/doctype/blog_post/templates/blog_post.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index bd9c801b08..beffcdca25 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -99,7 +99,7 @@ class BlogPost(WebsiteGenerator): self.load_comments(context) context.category = frappe.db.get_value("Blog Category", - context.doc.blog_category, ["title", "name"], as_dict=1) + context.doc.blog_category, ["title", "route"], as_dict=1) context.parents = [{"name": _("Home"), "route":"/"}, {"name": "Blog", "route": "/blog"}, {"label": context.category.title, "route":context.category.route}] diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index c5580603d0..8244b9e6c2 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -12,7 +12,7 @@

{{ title }}

From 877260610330c7c4ba8bc0cb3f85bd6350dbb3e4 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 21 Aug 2020 12:11:36 +0530 Subject: [PATCH 037/142] fix: document None is not subscriptable --- frappe/search/full_text_search.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/search/full_text_search.py b/frappe/search/full_text_search.py index dd6e69111d..ecb018dbb4 100644 --- a/frappe/search/full_text_search.py +++ b/frappe/search/full_text_search.py @@ -46,7 +46,8 @@ class FullTextSearch: doc_name (str): name of the document to be updated """ document = self.get_document_to_index(doc_name) - self.update_index(document) + if document: + self.update_index(document) def remove_document_from_index(self, doc_name): """Remove document from search index From 87c6d413fab29440c9b1fe3f89d278869447505d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 24 Aug 2020 14:04:22 +0530 Subject: [PATCH 038/142] fix: import error --- frappe/website/doctype/blog_category/test_blog_category.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/website/doctype/blog_category/test_blog_category.py b/frappe/website/doctype/blog_category/test_blog_category.py index 38b7ea31a0..fe8f4544cd 100644 --- a/frappe/website/doctype/blog_category/test_blog_category.py +++ b/frappe/website/doctype/blog_category/test_blog_category.py @@ -3,6 +3,7 @@ from __future__ import unicode_literals import frappe +import unittest class TestBlogCategory(unittest.TestCase): pass From 1356609f06fc9ff66839484466bda9c838249893 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 24 Aug 2020 15:26:49 +0530 Subject: [PATCH 039/142] test: add name explicitly to blog cateogry --- frappe/website/doctype/blog_category/test_records.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/website/doctype/blog_category/test_records.json b/frappe/website/doctype/blog_category/test_records.json index 4bd4ac35b7..89ff56d4fd 100644 --- a/frappe/website/doctype/blog_category/test_records.json +++ b/frappe/website/doctype/blog_category/test_records.json @@ -2,16 +2,19 @@ { "doctype": "Blog Category", "parent_website_route": "blog", - "title": "_Test Blog Category" + "title": "_Test Blog Category", + "name": "_Test Blog Category" }, { "doctype": "Blog Category", "parent_website_route": "blog", - "title": "_Test Blog Category 1" + "title": "_Test Blog Category 1", + "name": "_Test Blog Category 1" }, { "doctype": "Blog Category", "parent_website_route": "blog", - "title": "_Test Blog Category 2" + "title": "_Test Blog Category 2", + "name": "_Test Blog Category 2" } ] \ No newline at end of file From faffec0f37cb53f04e48679476fa0944cd7b170b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 26 Aug 2020 11:37:58 +0530 Subject: [PATCH 040/142] feat: update name in test records --- frappe/tests/test_form_load.py | 2 +- frappe/tests/test_permissions.py | 34 +++++++++---------- .../doctype/blog_category/test_records.json | 9 ++--- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index 34fc58465e..459a3f52bd 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -24,7 +24,7 @@ class TestFormLoad(unittest.TestCase): def test_fieldlevel_permissions_in_load(self): blog = frappe.get_doc({ "doctype": "Blog Post", - "blog_category": "_Test Blog Category 1", + "blog_category": "-test-blog-category-1", "blog_intro": "Test Blog Intro", "blogger": "_Test Blogger 1", "content": "Test Blog Content", diff --git a/frappe/tests/test_permissions.py b/frappe/tests/test_permissions.py index 364469f168..dddc790c94 100644 --- a/frappe/tests/test_permissions.py +++ b/frappe/tests/test_permissions.py @@ -59,7 +59,7 @@ class TestPermissions(unittest.TestCase): self.assertTrue(post.has_permission("read")) def test_user_permissions_in_doc(self): - add_user_permission("Blog Category", "_Test Blog Category 1", + add_user_permission("Blog Category", "-test-blog-category-1", "test2@example.com") frappe.set_user("test2@example.com") @@ -73,7 +73,7 @@ class TestPermissions(unittest.TestCase): self.assertTrue(get_doc_permissions(post1).get("read")) def test_user_permissions_in_report(self): - add_user_permission("Blog Category", "_Test Blog Category 1", "test2@example.com") + add_user_permission("Blog Category", "-test-blog-category-1", "test2@example.com") frappe.set_user("test2@example.com") names = [d.name for d in frappe.get_list("Blog Post", fields=["name", "blog_category"])] @@ -86,23 +86,23 @@ class TestPermissions(unittest.TestCase): self.assertFalse(doc.get("blog_category")) # Fetch default based on single user permission - add_user_permission("Blog Category", "_Test Blog Category 1", "test2@example.com") + add_user_permission("Blog Category", "-test-blog-category-1", "test2@example.com") frappe.set_user("test2@example.com") doc = frappe.new_doc("Blog Post") - self.assertEqual(doc.get("blog_category"), "_Test Blog Category 1") + self.assertEqual(doc.get("blog_category"), "-test-blog-category-1") # Don't fetch default if user permissions is more than 1 - add_user_permission("Blog Category", "_Test Blog Category", "test2@example.com", ignore_permissions=True) + add_user_permission("Blog Category", "-test-blog-category", "test2@example.com", ignore_permissions=True) frappe.clear_cache() doc = frappe.new_doc("Blog Post") self.assertFalse(doc.get("blog_category")) # Fetch user permission set as default from multiple user permission - add_user_permission("Blog Category", "_Test Blog Category 2", "test2@example.com", ignore_permissions=True, is_default=1) + add_user_permission("Blog Category", "-test-blog-category-2", "test2@example.com", ignore_permissions=True, is_default=1) frappe.clear_cache() doc = frappe.new_doc("Blog Post") - self.assertEqual(doc.get("blog_category"), "_Test Blog Category 2") + self.assertEqual(doc.get("blog_category"), "-test-blog-category-2") def test_user_link_match_doc(self): blogger = frappe.get_doc("Blogger", "_Test Blogger 1") @@ -215,7 +215,7 @@ class TestPermissions(unittest.TestCase): frappe.clear_cache(doctype='DocType') def test_user_permission_doctypes(self): - add_user_permission("Blog Category", "_Test Blog Category 1", + add_user_permission("Blog Category", "-test-blog-category-1", "test2@example.com") add_user_permission("Blogger", "_Test Blogger 1", "test2@example.com") @@ -235,7 +235,7 @@ class TestPermissions(unittest.TestCase): def if_owner_setup(self): update('Blog Post', 'Blogger', 0, 'if_owner', 1) - add_user_permission("Blog Category", "_Test Blog Category 1", + add_user_permission("Blog Category", "-test-blog-category-1", "test2@example.com") add_user_permission("Blogger", "_Test Blogger 1", "test2@example.com") @@ -254,7 +254,7 @@ class TestPermissions(unittest.TestCase): doc = frappe.get_doc({ "doctype": "Blog Post", - "blog_category": "_Test Blog Category", + "blog_category": "-test-blog-category", "blogger": "_Test Blogger 1", "title": "_Test Blog Post Title", "content": "_Test Blog Post Content" @@ -263,14 +263,14 @@ class TestPermissions(unittest.TestCase): self.assertRaises(frappe.PermissionError, doc.insert) frappe.set_user('test1@example.com') - add_user_permission("Blog Category", "_Test Blog Category", + add_user_permission("Blog Category", "-test-blog-category", "test2@example.com") frappe.set_user("test2@example.com") doc.insert() frappe.set_user("Administrator") - remove_user_permission("Blog Category", "_Test Blog Category", + remove_user_permission("Blog Category", "-test-blog-category", "test2@example.com") frappe.set_user("test2@example.com") @@ -286,13 +286,13 @@ class TestPermissions(unittest.TestCase): def test_ignore_user_permissions_if_missing(self): """If there are no user permissions, then allow as per role""" - add_user_permission("Blog Category", "_Test Blog Category", + add_user_permission("Blog Category", "-test-blog-category", "test2@example.com") frappe.set_user("test2@example.com") doc = frappe.get_doc({ "doctype": "Blog Post", - "blog_category": "_Test Blog Category 2", + "blog_category": "-test-blog-category-2", "blogger": "_Test Blogger 1", "title": "_Test Blog Post Title", "content": "_Test Blog Post Content" @@ -301,7 +301,7 @@ class TestPermissions(unittest.TestCase): self.assertFalse(doc.has_permission("write")) frappe.set_user("Administrator") - remove_user_permission("Blog Category", "_Test Blog Category", + remove_user_permission("Blog Category", "-test-blog-category", "test2@example.com") frappe.set_user("test2@example.com") @@ -420,7 +420,7 @@ class TestPermissions(unittest.TestCase): doc = frappe.get_doc({ "doctype": "Blog Post", - "blog_category": "_Test Blog Category", + "blog_category": "-test-blog-category", "blogger": "_Test Blogger 1", "title": "_Test Blog Post Title", "content": "_Test Blog Post Content" @@ -454,7 +454,7 @@ class TestPermissions(unittest.TestCase): add_user_permission('Blog Post', '-test-blog-post-1', 'test2@example.com') add_user_permission('Blog Post', '-test-blog-post-2', 'test2@example.com') - add_user_permission("Blog Category", '_Test Blog Category 1', 'test2@example.com') + add_user_permission("Blog Category", '-test-blog-category-1', 'test2@example.com') deleted_user_permission_count = clear_user_permissions('test2@example.com', 'Blog Post') diff --git a/frappe/website/doctype/blog_category/test_records.json b/frappe/website/doctype/blog_category/test_records.json index 89ff56d4fd..4bd4ac35b7 100644 --- a/frappe/website/doctype/blog_category/test_records.json +++ b/frappe/website/doctype/blog_category/test_records.json @@ -2,19 +2,16 @@ { "doctype": "Blog Category", "parent_website_route": "blog", - "title": "_Test Blog Category", - "name": "_Test Blog Category" + "title": "_Test Blog Category" }, { "doctype": "Blog Category", "parent_website_route": "blog", - "title": "_Test Blog Category 1", - "name": "_Test Blog Category 1" + "title": "_Test Blog Category 1" }, { "doctype": "Blog Category", "parent_website_route": "blog", - "title": "_Test Blog Category 2", - "name": "_Test Blog Category 2" + "title": "_Test Blog Category 2" } ] \ No newline at end of file From cbaa795c200b82414b109fd3824582e8a16bb522 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 26 Aug 2020 11:57:03 +0530 Subject: [PATCH 041/142] fix(backups): Allow naming conf file via BackupGenerator --- frappe/utils/backups.py | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index a64ba8c3a7..abf2a5fc81 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -27,7 +27,7 @@ class BackupGenerator: To initialize, specify (db_name, user, password, db_file_name=None, db_host="localhost") If specifying db_file_name, also append ".sql.gz" """ - def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None, + def __init__(self, db_name, user, password, backup_path_conf=None, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, db_host="localhost", db_port=None, verbose=False, db_type='mariadb'): global _verbose @@ -37,8 +37,9 @@ class BackupGenerator: self.db_type = db_type self.user = user self.password = password - self.backup_path_files = backup_path_files + self.backup_path_conf = backup_path_conf self.backup_path_db = backup_path_db + self.backup_path_files = backup_path_files self.backup_path_private_files = backup_path_private_files if not self.db_port and self.db_type == 'mariadb': @@ -83,11 +84,14 @@ class BackupGenerator: def set_backup_file_name(self): #Generate a random name using today's date and a 8 digit random number + for_conf = self.todays_date + "-" + self.site_slug + "-site_config_backup.json" for_db = self.todays_date + "-" + self.site_slug + "-database.sql.gz" for_public_files = self.todays_date + "-" + self.site_slug + "-files.tar" for_private_files = self.todays_date + "-" + self.site_slug + "-private-files.tar" backup_path = get_backup_path() + if not self.backup_path_conf: + self.backup_path_conf = os.path.join(backup_path, for_conf) if not self.backup_path_db: self.backup_path_db = os.path.join(backup_path, for_db) if not self.backup_path_files: @@ -150,19 +154,11 @@ class BackupGenerator: print('Backed up files', os.path.abspath(backup_path)) def copy_site_config(self): - site_config_backup_path = os.path.join( - get_backup_path(), - "{time_stamp}-{site_slug}-site_config_backup.json".format( - time_stamp=self.todays_date, - site_slug=self.site_slug)) + site_config_backup_path = self.backup_path_conf site_config_path = os.path.join(frappe.get_site_path(), "site_config.json") - site_config = {} - if os.path.exists(site_config_path): - site_config.update(frappe.get_file_json(site_config_path)) + with open(site_config_backup_path, "w") as f: - f.write(json.dumps(site_config, indent=2)) - f.flush() - self.site_config_backup_path = site_config_backup_path + json.dump(frappe.get_file_json(site_config_path), f, indent=2) def take_dump(self): import frappe.utils From ae8201cc1c8a8f430919d3832476479ce92c0414 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 26 Aug 2020 12:08:51 +0530 Subject: [PATCH 042/142] fix: Just copy the contents of the files instead of parsing it --- frappe/utils/backups.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index abf2a5fc81..3d683f6c0a 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -157,8 +157,8 @@ class BackupGenerator: site_config_backup_path = self.backup_path_conf site_config_path = os.path.join(frappe.get_site_path(), "site_config.json") - with open(site_config_backup_path, "w") as f: - json.dump(frappe.get_file_json(site_config_path), f, indent=2) + with open(site_config_backup_path, "w") as n, open(site_config_path) as c: + n.write(c.read()) def take_dump(self): import frappe.utils From 2ae5ce7d0e157a3ca5e3b04cc71f4b6ccb997d6f Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 26 Aug 2020 20:48:29 +0530 Subject: [PATCH 043/142] fix: Subtitle in Section With Tabs web template --- .../web_template/section_with_tabs/section_with_tabs.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/website/web_template/section_with_tabs/section_with_tabs.html b/frappe/website/web_template/section_with_tabs/section_with_tabs.html index 0c206b1c48..bb90611b4c 100644 --- a/frappe/website/web_template/section_with_tabs/section_with_tabs.html +++ b/frappe/website/web_template/section_with_tabs/section_with_tabs.html @@ -1,5 +1,8 @@

{{ title }}

+ +{%- if subtitle-%}

{{ subtitle }}

+{%- endif -%}
{% set ns = namespace(tabs=[]) %} From 2414dd386c24dcd0334a8c491eeb21d65d21bb14 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 27 Aug 2020 11:36:43 +0530 Subject: [PATCH 044/142] fix: formatting --- .../web_template/section_with_tabs/section_with_tabs.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/web_template/section_with_tabs/section_with_tabs.html b/frappe/website/web_template/section_with_tabs/section_with_tabs.html index bb90611b4c..9a5bb20e0f 100644 --- a/frappe/website/web_template/section_with_tabs/section_with_tabs.html +++ b/frappe/website/web_template/section_with_tabs/section_with_tabs.html @@ -1,6 +1,6 @@

{{ title }}

-{%- if subtitle-%} +{%- if subtitle -%}

{{ subtitle }}

{%- endif -%} From 5c7f34b15dd91a00bee7c44cca72881f4ece0de5 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 27 Aug 2020 14:22:48 +0530 Subject: [PATCH 045/142] test: update records --- frappe/website/doctype/blog_post/test_records.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_records.json b/frappe/website/doctype/blog_post/test_records.json index 79a3525801..4b29eadfa4 100644 --- a/frappe/website/doctype/blog_post/test_records.json +++ b/frappe/website/doctype/blog_post/test_records.json @@ -1,6 +1,6 @@ [ { - "blog_category": "_Test Blog Category", + "blog_category": "-test-blog-category", "blog_intro": "Test Blog Intro", "blogger": "_Test Blogger", "content": "Test Blog Content", @@ -9,7 +9,7 @@ "published": 1 }, { - "blog_category": "_Test Blog Category 1", + "blog_category": "-test-blog-category-1", "blog_intro": "Test Blog Intro", "blogger": "_Test Blogger", "content": "Test Blog Content", @@ -18,7 +18,7 @@ "published": 1 }, { - "blog_category": "_Test Blog Category 1", + "blog_category": "-test-blog-category-1", "blog_intro": "Test Blog Intro", "blogger": "_Test Blogger 1", "content": "Test Blog Content", @@ -27,7 +27,7 @@ "published": 0 }, { - "blog_category": "_Test Blog Category 1", + "blog_category": "-test-blog-category-1", "blog_intro": "Test Blog Intro", "blogger": "_Test Blogger 2", "content": "Test Blog Content", @@ -35,4 +35,4 @@ "title": "_Test Blog Post 3", "published": 0 } -] \ No newline at end of file +] From a4217f2e387ea1ce00cfc4984c208bbb911f5653 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 27 Aug 2020 14:48:17 +0530 Subject: [PATCH 046/142] fix: Safer is_downgrade checks --- frappe/installer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/installer.py b/frappe/installer.py index 4baf0929f0..4994646890 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -359,8 +359,11 @@ def is_downgrade(sql_file_path, verbose=False): if head in line: # 'line' (str) format: ('2056588823','2020-05-11 18:21:31.488367','2020-06-12 11:49:31.079506','Administrator','Administrator',0,'Installed Applications','installed_applications','Installed Applications',1,'frappe','v10.1.71-74 (3c50d5e) (v10.x.x)','v10.x.x'),('855c640b8e','2020-05-11 18:21:31.488367','2020-06-12 11:49:31.079506','Administrator','Administrator',0,'Installed Applications','installed_applications','Installed Applications',2,'your_custom_app','0.0.1','master') line = line.strip().lstrip(head).rstrip(";").strip() + app_rows = frappe.safe_eval(line) + # check if iterable consists of tuples before trying to transform + apps_list = app_rows if all(isinstance(app_row, (tuple, list, set)) for app_row in app_rows) else (app_rows, ) # 'all_apps' (list) format: [('frappe', '12.x.x-develop ()', 'develop'), ('your_custom_app', '0.0.1', 'master')] - all_apps = [ x[-3:] for x in frappe.safe_eval(line) ] + all_apps = [ x[-3:] for x in apps_list ] for app in all_apps: app_name = app[0] From 8398b8b6d84def1a48bd48c00c309df0e83c797d Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 27 Aug 2020 18:11:29 +0200 Subject: [PATCH 047/142] feat: add autoprefixer --- package.json | 1 + rollup/config.js | 1 + yarn.lock | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/package.json b/package.json index f893d03ad3..fb3e507bd5 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "dependencies": { "ace-builds": "^1.4.8", "air-datepicker": "http://github.com/frappe/air-datepicker", + "autoprefixer": "^9.8.6", "awesomplete": "^1.1.5", "bootstrap": "^4.4.1", "cookie": "^0.4.0", diff --git a/rollup/config.js b/rollup/config.js index 460780bc1b..b1816cb4c6 100644 --- a/rollup/config.js +++ b/rollup/config.js @@ -117,6 +117,7 @@ function get_rollup_options_for_css(output_file, input_files) { // less -> css postcss({ plugins: [ + starts_with_css ? require('autoprefixer')() : null, starts_with_css && production ? require('cssnano')({ preset: 'default' }) : null ].filter(Boolean), extract: output_path, diff --git a/yarn.lock b/yarn.lock index c3808f680a..41fd1926c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -836,6 +836,19 @@ atob@^2.1.1: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +autoprefixer@^9.8.6: + version "9.8.6" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f" + integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg== + dependencies: + browserslist "^4.12.0" + caniuse-lite "^1.0.30001109" + colorette "^1.2.1" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^7.0.32" + postcss-value-parser "^4.1.0" + available-typed-arrays@^1.0.0, available-typed-arrays@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" @@ -1048,6 +1061,16 @@ browserslist@^4.0.0: electron-to-chromium "^1.3.113" node-releases "^1.1.8" +browserslist@^4.12.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.0.tgz#2908951abfe4ec98737b72f34c3bcedc8d43b000" + integrity sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ== + dependencies: + caniuse-lite "^1.0.30001111" + electron-to-chromium "^1.3.523" + escalade "^3.0.2" + node-releases "^1.1.60" + buble@^0.19.6: version "0.19.6" resolved "https://registry.yarnpkg.com/buble/-/buble-0.19.6.tgz#915909b6bd5b11ee03b1c885ec914a8b974d34d3" @@ -1203,6 +1226,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000939: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001116.tgz" integrity sha512-f2lcYnmAI5Mst9+g0nkMIznFGsArRmZ0qU+dnq8l91hymdc2J3SFbiPhOJEeDqC1vtE8nc1qNQyklzB8veJefQ== +caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111: + version "1.0.30001118" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz#116a9a670e5264aec895207f5e918129174c6f62" + integrity sha512-RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -1427,6 +1455,11 @@ color@^3.0.0: color-convert "^1.9.1" color-string "^1.5.2" +colorette@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" + integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -2134,6 +2167,11 @@ electron-to-chromium@^1.3.113: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz#b1ccf619df7295aea17bc6951dc689632629e4a9" integrity sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g== +electron-to-chromium@^1.3.523: + version "1.3.551" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.551.tgz#a94d243a4ca90705189bd4a5eca4e0f56b745a4f" + integrity sha512-11qcm2xvf2kqeFO5EIejaBx5cKXsW1quAyv3VctCMYwofnyVZLs97y6LCekss3/ghQpr7PYkSO3uId5FmxZsdw== + elegant-spinner@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" @@ -2309,6 +2347,11 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" +escalade@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.2.tgz#6a580d70edb87880f22b4c91d0d56078df6962c4" + integrity sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ== + escape-goat@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" @@ -4816,6 +4859,11 @@ node-gyp@^3.8.0: tar "^2.0.0" which "1" +node-releases@^1.1.60: + version "1.1.60" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.60.tgz#6948bdfce8286f0b5d0e5a88e8384e954dfe7084" + integrity sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA== + node-releases@^1.1.8: version "1.1.9" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.9.tgz#70d0985ec4bf7de9f08fc481f5dae111889ca482" @@ -4878,6 +4926,11 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" +normalize-range@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" + integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + normalize-url@^3.0.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" @@ -4912,6 +4965,11 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" +num2fraction@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" + integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= + number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -5731,6 +5789,11 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== +postcss-value-parser@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" + integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== + postcss@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" @@ -5768,6 +5831,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.5: source-map "^0.6.1" supports-color "^6.1.0" +postcss@^7.0.32: + version "7.0.32" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d" + integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw== + dependencies: + chalk "^2.4.2" + source-map "^0.6.1" + supports-color "^6.1.0" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" From 458087b3ea65effec610482f0f4914f5f3982735 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 28 Aug 2020 11:31:51 +0530 Subject: [PATCH 048/142] fix: skip table fields in link preview --- frappe/desk/link_preview.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/desk/link_preview.py b/frappe/desk/link_preview.py index f380f96e26..9b4471aa8d 100644 --- a/frappe/desk/link_preview.py +++ b/frappe/desk/link_preview.py @@ -1,5 +1,5 @@ import frappe -from frappe.model import no_value_fields +from frappe.model import no_value_fields, table_fields import json @frappe.whitelist() @@ -9,11 +9,13 @@ def get_preview_data(doctype, docname): if not meta.show_preview_popup: return preview_fields = [field.fieldname for field in meta.fields \ - if field.in_preview and field.fieldtype not in no_value_fields] + if field.in_preview and field.fieldtype not in no_value_fields \ + and field.fieldtype not in table_fields] # no preview fields defined, build list from mandatory fields if not preview_fields: - preview_fields = [field.fieldname for field in meta.fields if field.reqd] + preview_fields = [field.fieldname for field in meta.fields if field.reqd \ + and field.fieldtype not in table_fields] title_field = meta.get_title_field() image_field = meta.image_field From cff99e81588cd156ebf9abf5d2ef05c321cd2cf5 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 28 Aug 2020 11:44:41 +0530 Subject: [PATCH 049/142] fix: show 'In Preview' option only if fieldtype is not table field --- frappe/core/doctype/docfield/docfield.json | 4 +- .../doctype/custom_field/custom_field.json | 540 +++++++++--------- .../customize_form_field.json | 512 ++++++++--------- 3 files changed, 531 insertions(+), 525 deletions(-) diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index aab59a5a0a..e420d3b775 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -163,6 +163,7 @@ }, { "default": "0", + "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);", "fieldname": "in_preview", "fieldtype": "Check", "label": "In Preview" @@ -475,9 +476,10 @@ } ], "idx": 1, + "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-02-06 09:06:25.224413", + "modified": "2020-08-28 11:28:21.252853", "modified_by": "Administrator", "module": "Core", "name": "DocField", diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index 6fa7b29161..3946568bb6 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -58,382 +58,384 @@ ], "fields": [ { - "bold": 1, - "fieldname": "dt", - "fieldtype": "Link", - "in_filter": 1, - "in_list_view": 1, - "label": "Document", - "oldfieldname": "dt", - "oldfieldtype": "Link", - "options": "DocType", - "reqd": 1, - "search_index": 1 + "bold": 1, + "fieldname": "dt", + "fieldtype": "Link", + "in_filter": 1, + "in_list_view": 1, + "label": "Document", + "oldfieldname": "dt", + "oldfieldtype": "Link", + "options": "DocType", + "reqd": 1, + "search_index": 1 }, { - "bold": 1, - "fieldname": "label", - "fieldtype": "Data", - "in_filter": 1, - "label": "Label", - "no_copy": 1, - "oldfieldname": "label", - "oldfieldtype": "Data" + "bold": 1, + "fieldname": "label", + "fieldtype": "Data", + "in_filter": 1, + "label": "Label", + "no_copy": 1, + "oldfieldname": "label", + "oldfieldtype": "Data" }, { - "fieldname": "label_help", - "fieldtype": "HTML", - "label": "Label Help", - "oldfieldtype": "HTML" + "fieldname": "label_help", + "fieldtype": "HTML", + "label": "Label Help", + "oldfieldtype": "HTML" }, { - "fieldname": "fieldname", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Fieldname", - "no_copy": 1, - "oldfieldname": "fieldname", - "oldfieldtype": "Data", - "read_only": 1 + "fieldname": "fieldname", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Fieldname", + "no_copy": 1, + "oldfieldname": "fieldname", + "oldfieldtype": "Data", + "read_only": 1 }, { - "description": "Select the label after which you want to insert new field.", - "fieldname": "insert_after", - "fieldtype": "Select", - "label": "Insert After", - "no_copy": 1, - "oldfieldname": "insert_after", - "oldfieldtype": "Select" + "description": "Select the label after which you want to insert new field.", + "fieldname": "insert_after", + "fieldtype": "Select", + "label": "Insert After", + "no_copy": 1, + "oldfieldname": "insert_after", + "oldfieldtype": "Select" }, { - "fieldname": "column_break_6", - "fieldtype": "Column Break" + "fieldname": "column_break_6", + "fieldtype": "Column Break" }, { - "bold": 1, - "default": "Data", - "fieldname": "fieldtype", - "fieldtype": "Select", - "in_filter": 1, - "in_list_view": 1, - "label": "Field Type", - "oldfieldname": "fieldtype", - "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", - "reqd": 1 + "bold": 1, + "default": "Data", + "fieldname": "fieldtype", + "fieldtype": "Select", + "in_filter": 1, + "in_list_view": 1, + "label": "Field Type", + "oldfieldname": "fieldtype", + "oldfieldtype": "Select", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", + "reqd": 1 }, { - "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)", - "description": "Set non-standard precision for a Float or Currency field", - "fieldname": "precision", - "fieldtype": "Select", - "label": "Precision", - "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9" + "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)", + "description": "Set non-standard precision for a Float or Currency field", + "fieldname": "precision", + "fieldtype": "Select", + "label": "Precision", + "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9" }, { - "fieldname": "options", - "fieldtype": "Small Text", - "in_list_view": 1, - "label": "Options", - "oldfieldname": "options", - "oldfieldtype": "Text" + "fieldname": "options", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "Options", + "oldfieldname": "options", + "oldfieldtype": "Text" }, { - "fieldname": "fetch_from", - "fieldtype": "Small Text", - "label": "Fetch From" + "fieldname": "fetch_from", + "fieldtype": "Small Text", + "label": "Fetch From" }, { - "default": "0", - "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.", - "fieldname": "fetch_if_empty", - "fieldtype": "Check", - "label": "Fetch If Empty" + "default": "0", + "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.", + "fieldname": "fetch_if_empty", + "fieldtype": "Check", + "label": "Fetch If Empty" }, { - "fieldname": "options_help", - "fieldtype": "HTML", - "label": "Options Help", - "oldfieldtype": "HTML" + "fieldname": "options_help", + "fieldtype": "HTML", + "label": "Options Help", + "oldfieldtype": "HTML" }, { - "fieldname": "section_break_11", - "fieldtype": "Section Break" + "fieldname": "section_break_11", + "fieldtype": "Section Break" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype==\"Section Break\"", - "fieldname": "collapsible", - "fieldtype": "Check", - "label": "Collapsible" + "default": "0", + "depends_on": "eval:doc.fieldtype==\"Section Break\"", + "fieldname": "collapsible", + "fieldtype": "Check", + "label": "Collapsible" }, { - "depends_on": "eval:doc.fieldtype==\"Section Break\"", - "fieldname": "collapsible_depends_on", - "fieldtype": "Code", - "label": "Collapsible Depends On" + "depends_on": "eval:doc.fieldtype==\"Section Break\"", + "fieldname": "collapsible_depends_on", + "fieldtype": "Code", + "label": "Collapsible Depends On" }, { - "fieldname": "default", - "fieldtype": "Text", - "label": "Default Value", - "oldfieldname": "default", - "oldfieldtype": "Text" + "fieldname": "default", + "fieldtype": "Text", + "label": "Default Value", + "oldfieldname": "default", + "oldfieldtype": "Text" }, { - "fieldname": "depends_on", - "fieldtype": "Code", - "label": "Depends On", - "length": 255 + "fieldname": "depends_on", + "fieldtype": "Code", + "label": "Depends On", + "length": 255 }, { - "fieldname": "description", - "fieldtype": "Text", - "label": "Field Description", - "oldfieldname": "description", - "oldfieldtype": "Text", - "print_width": "300px", - "width": "300px" + "fieldname": "description", + "fieldtype": "Text", + "label": "Field Description", + "oldfieldname": "description", + "oldfieldtype": "Text", + "print_width": "300px", + "width": "300px" }, { - "default": "0", - "fieldname": "permlevel", - "fieldtype": "Int", - "label": "Permission Level", - "oldfieldname": "permlevel", - "oldfieldtype": "Int" + "default": "0", + "fieldname": "permlevel", + "fieldtype": "Int", + "label": "Permission Level", + "oldfieldname": "permlevel", + "oldfieldtype": "Int" }, { - "fieldname": "width", - "fieldtype": "Data", - "label": "Width", - "oldfieldname": "width", - "oldfieldtype": "Data" + "fieldname": "width", + "fieldtype": "Data", + "label": "Width", + "oldfieldname": "width", + "oldfieldtype": "Data" }, { - "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)", - "fieldname": "columns", - "fieldtype": "Int", - "label": "Columns" + "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)", + "fieldname": "columns", + "fieldtype": "Int", + "label": "Columns" }, { - "fieldname": "properties", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "print_width": "50%", - "width": "50%" + "fieldname": "properties", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "print_width": "50%", + "width": "50%" }, { - "default": "0", - "fieldname": "reqd", - "fieldtype": "Check", - "in_list_view": 1, - "label": "Is Mandatory Field", - "oldfieldname": "reqd", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "reqd", + "fieldtype": "Check", + "in_list_view": 1, + "label": "Is Mandatory Field", + "oldfieldname": "reqd", + "oldfieldtype": "Check" }, { - "default": "0", - "fieldname": "unique", - "fieldtype": "Check", - "label": "Unique" + "default": "0", + "fieldname": "unique", + "fieldtype": "Check", + "label": "Unique" }, { - "default": "0", - "fieldname": "read_only", - "fieldtype": "Check", - "label": "Read Only" + "default": "0", + "fieldname": "read_only", + "fieldtype": "Check", + "label": "Read Only" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype===\"Link\"", - "fieldname": "ignore_user_permissions", - "fieldtype": "Check", - "label": "Ignore User Permissions" + "default": "0", + "depends_on": "eval:doc.fieldtype===\"Link\"", + "fieldname": "ignore_user_permissions", + "fieldtype": "Check", + "label": "Ignore User Permissions" }, { - "default": "0", - "fieldname": "hidden", - "fieldtype": "Check", - "label": "Hidden" + "default": "0", + "fieldname": "hidden", + "fieldtype": "Check", + "label": "Hidden" }, { - "default": "0", - "fieldname": "print_hide", - "fieldtype": "Check", - "label": "Print Hide", - "oldfieldname": "print_hide", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "print_hide", + "fieldtype": "Check", + "label": "Print Hide", + "oldfieldname": "print_hide", + "oldfieldtype": "Check" }, { - "default": "0", - "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1", - "fieldname": "print_hide_if_no_value", - "fieldtype": "Check", - "label": "Print Hide If No Value" + "default": "0", + "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1", + "fieldname": "print_hide_if_no_value", + "fieldtype": "Check", + "label": "Print Hide If No Value" }, { - "fieldname": "print_width", - "fieldtype": "Data", - "hidden": 1, - "label": "Print Width", - "no_copy": 1, - "print_hide": 1 + "fieldname": "print_width", + "fieldtype": "Data", + "hidden": 1, + "label": "Print Width", + "no_copy": 1, + "print_hide": 1 }, { - "default": "0", - "fieldname": "no_copy", - "fieldtype": "Check", - "label": "No Copy", - "oldfieldname": "no_copy", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "no_copy", + "fieldtype": "Check", + "label": "No Copy", + "oldfieldname": "no_copy", + "oldfieldtype": "Check" }, { - "default": "0", - "fieldname": "allow_on_submit", - "fieldtype": "Check", - "label": "Allow on Submit", - "oldfieldname": "allow_on_submit", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "allow_on_submit", + "fieldtype": "Check", + "label": "Allow on Submit", + "oldfieldname": "allow_on_submit", + "oldfieldtype": "Check" }, { - "default": "0", - "fieldname": "in_list_view", - "fieldtype": "Check", - "label": "In List View" + "default": "0", + "fieldname": "in_list_view", + "fieldtype": "Check", + "label": "In List View" }, { - "default": "0", - "fieldname": "in_standard_filter", - "fieldtype": "Check", - "label": "In Standard Filter" + "default": "0", + "fieldname": "in_standard_filter", + "fieldtype": "Check", + "label": "In Standard Filter" }, { - "default": "0", - "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)", - "fieldname": "in_global_search", - "fieldtype": "Check", - "label": "In Global Search" + "default": "0", + "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)", + "fieldname": "in_global_search", + "fieldtype": "Check", + "label": "In Global Search" }, { - "default": "0", - "fieldname": "bold", - "fieldtype": "Check", - "label": "Bold" + "default": "0", + "fieldname": "bold", + "fieldtype": "Check", + "label": "Bold" }, { - "default": "0", - "fieldname": "report_hide", - "fieldtype": "Check", - "label": "Report Hide", - "oldfieldname": "report_hide", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "report_hide", + "fieldtype": "Check", + "label": "Report Hide", + "oldfieldname": "report_hide", + "oldfieldtype": "Check" }, { - "default": "0", - "fieldname": "search_index", - "fieldtype": "Check", - "hidden": 1, - "label": "Index", - "no_copy": 1, - "print_hide": 1 + "default": "0", + "fieldname": "search_index", + "fieldtype": "Check", + "hidden": 1, + "label": "Index", + "no_copy": 1, + "print_hide": 1 }, { - "default": "0", - "description": "Don't HTML Encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field", - "fieldname": "ignore_xss_filter", - "fieldtype": "Check", - "label": "Ignore XSS Filter" + "default": "0", + "description": "Don't HTML Encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field", + "fieldname": "ignore_xss_filter", + "fieldtype": "Check", + "label": "Ignore XSS Filter" }, { - "default": "1", - "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)", - "fieldname": "translatable", - "fieldtype": "Check", - "label": "Translatable" + "default": "1", + "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)", + "fieldname": "translatable", + "fieldtype": "Check", + "label": "Translatable" }, { - "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)", - "fieldname": "length", - "fieldtype": "Int", - "label": "Length" + "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)", + "fieldname": "length", + "fieldtype": "Int", + "label": "Length" }, { - "fieldname": "mandatory_depends_on", - "fieldtype": "Code", - "label": "Mandatory Depends On", - "length": 255 + "fieldname": "mandatory_depends_on", + "fieldtype": "Code", + "label": "Mandatory Depends On", + "length": 255 }, { - "fieldname": "read_only_depends_on", - "fieldtype": "Code", - "label": "Read Only Depends On", - "length": 255 + "fieldname": "read_only_depends_on", + "fieldtype": "Code", + "label": "Read Only Depends On", + "length": 255 }, { - "default": "0", - "fieldname": "allow_in_quick_entry", - "fieldtype": "Check", - "label": "Allow in Quick Entry" + "default": "0", + "fieldname": "allow_in_quick_entry", + "fieldtype": "Check", + "label": "Allow in Quick Entry" }, { - "default": "0", - "fieldname": "in_preview", - "fieldtype": "Check", - "label": "In Preview" + "default": "0", + "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);", + "fieldname": "in_preview", + "fieldtype": "Check", + "label": "In Preview" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype=='Duration'", - "fieldname": "hide_seconds", - "fieldtype": "Check", - "label": "Hide Seconds" + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_seconds", + "fieldtype": "Check", + "label": "Hide Seconds" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype=='Duration'", - "fieldname": "hide_days", - "fieldtype": "Check", - "label": "Hide Days" + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_days", + "fieldtype": "Check", + "label": "Hide Days" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype=='Section Break'", - "fieldname": "hide_border", - "fieldtype": "Check", - "label": "Hide Border" + "default": "0", + "depends_on": "eval:doc.fieldtype=='Section Break'", + "fieldname": "hide_border", + "fieldtype": "Check", + "label": "Hide Border" } ], "icon": "fa fa-glass", "idx": 1, + "index_web_pages_for_search": 1, "links": [], - "modified": "2020-02-06 23:43:00.123575", + "modified": "2020-08-28 11:28:44.377753", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", "owner": "Administrator", "permissions": [ { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "Administrator", - "share": 1, - "write": 1 + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Administrator", + "share": 1, + "write": 1 }, { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 + "create": 1, + "delete": 1, + "email": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 } ], "search_fields": "dt,label,fieldtype,options", diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index 267213517c..1c7349ef01 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -60,364 +60,366 @@ ], "fields": [ { - "fieldname": "label_and_type", - "fieldtype": "Section Break", - "label": "Label and Type" + "fieldname": "label_and_type", + "fieldtype": "Section Break", + "label": "Label and Type" }, { - "fieldname": "label", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Label", - "oldfieldname": "label", - "oldfieldtype": "Data", - "search_index": 1 + "fieldname": "label", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Label", + "oldfieldname": "label", + "oldfieldtype": "Data", + "search_index": 1 }, { - "default": "Data", - "fieldname": "fieldtype", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Type", - "oldfieldname": "fieldtype", - "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime", - "reqd": 1, - "search_index": 1 + "default": "Data", + "fieldname": "fieldtype", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Type", + "oldfieldname": "fieldtype", + "oldfieldtype": "Select", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime", + "reqd": 1, + "search_index": 1 }, { - "fieldname": "fieldname", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Name", - "oldfieldname": "fieldname", - "oldfieldtype": "Data", - "read_only": 1, - "search_index": 1 + "fieldname": "fieldname", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Name", + "oldfieldname": "fieldname", + "oldfieldtype": "Data", + "read_only": 1, + "search_index": 1 }, { - "default": "0", - "depends_on": "eval:!in_list([\"Section Break\", \"Column Break\", \"Button\", \"HTML\"], doc.fieldtype)", - "fieldname": "reqd", - "fieldtype": "Check", - "label": "Mandatory", - "oldfieldname": "reqd", - "oldfieldtype": "Check", - "print_width": "50px", - "width": "50px" + "default": "0", + "depends_on": "eval:!in_list([\"Section Break\", \"Column Break\", \"Button\", \"HTML\"], doc.fieldtype)", + "fieldname": "reqd", + "fieldtype": "Check", + "label": "Mandatory", + "oldfieldname": "reqd", + "oldfieldtype": "Check", + "print_width": "50px", + "width": "50px" }, { - "default": "0", - "fieldname": "unique", - "fieldtype": "Check", - "label": "Unique" + "default": "0", + "fieldname": "unique", + "fieldtype": "Check", + "label": "Unique" }, { - "default": "0", - "fieldname": "in_list_view", - "fieldtype": "Check", - "label": "In List View" + "default": "0", + "fieldname": "in_list_view", + "fieldtype": "Check", + "label": "In List View" }, { - "default": "0", - "fieldname": "in_standard_filter", - "fieldtype": "Check", - "label": "In Standard Filter" + "default": "0", + "fieldname": "in_standard_filter", + "fieldtype": "Check", + "label": "In Standard Filter" }, { - "default": "0", - "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)", - "fieldname": "in_global_search", - "fieldtype": "Check", - "label": "In Global Search" + "default": "0", + "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)", + "fieldname": "in_global_search", + "fieldtype": "Check", + "label": "In Global Search" }, { - "default": "0", - "fieldname": "bold", - "fieldtype": "Check", - "label": "Bold" + "default": "0", + "fieldname": "bold", + "fieldtype": "Check", + "label": "Bold" }, { - "default": "1", - "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)", - "fieldname": "translatable", - "fieldtype": "Check", - "label": "Translatable" + "default": "1", + "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)", + "fieldname": "translatable", + "fieldtype": "Check", + "label": "Translatable" }, { - "fieldname": "column_break_7", - "fieldtype": "Column Break" + "fieldname": "column_break_7", + "fieldtype": "Column Break" }, { - "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)", - "description": "Set non-standard precision for a Float or Currency field", - "fieldname": "precision", - "fieldtype": "Select", - "label": "Precision", - "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9" + "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)", + "description": "Set non-standard precision for a Float or Currency field", + "fieldname": "precision", + "fieldtype": "Select", + "label": "Precision", + "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9" }, { - "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image'], doc.fieldtype)", - "fieldname": "length", - "fieldtype": "Int", - "label": "Length" + "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image'], doc.fieldtype)", + "fieldname": "length", + "fieldtype": "Int", + "label": "Length" }, { - "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.", - "fieldname": "options", - "fieldtype": "Small Text", - "in_list_view": 1, - "label": "Options", - "oldfieldname": "options", - "oldfieldtype": "Text" + "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.", + "fieldname": "options", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "Options", + "oldfieldname": "options", + "oldfieldtype": "Text" }, { - "fieldname": "fetch_from", - "fieldtype": "Small Text", - "label": "Fetch From" + "fieldname": "fetch_from", + "fieldtype": "Small Text", + "label": "Fetch From" }, { - "default": "0", - "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.", - "fieldname": "fetch_if_empty", - "fieldtype": "Check", - "label": "Fetch If Empty" + "default": "0", + "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.", + "fieldname": "fetch_if_empty", + "fieldtype": "Check", + "label": "Fetch If Empty" }, { - "fieldname": "permissions", - "fieldtype": "Section Break", - "label": "Permissions" + "fieldname": "permissions", + "fieldtype": "Section Break", + "label": "Permissions" }, { - "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age>18", - "fieldname": "depends_on", - "fieldtype": "Code", - "label": "Depends On", - "oldfieldname": "depends_on", - "oldfieldtype": "Data", - "options": "JS" + "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age>18", + "fieldname": "depends_on", + "fieldtype": "Code", + "label": "Depends On", + "oldfieldname": "depends_on", + "oldfieldtype": "Data", + "options": "JS" }, { - "default": "0", - "fieldname": "permlevel", - "fieldtype": "Int", - "in_list_view": 1, - "label": "Perm Level", - "oldfieldname": "permlevel", - "oldfieldtype": "Int" + "default": "0", + "fieldname": "permlevel", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Perm Level", + "oldfieldname": "permlevel", + "oldfieldtype": "Int" }, { - "default": "0", - "fieldname": "hidden", - "fieldtype": "Check", - "label": "Hidden", - "oldfieldname": "hidden", - "oldfieldtype": "Check", - "print_width": "50px", - "width": "50px" + "default": "0", + "fieldname": "hidden", + "fieldtype": "Check", + "label": "Hidden", + "oldfieldname": "hidden", + "oldfieldtype": "Check", + "print_width": "50px", + "width": "50px" }, { - "default": "0", - "fieldname": "read_only", - "fieldtype": "Check", - "label": "Read Only" + "default": "0", + "fieldname": "read_only", + "fieldtype": "Check", + "label": "Read Only" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype==\"Section Break\"", - "fieldname": "collapsible", - "fieldtype": "Check", - "label": "Collapsible" + "default": "0", + "depends_on": "eval:doc.fieldtype==\"Section Break\"", + "fieldname": "collapsible", + "fieldtype": "Check", + "label": "Collapsible" }, { - "default": "0", - "depends_on": "eval: doc.fieldtype == \"Table\"", - "fieldname": "allow_bulk_edit", - "fieldtype": "Check", - "label": "Allow Bulk Edit" + "default": "0", + "depends_on": "eval: doc.fieldtype == \"Table\"", + "fieldname": "allow_bulk_edit", + "fieldtype": "Check", + "label": "Allow Bulk Edit" }, { - "depends_on": "eval:doc.fieldtype==\"Section Break\"", - "fieldname": "collapsible_depends_on", - "fieldtype": "Code", - "label": "Collapsible Depends On", - "options": "JS" + "depends_on": "eval:doc.fieldtype==\"Section Break\"", + "fieldname": "collapsible_depends_on", + "fieldtype": "Code", + "label": "Collapsible Depends On", + "options": "JS" }, { - "fieldname": "column_break_14", - "fieldtype": "Column Break" + "fieldname": "column_break_14", + "fieldtype": "Column Break" }, { - "default": "0", - "fieldname": "ignore_user_permissions", - "fieldtype": "Check", - "label": "Ignore User Permissions" + "default": "0", + "fieldname": "ignore_user_permissions", + "fieldtype": "Check", + "label": "Ignore User Permissions" }, { - "default": "0", - "fieldname": "allow_on_submit", - "fieldtype": "Check", - "label": "Allow on Submit", - "oldfieldname": "allow_on_submit", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "allow_on_submit", + "fieldtype": "Check", + "label": "Allow on Submit", + "oldfieldname": "allow_on_submit", + "oldfieldtype": "Check" }, { - "default": "0", - "fieldname": "report_hide", - "fieldtype": "Check", - "label": "Report Hide", - "oldfieldname": "report_hide", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "report_hide", + "fieldtype": "Check", + "label": "Report Hide", + "oldfieldname": "report_hide", + "oldfieldtype": "Check" }, { - "default": "0", - "depends_on": "eval:(doc.fieldtype == 'Link')", - "fieldname": "remember_last_selected_value", - "fieldtype": "Check", - "label": "Remember Last Selected Value" + "default": "0", + "depends_on": "eval:(doc.fieldtype == 'Link')", + "fieldname": "remember_last_selected_value", + "fieldtype": "Check", + "label": "Remember Last Selected Value" }, { - "fieldname": "display", - "fieldtype": "Section Break", - "label": "Display" + "fieldname": "display", + "fieldtype": "Section Break", + "label": "Display" }, { - "fieldname": "default", - "fieldtype": "Text", - "label": "Default", - "oldfieldname": "default", - "oldfieldtype": "Text" + "fieldname": "default", + "fieldtype": "Text", + "label": "Default", + "oldfieldname": "default", + "oldfieldtype": "Text" }, { - "default": "0", - "fieldname": "in_filter", - "fieldtype": "Check", - "label": "In Filter", - "oldfieldname": "in_filter", - "oldfieldtype": "Check", - "print_width": "50px", - "width": "50px" + "default": "0", + "fieldname": "in_filter", + "fieldtype": "Check", + "label": "In Filter", + "oldfieldname": "in_filter", + "oldfieldtype": "Check", + "print_width": "50px", + "width": "50px" }, { - "fieldname": "column_break_21", - "fieldtype": "Column Break" + "fieldname": "column_break_21", + "fieldtype": "Column Break" }, { - "fieldname": "description", - "fieldtype": "Text", - "label": "Description", - "oldfieldname": "description", - "oldfieldtype": "Text", - "print_width": "300px", - "width": "300px" + "fieldname": "description", + "fieldtype": "Text", + "label": "Description", + "oldfieldname": "description", + "oldfieldtype": "Text", + "print_width": "300px", + "width": "300px" }, { - "default": "0", - "fieldname": "print_hide", - "fieldtype": "Check", - "label": "Print Hide", - "oldfieldname": "print_hide", - "oldfieldtype": "Check" + "default": "0", + "fieldname": "print_hide", + "fieldtype": "Check", + "label": "Print Hide", + "oldfieldname": "print_hide", + "oldfieldtype": "Check" }, { - "default": "0", - "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1", - "fieldname": "print_hide_if_no_value", - "fieldtype": "Check", - "label": "Print Hide If No Value" + "default": "0", + "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1", + "fieldname": "print_hide_if_no_value", + "fieldtype": "Check", + "label": "Print Hide If No Value" }, { - "description": "Print Width of the field, if the field is a column in a table", - "fieldname": "print_width", - "fieldtype": "Data", - "label": "Print Width", - "print_width": "50px", - "width": "50px" + "description": "Print Width of the field, if the field is a column in a table", + "fieldname": "print_width", + "fieldtype": "Data", + "label": "Print Width", + "print_width": "50px", + "width": "50px" }, { - "depends_on": "eval:cur_frm.doc.istable", - "description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)", - "fieldname": "columns", - "fieldtype": "Int", - "label": "Columns" + "depends_on": "eval:cur_frm.doc.istable", + "description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)", + "fieldname": "columns", + "fieldtype": "Int", + "label": "Columns" }, { - "fieldname": "width", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Width", - "oldfieldname": "width", - "oldfieldtype": "Data", - "print_width": "50px", - "width": "50px" + "fieldname": "width", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Width", + "oldfieldname": "width", + "oldfieldtype": "Data", + "print_width": "50px", + "width": "50px" }, { - "default": "0", - "fieldname": "is_custom_field", - "fieldtype": "Check", - "hidden": 1, - "label": "Is Custom Field", - "read_only": 1 + "default": "0", + "fieldname": "is_custom_field", + "fieldtype": "Check", + "hidden": 1, + "label": "Is Custom Field", + "read_only": 1 }, { - "default": "0", - "fieldname": "allow_in_quick_entry", - "fieldtype": "Check", - "label": "Allow in Quick Entry" + "default": "0", + "fieldname": "allow_in_quick_entry", + "fieldtype": "Check", + "label": "Allow in Quick Entry" }, { - "fieldname": "property_depends_on_section", - "fieldtype": "Section Break", - "label": "Property Depends On" + "fieldname": "property_depends_on_section", + "fieldtype": "Section Break", + "label": "Property Depends On" }, { - "fieldname": "mandatory_depends_on", - "fieldtype": "Code", - "label": "Mandatory Depends On", - "options": "JS" + "fieldname": "mandatory_depends_on", + "fieldtype": "Code", + "label": "Mandatory Depends On", + "options": "JS" }, { - "fieldname": "column_break_33", - "fieldtype": "Column Break" + "fieldname": "column_break_33", + "fieldtype": "Column Break" }, { - "fieldname": "read_only_depends_on", - "fieldtype": "Code", - "label": "Read Only Depends On", - "options": "JS" + "fieldname": "read_only_depends_on", + "fieldtype": "Code", + "label": "Read Only Depends On", + "options": "JS" }, { - "default": "0", - "fieldname": "in_preview", - "fieldtype": "Check", - "label": "In Preview" + "default": "0", + "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);", + "fieldname": "in_preview", + "fieldtype": "Check", + "label": "In Preview" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype=='Duration'", - "fieldname": "hide_seconds", - "fieldtype": "Check", - "label": "Hide Seconds" + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_seconds", + "fieldtype": "Check", + "label": "Hide Seconds" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype=='Duration'", - "fieldname": "hide_days", - "fieldtype": "Check", - "label": "Hide Days" + "default": "0", + "depends_on": "eval:doc.fieldtype=='Duration'", + "fieldname": "hide_days", + "fieldtype": "Check", + "label": "Hide Days" }, { - "default": "0", - "depends_on": "eval:doc.fieldtype=='Section Break'", - "fieldname": "hide_border", - "fieldtype": "Check", - "label": "Hide Border" + "default": "0", + "depends_on": "eval:doc.fieldtype=='Section Break'", + "fieldname": "hide_border", + "fieldtype": "Check", + "label": "Hide Border" } ], "idx": 1, + "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-06-02 23:45:46.810868", + "modified": "2020-08-28 11:28:59.084060", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", From 89ddeab996433a028ceab8c5289a16dffdd586ae Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 28 Aug 2020 11:49:11 +0530 Subject: [PATCH 050/142] fix(Activity Log): Handle delete and new actions via Permissions --- .../doctype/activity_log/activity_log.json | 649 ++---------------- .../core/doctype/activity_log/activity_log.py | 3 - 2 files changed, 51 insertions(+), 601 deletions(-) diff --git a/frappe/core/doctype/activity_log/activity_log.json b/frappe/core/doctype/activity_log/activity_log.json index 580882968c..0d85855504 100644 --- a/frappe/core/doctype/activity_log/activity_log.json +++ b/frappe/core/doctype/activity_log/activity_log.json @@ -1,734 +1,187 @@ - { - "allow_copy": 0, - "allow_guest_to_view": 0, +{ + "actions": [], "allow_import": 1, - "allow_rename": 0, - "autoname": "", - "beta": 0, "creation": "2017-10-05 11:10:38.780133", - "custom": 0, "description": "Keep track of all update feeds", - "docstatus": 0, "doctype": "DocType", "document_type": "Setup", - "editable_grid": 0, "engine": "InnoDB", + "field_order": [ + "subject", + "section_break_8", + "content", + "column_break_5", + "additional_info", + "communication_date", + "column_break_7", + "operation", + "status", + "reference_section", + "reference_doctype", + "reference_name", + "reference_owner", + "column_break_14", + "timeline_doctype", + "timeline_name", + "link_doctype", + "link_name", + "user", + "full_name" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "subject", "fieldtype": "Small Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, "in_global_search": 1, "in_list_view": 1, - "in_standard_filter": 0, "label": "Subject", - "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": 0, - "translatable": 0, - "unique": 0 + "reqd": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "section_break_8", - "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 + "fieldtype": "Section Break" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "content", "fieldtype": "Text Editor", - "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": "Message", - "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, "width": "400" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_5", - "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 + "fieldtype": "Column Break" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, "collapsible": 1, - "columns": 0, "fieldname": "additional_info", "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": "More 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, - "translatable": 0, - "unique": 0 + "label": "More Information" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "default": "Now", "fieldname": "communication_date", "fieldtype": "Datetime", - "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": "Date", - "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 + "label": "Date" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_7", - "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 + "fieldtype": "Column Break" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "operation", "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": "Operation", - "length": 0, - "no_copy": 0, - "options": "\nLogin\nLogout", - "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 + "options": "\nLogin\nLogout" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "status", "fieldtype": "Select", - "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": "Status", - "length": 0, - "no_copy": 0, - "options": "\nSuccess\nFailed\nLinked\nClosed", - "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 + "options": "\nSuccess\nFailed\nLinked\nClosed" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, "collapsible": 1, - "columns": 0, "fieldname": "reference_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, - "label": "Reference", - "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 + "label": "Reference" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "reference_doctype", "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": "Reference Document Type", - "length": 0, - "no_copy": 0, - "options": "DocType", - "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 + "options": "DocType" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "reference_name", "fieldtype": "Dynamic 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": "Reference Name", - "length": 0, - "no_copy": 0, - "options": "reference_doctype", - "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 + "options": "reference_doctype" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fetch_from": "reference_name.owner", "fieldname": "reference_owner", "fieldtype": "Read Only", - "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": "Reference Owner", - "length": 0, - "no_copy": 0, - "options": "", - "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": 1, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "search_index": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_14", - "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 + "fieldtype": "Column Break" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "timeline_doctype", "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": "Timeline DocType", - "length": 0, - "no_copy": 0, - "options": "DocType", - "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 + "options": "DocType" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "timeline_name", "fieldtype": "Dynamic 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": "Timeline Name", - "length": 0, - "no_copy": 0, - "options": "timeline_doctype", - "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 + "options": "timeline_doctype" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "link_doctype", "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": "Link DocType", - "length": 0, - "no_copy": 0, "options": "DocType", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "read_only": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "link_name", "fieldtype": "Dynamic 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": "Link Name", - "length": 0, - "no_copy": 0, "options": "link_doctype", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "read_only": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "default": "__user", "fieldname": "user", "fieldtype": "Link", - "hidden": 0, "ignore_user_permissions": 1, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "User", - "length": 0, - "no_copy": 0, "options": "User", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "read_only": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "full_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": "Full 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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "label": "Full Name" } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, "icon": "fa fa-comment", - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2019-09-05 14:22:27.664645", - "modified_by": "Administrator", + "index_web_pages_for_search": 1, + "links": [], + "modified": "2020-08-28 11:43:57.504565", + "modified_by": "gavin18d@gmail.com", "module": "Core", "name": "Activity Log", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, "email": 1, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, "read": 1, "report": 1, "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 + "share": 1 }, { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 1, + "if_owner": 1, "print": 1, "read": 1, "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "delete": 1, - "email": 1, - "export": 0, - "if_owner": 1, - "import": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 0, "role": "All", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 + "share": 1 } ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, "search_fields": "subject", - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", "title_field": "subject", "track_changes": 1, "track_seen": 1 -} +} \ No newline at end of file diff --git a/frappe/core/doctype/activity_log/activity_log.py b/frappe/core/doctype/activity_log/activity_log.py index 8b7941c086..27a2892ca8 100644 --- a/frappe/core/doctype/activity_log/activity_log.py +++ b/frappe/core/doctype/activity_log/activity_log.py @@ -25,9 +25,6 @@ class ActivityLog(Document): if self.reference_doctype and self.reference_name: self.status = "Linked" - def on_trash(self): # pylint: disable=no-self-use - frappe.throw(_("Sorry! You cannot delete auto-generated comments")) - def on_doctype_update(): """Add indexes in `tabActivity Log`""" frappe.db.add_index("Activity Log", ["reference_doctype", "reference_name"]) From 1637c787e050c3c82d487d551bc2cb8210cf2960 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 28 Aug 2020 14:51:04 +0530 Subject: [PATCH 051/142] Reload module def --- frappe/patches.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 985911314e..afe5a30abd 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -15,7 +15,7 @@ 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') frappe.patches.v8_0.drop_is_custom_from_docperm -execute:frappe.reload_doc('core', 'doctype', 'module_def') #2017-09-22 +execute:frappe.reload_doc('core', 'doctype', 'module_def') #2020-08-28 execute:frappe.reload_doc('core', 'doctype', 'version') #2017-04-01 execute:frappe.reload_doc('email', 'doctype', 'document_follow') execute:frappe.reload_doc('core', 'doctype', 'communication_link') #2019-10-02 From 3c57041f74eb1089def0a09162aa168e0772e494 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Fri, 28 Aug 2020 18:06:43 +0200 Subject: [PATCH 052/142] fix(User): merge sections "Email Settings" and "Email Inbox" into "Email" --- frappe/core/doctype/user/user.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/frappe/core/doctype/user/user.json b/frappe/core/doctype/user/user.json index 9e6781ba64..2073f41fdd 100644 --- a/frappe/core/doctype/user/user.json +++ b/frappe/core/doctype/user/user.json @@ -356,7 +356,7 @@ "depends_on": "enabled", "fieldname": "email_settings", "fieldtype": "Section Break", - "label": "Email Settings" + "label": "Email" }, { "default": "1", @@ -382,12 +382,6 @@ "label": "Email Signature", "no_copy": 1 }, - { - "collapsible": 1, - "fieldname": "email_inbox", - "fieldtype": "Section Break", - "label": "Email Inbox" - }, { "fieldname": "user_emails", "fieldtype": "Table", @@ -651,7 +645,7 @@ } ], "max_attachments": 5, - "modified": "2020-08-06 19:48:49.677800", + "modified": "2020-08-26 19:48:49.677800", "modified_by": "Administrator", "module": "Core", "name": "User", @@ -685,4 +679,4 @@ "sort_order": "DESC", "title_field": "full_name", "track_changes": 1 -} \ No newline at end of file +} From 6067751e5f90077f562688464532b583e483679c Mon Sep 17 00:00:00 2001 From: michellealva Date: Sat, 29 Aug 2020 11:39:46 +0530 Subject: [PATCH 053/142] fix: Typo in Print Format Help --- frappe/printing/doctype/print_format/print_format.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index 951a863776..d0c488565c 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -1,4 +1,5 @@ { + "actions": [], "allow_rename": 1, "autoname": "Prompt", "creation": "2013-01-23 19:54:43", @@ -181,7 +182,7 @@ "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" + "options": "

Print Format Help

\n
\n

Introduction

\n

Print Formats 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 Templating 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 currency type fields.
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
\n" }, { "fieldname": "format_data", @@ -199,8 +200,10 @@ ], "icon": "fa fa-print", "idx": 1, - "modified": "2019-11-28 12:40:40.364699", - "modified_by": "faris@erpnext.com", + "index_web_pages_for_search": 1, + "links": [], + "modified": "2020-08-29 11:39:22.312438", + "modified_by": "Administrator", "module": "Printing", "name": "Print Format", "owner": "Administrator", From 9605e828b1c6a86ea07072cc1aa68c647c161abb Mon Sep 17 00:00:00 2001 From: michellealva Date: Sat, 29 Aug 2020 11:45:53 +0530 Subject: [PATCH 054/142] fix: Change link text --- frappe/printing/doctype/print_format/print_format.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/printing/doctype/print_format/print_format.json b/frappe/printing/doctype/print_format/print_format.json index d0c488565c..74ee56cb54 100644 --- a/frappe/printing/doctype/print_format/print_format.json +++ b/frappe/printing/doctype/print_format/print_format.json @@ -182,7 +182,7 @@ "fieldname": "print_format_help", "fieldtype": "HTML", "label": "Print Format Help", - "options": "

Print Format Help

\n
\n

Introduction

\n

Print Formats 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 Templating 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 currency type fields.
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
\n" + "options": "

Print Format Help

\n
\n

Introduction

\n

Print Formats 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 Templating Language
    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 currency type fields.
frappe.db.get_value(\"[doctype]\", \"[name]\", \"fieldname\")Get value from another document.
\n" }, { "fieldname": "format_data", @@ -202,7 +202,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-08-29 11:39:22.312438", + "modified": "2020-08-29 11:44:59.082797", "modified_by": "Administrator", "module": "Printing", "name": "Print Format", From 1b73602a1731f718f3a1cac86116292e18df40a4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 19 Aug 2020 14:31:38 +0530 Subject: [PATCH 055/142] feat(system console): Added a System Console to help in debugging and Console Log --- .../doctype_action/doctype_action.json | 10 +-- frappe/database/mariadb/framework_mariadb.sql | 2 +- .../database/postgres/framework_postgres.sql | 2 +- frappe/desk/doctype/console_log/__init__.py | 0 .../desk/doctype/console_log/console_log.js | 8 +++ .../desk/doctype/console_log/console_log.json | 52 +++++++++++++++ .../desk/doctype/console_log/console_log.py | 10 +++ .../doctype/console_log/test_console_log.py | 10 +++ .../desk/doctype/system_console/__init__.py | 0 .../doctype/system_console/system_console.js | 8 +++ .../system_console/system_console.json | 66 +++++++++++++++++++ .../doctype/system_console/system_console.py | 36 ++++++++++ .../system_console/test_system_console.py | 10 +++ frappe/model/__init__.py | 3 +- frappe/model/naming.py | 2 + frappe/public/js/frappe/form/form.js | 12 +++- frappe/utils/safe_exec.py | 1 + 17 files changed, 224 insertions(+), 8 deletions(-) create mode 100644 frappe/desk/doctype/console_log/__init__.py create mode 100644 frappe/desk/doctype/console_log/console_log.js create mode 100644 frappe/desk/doctype/console_log/console_log.json create mode 100644 frappe/desk/doctype/console_log/console_log.py create mode 100644 frappe/desk/doctype/console_log/test_console_log.py create mode 100644 frappe/desk/doctype/system_console/__init__.py create mode 100644 frappe/desk/doctype/system_console/system_console.js create mode 100644 frappe/desk/doctype/system_console/system_console.json create mode 100644 frappe/desk/doctype/system_console/system_console.py create mode 100644 frappe/desk/doctype/system_console/test_system_console.py diff --git a/frappe/core/doctype/doctype_action/doctype_action.json b/frappe/core/doctype/doctype_action/doctype_action.json index 7a1b845af3..87ee6fc12f 100644 --- a/frappe/core/doctype/doctype_action/doctype_action.json +++ b/frappe/core/doctype/doctype_action/doctype_action.json @@ -31,20 +31,22 @@ "fieldtype": "Select", "in_list_view": 1, "label": "Action Type", - "options": "Server Action", + "options": "Server Action\nRoute", "reqd": 1 }, { "columns": 4, "fieldname": "action", - "fieldtype": "Data", + "fieldtype": "Small Text", "in_list_view": 1, - "label": "Action", + "label": "Action / Route", "reqd": 1 } ], + "index_web_pages_for_search": 1, "istable": 1, - "modified": "2019-09-24 09:11:39.860100", + "links": [], + "modified": "2020-08-18 20:03:42.479436", "modified_by": "Administrator", "module": "Core", "name": "DocType Action", diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index 1e3749e030..15b0bed699 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -128,7 +128,7 @@ CREATE TABLE `tabDocType Action` ( `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, + `action` text COLLATE utf8mb4_unicode_ci DEFAULT NULL, PRIMARY KEY (`name`), KEY `parent` (`parent`), KEY `modified` (`modified`) diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index a946a7ee5c..eeb0eecd3f 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -128,7 +128,7 @@ CREATE TABLE "tabDocType Action" ( "parenttype" varchar(255) DEFAULT NULL, "idx" bigint NOT NULL DEFAULT 0, "label" varchar(140) NOT NULL, - "group" varchar(140) DEFAULT NULL, + "group" text DEFAULT NULL, "action_type" varchar(140) NOT NULL, "action" varchar(140) NOT NULL, PRIMARY KEY ("name") diff --git a/frappe/desk/doctype/console_log/__init__.py b/frappe/desk/doctype/console_log/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/console_log/console_log.js b/frappe/desk/doctype/console_log/console_log.js new file mode 100644 index 0000000000..1ef4fdce59 --- /dev/null +++ b/frappe/desk/doctype/console_log/console_log.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Console Log', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/desk/doctype/console_log/console_log.json b/frappe/desk/doctype/console_log/console_log.json new file mode 100644 index 0000000000..a9ae9717fd --- /dev/null +++ b/frappe/desk/doctype/console_log/console_log.json @@ -0,0 +1,52 @@ +{ + "actions": [], + "autoname": "format:Log on {timestamp}", + "creation": "2020-08-18 19:56:12.336427", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "script", + "output" + ], + "fields": [ + { + "fieldname": "script", + "fieldtype": "Code", + "in_list_view": 1, + "label": "Script", + "read_only": 1 + }, + { + "fieldname": "output", + "fieldtype": "Code", + "label": "Output", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2020-08-18 20:07:57.587344", + "modified_by": "Administrator", + "module": "Desk", + "name": "Console 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/desk/doctype/console_log/console_log.py b/frappe/desk/doctype/console_log/console_log.py new file mode 100644 index 0000000000..635c4c1ba7 --- /dev/null +++ b/frappe/desk/doctype/console_log/console_log.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +# import frappe +from frappe.model.document import Document + +class ConsoleLog(Document): + pass diff --git a/frappe/desk/doctype/console_log/test_console_log.py b/frappe/desk/doctype/console_log/test_console_log.py new file mode 100644 index 0000000000..04dc4f241f --- /dev/null +++ b/frappe/desk/doctype/console_log/test_console_log.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestConsoleLog(unittest.TestCase): + pass diff --git a/frappe/desk/doctype/system_console/__init__.py b/frappe/desk/doctype/system_console/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/system_console/system_console.js b/frappe/desk/doctype/system_console/system_console.js new file mode 100644 index 0000000000..20c1257c10 --- /dev/null +++ b/frappe/desk/doctype/system_console/system_console.js @@ -0,0 +1,8 @@ +// Copyright (c) 2020, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('System Console', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/desk/doctype/system_console/system_console.json b/frappe/desk/doctype/system_console/system_console.json new file mode 100644 index 0000000000..8c56792abb --- /dev/null +++ b/frappe/desk/doctype/system_console/system_console.json @@ -0,0 +1,66 @@ +{ + "actions": [ + { + "action": "#List/Console Log/List", + "action_type": "Route", + "label": "Logs" + }, + { + "action": "frappe.desk.doctype.system_console.system_console.execute_code", + "action_type": "Server Action", + "label": "Execute" + } + ], + "creation": "2020-08-18 17:44:35.647815", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "console", + "commit", + "output" + ], + "fields": [ + { + "description": "To print output use log(text)", + "fieldname": "console", + "fieldtype": "Code", + "label": "Console" + }, + { + "fieldname": "output", + "fieldtype": "Code", + "label": "Output", + "read_only": 1 + }, + { + "default": "0", + "fieldname": "commit", + "fieldtype": "Check", + "label": "Commit" + } + ], + "hide_toolbar": 1, + "index_web_pages_for_search": 1, + "issingle": 1, + "links": [], + "modified": "2020-08-18 20:05:36.936664", + "modified_by": "Administrator", + "module": "Desk", + "name": "System Console", + "owner": "Administrator", + "permissions": [ + { + "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/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py new file mode 100644 index 0000000000..3d7b3db2c2 --- /dev/null +++ b/frappe/desk/doctype/system_console/system_console.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals + +import json + +import frappe +from frappe.utils.safe_exec import safe_exec +from frappe.model.document import Document + +class SystemConsole(Document): + pass + +@frappe.whitelist() +def execute_code(doc): + doc = json.loads(doc) + frappe.only_for('System Manager') + try: + frappe.debug_log = [] + safe_exec(doc['console']) + doc['output'] = '\n'.join(frappe.debug_log) + except: + doc['output'] = frappe.get_traceback() + + if doc.get('commit'): + frappe.db.commit() + else: + frappe.db.rollback() + + frappe.get_doc(dict(doctype='Console Log', script=doc['console'], output=doc['output'])).insert() + frappe.db.commit() + + + return doc \ No newline at end of file diff --git a/frappe/desk/doctype/system_console/test_system_console.py b/frappe/desk/doctype/system_console/test_system_console.py new file mode 100644 index 0000000000..2635b5a210 --- /dev/null +++ b/frappe/desk/doctype/system_console/test_system_console.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2020, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestSystemConsole(unittest.TestCase): + pass diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index e59d325c9a..c39a73ccd7 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -134,7 +134,8 @@ log_types = ( 'Notification Log', 'Email Queue', 'DocShare', - 'Document Follow' + 'Document Follow', + 'Console Log' ) def delete_fields(args_dict, delete=0): diff --git a/frappe/model/naming.py b/frappe/model/naming.py index ffaf84e2b3..f2c918113b 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -142,6 +142,8 @@ def parse_naming_series(parts, doctype='', doc=''): part = today.strftime("%d") elif e == 'YYYY': part = today.strftime('%Y') + elif e == 'timestamp': + part = str(today) elif e == 'FY': part = frappe.defaults.get_user_default("fiscal_year") elif e.startswith('{') and doc: diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index ff48ad2f60..d417d37c08 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -323,12 +323,22 @@ frappe.ui.form.Form = class FrappeForm { if (!this.is_new()) { this.add_custom_button(action.label, () => { if (action.action_type==='Server Action') { - frappe.xcall(action.action, {doc: this.doc}).then(() => { + frappe.xcall(action.action, {doc: this.doc}).then((doc) => { + if (doc.doctype) { + // document is returned by the method, + // apply the changes locally and refresh + frappe.model.sync(doc); + this.refresh(); + } + + // feedback frappe.msgprint({ message: __('{} Complete', [action.label]), alert: true }); }); + } else if (action.action_type==='Route') { + frappe.set_route(action.action); } }, action.group); } diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index c95b7e4699..548bd0baf7 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -48,6 +48,7 @@ def get_safe_globals(): # make available limited methods of frappe json=json, dict=dict, + log=frappe.log, _dict=frappe._dict, frappe=frappe._dict( flags=frappe.flags, From 12be3d26ff26fa798000504547325251e474820a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 21 Aug 2020 15:03:57 +0530 Subject: [PATCH 056/142] fix(minor): primary button --- .../doctype_action/doctype_action.json | 11 +++- .../doctype/system_console/system_console.js | 9 ++- .../system_console/system_console.json | 3 +- frappe/public/js/frappe/form/form.js | 60 ++++++++++++------- 4 files changed, 57 insertions(+), 26 deletions(-) diff --git a/frappe/core/doctype/doctype_action/doctype_action.json b/frappe/core/doctype/doctype_action/doctype_action.json index 87ee6fc12f..0f9da802eb 100644 --- a/frappe/core/doctype/doctype_action/doctype_action.json +++ b/frappe/core/doctype/doctype_action/doctype_action.json @@ -8,7 +8,8 @@ "label", "action_type", "action", - "group" + "group", + "hidden" ], "fields": [ { @@ -41,12 +42,18 @@ "in_list_view": 1, "label": "Action / Route", "reqd": 1 + }, + { + "default": "0", + "fieldname": "hidden", + "fieldtype": "Check", + "label": "Hidden" } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-08-18 20:03:42.479436", + "modified": "2020-08-21 14:44:03.845315", "modified_by": "Administrator", "module": "Core", "name": "DocType Action", diff --git a/frappe/desk/doctype/system_console/system_console.js b/frappe/desk/doctype/system_console/system_console.js index 20c1257c10..0aae8bd519 100644 --- a/frappe/desk/doctype/system_console/system_console.js +++ b/frappe/desk/doctype/system_console/system_console.js @@ -2,7 +2,10 @@ // For license information, please see license.txt frappe.ui.form.on('System Console', { - // refresh: function(frm) { - - // } + refresh: function(frm) { + frm.disable_save(); + frm.page.set_primary_action(__("Execute"), () => { + frm.execute_action('Execute'); + }); + } }); diff --git a/frappe/desk/doctype/system_console/system_console.json b/frappe/desk/doctype/system_console/system_console.json index 8c56792abb..296647a17a 100644 --- a/frappe/desk/doctype/system_console/system_console.json +++ b/frappe/desk/doctype/system_console/system_console.json @@ -8,6 +8,7 @@ { "action": "frappe.desk.doctype.system_console.system_console.execute_code", "action_type": "Server Action", + "hidden": 1, "label": "Execute" } ], @@ -44,7 +45,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-08-18 20:05:36.936664", + "modified": "2020-08-21 14:44:35.296877", "modified_by": "Administrator", "module": "Desk", "name": "System Console", diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index d417d37c08..9e221f7131 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -321,32 +321,52 @@ frappe.ui.form.Form = class FrappeForm { for (let action of this.meta.actions) { frappe.ui.form.on(this.doctype, 'refresh', () => { if (!this.is_new()) { - this.add_custom_button(action.label, () => { - if (action.action_type==='Server Action') { - frappe.xcall(action.action, {doc: this.doc}).then((doc) => { - if (doc.doctype) { - // document is returned by the method, - // apply the changes locally and refresh - frappe.model.sync(doc); - this.refresh(); - } - - // feedback - frappe.msgprint({ - message: __('{} Complete', [action.label]), - alert: true - }); - }); - } else if (action.action_type==='Route') { - frappe.set_route(action.action); - } - }, action.group); + if (!action.hidden) { + this.add_custom_button(action.label, () => { + this.execute_action(action); + }, action.group); + } } }); } } } + execute_action(action) { + if (typeof action === 'string') { + // called by label - maybe via custom script + // frm.execute_action('Action') + for (let _action of this.meta.actions) { + if (_action.label === action) { + action = _action; + break; + } + } + + if (typeof action === 'string') { + frappe.throw(`Action ${action} not found`); + } + } + if (action.action_type==='Server Action') { + frappe.xcall(action.action, {doc: this.doc}).then((doc) => { + if (doc.doctype) { + // document is returned by the method, + // apply the changes locally and refresh + frappe.model.sync(doc); + this.refresh(); + } + + // feedback + frappe.msgprint({ + message: __('{} Complete', [action.label]), + alert: true + }); + }); + } else if (action.action_type==='Route') { + frappe.set_route(action.action); + } + } + switch_doc(docname) { // record switch if(this.docname != docname && (!this.meta.in_dialog || this.in_form) && !this.meta.istable) { From 5a61558820d1c05892c27320a6b455b112aefbd5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 24 Aug 2020 17:45:20 +0530 Subject: [PATCH 057/142] fix(minor): return value in frappe.flags --- frappe/core/doctype/server_script/server_script.json | 7 ++++--- frappe/core/doctype/server_script/server_script.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.json b/frappe/core/doctype/server_script/server_script.json index 3ed4076430..cc3995ad1d 100644 --- a/frappe/core/doctype/server_script/server_script.json +++ b/frappe/core/doctype/server_script/server_script.json @@ -7,12 +7,12 @@ "engine": "InnoDB", "field_order": [ "script_type", - "disabled", - "column_break_3", "reference_doctype", "doctype_event", "api_method", "allow_guest", + "column_break_3", + "disabled", "section_break_8", "script", "help_section", @@ -85,8 +85,9 @@ "fieldtype": "HTML" } ], + "index_web_pages_for_search": 1, "links": [], - "modified": "2020-08-07 13:13:02.483963", + "modified": "2020-08-24 16:44:41.060350", "modified_by": "Administrator", "module": "Core", "name": "Server Script", diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 539ae8eb01..55d7a33b8c 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -25,6 +25,7 @@ class ServerScript(Document): if frappe.session.user == 'Guest' and not self.allow_guest: raise frappe.PermissionError safe_exec(self.script) + return frappe.flags # output can be stored in flags else: # wrong report type! raise frappe.DoesNotExistError From 079a0e4af0fb38d8773b4f0d6669cbd090cba26e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 25 Aug 2020 11:14:03 +0530 Subject: [PATCH 058/142] wip: refactor System Console --- .../doctype/system_console/system_console.py | 42 ++++++++++--------- frappe/utils/safe_exec.py | 8 +++- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/frappe/desk/doctype/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py index 3d7b3db2c2..2715cd1425 100644 --- a/frappe/desk/doctype/system_console/system_console.py +++ b/frappe/desk/doctype/system_console/system_console.py @@ -11,26 +11,28 @@ from frappe.utils.safe_exec import safe_exec from frappe.model.document import Document class SystemConsole(Document): - pass + def run(self): + frappe.only_for('System Manager') + try: + frappe.debug_log = [] + safe_exec(self.console) + self.output = '\n'.join(frappe.debug_log) + except: + self.output = frappe.get_traceback() + + if self.commit: + frappe.db.commit() + else: + frappe.db.rollback() + + frappe.get_doc(dict( + doctype='Console Log', + script=self.console, + output=self.output)).insert() + frappe.db.commit() @frappe.whitelist() def execute_code(doc): - doc = json.loads(doc) - frappe.only_for('System Manager') - try: - frappe.debug_log = [] - safe_exec(doc['console']) - doc['output'] = '\n'.join(frappe.debug_log) - except: - doc['output'] = frappe.get_traceback() - - if doc.get('commit'): - frappe.db.commit() - else: - frappe.db.rollback() - - frappe.get_doc(dict(doctype='Console Log', script=doc['console'], output=doc['output'])).insert() - frappe.db.commit() - - - return doc \ No newline at end of file + console = frappe.get_doc(json.loads(doc)) + console.run() + return console.as_dict() \ No newline at end of file diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 548bd0baf7..a070d287da 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -100,7 +100,8 @@ def get_safe_globals(): scrub=scrub, guess_mimetype=mimetypes.guess_type, html2text=html2text, - dev_server=1 if os.environ.get('DEV_SERVER', False) else 0 + dev_server=1 if os.environ.get('DEV_SERVER', False) else 0, + run_script=run_script ) add_module_properties(frappe.exceptions, out.frappe, lambda obj: inspect.isclass(obj) and issubclass(obj, Exception)) @@ -143,6 +144,11 @@ def read_sql(query, *args, **kwargs): else: raise frappe.PermissionError('Only SELECT SQL allowed in scripting') +def run_script(script): + '''run another server script''' + frappe.get_doc('Server Script', script).execute_method() + return frappe.flags + def _getitem(obj, key): # guard function for RestrictedPython # allow any key to be accessed as long as it does not start with underscore From 39e36e01cde80e37ba0e758f60b4492700dbd177 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 25 Aug 2020 15:09:33 +0530 Subject: [PATCH 059/142] fix(test): test for system console; --- .../doctype/system_console/test_system_console.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/system_console/test_system_console.py b/frappe/desk/doctype/system_console/test_system_console.py index 2635b5a210..55ef199122 100644 --- a/frappe/desk/doctype/system_console/test_system_console.py +++ b/frappe/desk/doctype/system_console/test_system_console.py @@ -3,8 +3,18 @@ # See license.txt from __future__ import unicode_literals -# import frappe +import frappe import unittest class TestSystemConsole(unittest.TestCase): - pass + def test_system_console(self): + system_console = frappe.get_doc('System Console') + system_console.console = 'log("hello")' + system_console.run() + + self.assertEqual(system_console.output, 'hello') + + system_console.console = 'log(frappe.db.get_value("DocType", "DocType", "module"))' + system_console.run() + + self.assertEqual(system_console.output, 'Core') From 5e4ee1a6bcfd77d10ace5b810d43244c25394fc7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 31 Aug 2020 11:29:06 +0530 Subject: [PATCH 060/142] fix(minor): quote the column names in alter table --- frappe/database/postgres/schema.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py index b5129b60bb..58153ca6ce 100644 --- a/frappe/database/postgres/schema.py +++ b/frappe/database/postgres/schema.py @@ -49,7 +49,7 @@ class PostgresTable(DBTable): elif col.fieldtype in ("Check"): using_clause = "USING {}::smallint".format(col.fieldname) - query.append("ALTER COLUMN {0} TYPE {1} {2}".format( + query.append("ALTER COLUMN `{0}` TYPE {1} {2}".format( col.fieldname, get_definition(col.fieldtype, precision=col.precision, length=col.length), using_clause) From a360d0e806dc1dec7de79965dab81b29150bad56 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 11:31:13 +0530 Subject: [PATCH 061/142] feat: escape html before rendering --- frappe/public/js/frappe/form/grid_row.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 733c1bea5f..8e0510ae7b 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -301,7 +301,7 @@ export default class GridRow { }); $col.field_area = $('
').appendTo($col).toggle(false); - $col.static_area = $('
').appendTo($col).html(txt); + $col.static_area = $('
').appendTo($col).html(frappe.utils.escape_html(txt)); $col.df = df; $col.column_index = ci; @@ -595,7 +595,7 @@ export default class GridRow { // reset static value var column = this.columns[fieldname]; if(column) { - column.static_area.html(txt || ""); + column.static_area.html(frappe.utils.escape_html(txt) || ""); if(df && df.reqd) { column.toggleClass('error', !!(txt===null || txt==='')); } From a032e9fc3d0d87835f22d4a2990a57ad247244b5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 31 Aug 2020 11:31:44 +0530 Subject: [PATCH 062/142] fix(flake8): ignore bare except --- frappe/desk/doctype/system_console/system_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py index 2715cd1425..6c87ca8c36 100644 --- a/frappe/desk/doctype/system_console/system_console.py +++ b/frappe/desk/doctype/system_console/system_console.py @@ -17,7 +17,7 @@ class SystemConsole(Document): frappe.debug_log = [] safe_exec(self.console) self.output = '\n'.join(frappe.debug_log) - except: + except: # noqa: E722 self.output = frappe.get_traceback() if self.commit: From 11a8f759f1f961c25418cc723585ec8249cb733b Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 11:32:18 +0530 Subject: [PATCH 063/142] chore: format functions --- frappe/public/js/frappe/form/grid_row.js | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 8e0510ae7b..366f746dc5 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -276,25 +276,25 @@ export default class GridRow { make_column(df, colsize, txt, ci) { let me = this; - var add_class = ((["Text", "Small Text"].indexOf(df.fieldtype)!==-1) ? + var add_class = ((["Text", "Small Text"].indexOf(df.fieldtype) !== -1) ? " grid-overflow-no-ellipsis" : ""); - add_class += (["Int", "Currency", "Float", "Percent"].indexOf(df.fieldtype)!==-1) ? - " text-right": ""; - add_class += (["Check"].indexOf(df.fieldtype)!==-1) ? - " text-center": ""; + add_class += (["Int", "Currency", "Float", "Percent"].indexOf(df.fieldtype) !== -1) ? + " text-right" : ""; + add_class += (["Check"].indexOf(df.fieldtype) !== -1) ? + " text-center" : ""; - var $col = $('
') + var $col = $('
') .attr("data-fieldname", df.fieldname) .attr("data-fieldtype", df.fieldtype) .data("df", df) .appendTo(this.row) - .on('click', function() { - if(frappe.ui.form.editable_row===me) { + .on('click', function () { + if (frappe.ui.form.editable_row === me) { return; } var out = me.toggle_editable_row(); var col = this; - setTimeout(function() { + setTimeout(function () { $(col).find('input[type="Text"]:first').focus(); }, 500); return out; @@ -577,39 +577,39 @@ export default class GridRow { var df = this.grid.get_docfield(fieldname) || undefined; // format values if no frm - if(!df) { + if (!df) { df = this.grid.visible_columns.find((col) => { return col[0].fieldname === fieldname; }); - if(df && this.doc) { + if (df && this.doc) { var txt = frappe.format(this.doc[fieldname], df[0], null, this.doc); } } - if(txt===undefined && this.frm) { + if (txt === undefined && this.frm) { var txt = frappe.format(this.doc[fieldname], df, null, this.frm.doc); } // reset static value var column = this.columns[fieldname]; - if(column) { + if (column) { column.static_area.html(frappe.utils.escape_html(txt) || ""); - if(df && df.reqd) { - column.toggleClass('error', !!(txt===null || txt==='')); + if (df && df.reqd) { + column.toggleClass('error', !!(txt === null || txt === '')); } } // reset field value var field = this.on_grid_fields_dict[fieldname]; - if(field) { + if (field) { field.docname = this.doc.name; field.refresh(); } // in form - if(this.grid_form) { + if (this.grid_form) { this.grid_form.refresh_field(fieldname); } } From a5959df752f8cea57037d7e832a01e55e0b628db Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 11:44:37 +0530 Subject: [PATCH 064/142] fix: don't override column (#11374) --- 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 706cde13b7..7958ff46cc 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1041,7 +1041,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { if (column.colIndex === index && !value) { value = "Total"; - column.fieldtype = "Data"; // avoid type issues for value if Date column + column = { fieldtype: "Data" }; // avoid type issues for value if Date column } else if (in_list(["Currency", "Float"], column.fieldtype)) { // proxy for currency and float data = this.data[0]; From dcce45b558f1a7d602214540f81f53a1ad3b888d Mon Sep 17 00:00:00 2001 From: Anupam K Date: Mon, 31 Aug 2020 11:54:56 +0530 Subject: [PATCH 065/142] fix: test case --- frappe/email/doctype/newsletter/test_newsletter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index bb339165d3..ee7f123b7e 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -67,6 +67,7 @@ class TestNewsletter(unittest.TestCase): "doctype": "Newsletter", "subject": "_Test Newsletter", "send_from": "Test Sender ", + "content_type": "Rich Text", "message": "Testing my news.", "published": published, "schedule_sending": bool(schedule_send), From afe5959963d8277f97c93b37ffd15d55ef58b8c1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 31 Aug 2020 14:30:33 +0530 Subject: [PATCH 066/142] fix: Unbreaking change for kwarg backup_path_conf --- frappe/utils/backups.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 3d683f6c0a..77d3e83dd9 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -27,9 +27,9 @@ class BackupGenerator: To initialize, specify (db_name, user, password, db_file_name=None, db_host="localhost") If specifying db_file_name, also append ".sql.gz" """ - def __init__(self, db_name, user, password, backup_path_conf=None, backup_path_db=None, backup_path_files=None, + def __init__(self, db_name, user, password, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, db_host="localhost", db_port=None, verbose=False, - db_type='mariadb'): + db_type='mariadb', backup_path_conf=None): global _verbose self.db_host = db_host self.db_port = db_port From e860ac110802ee282b66b6f1b4f3be187d668512 Mon Sep 17 00:00:00 2001 From: gavin Date: Mon, 31 Aug 2020 15:14:20 +0530 Subject: [PATCH 067/142] fix: Don't raise FileExistsError if directory already exists Co-authored-by: Aditya Hase --- frappe/utils/backups.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index c7b1523ac0..4611fdc04e 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -62,7 +62,7 @@ class BackupGenerator: else: for file_path in [self.backup_path_files, self.backup_path_db, self.backup_path_private_files]: dir = os.path.dirname(file_path) - os.makedirs(dir) + os.makedirs(dir, exist_ok=True) def get_backup(self, older_than=24, ignore_files=False, force=False): From 6e3d3c5b74de828b9cc9339fae35dd37c3dc37cf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 31 Aug 2020 16:56:41 +0530 Subject: [PATCH 068/142] fix(minor): allow tags in markdown --- frappe/website/doctype/blog_post/blog_post.json | 3 ++- frappe/website/doctype/web_page/web_page.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index c3220788b7..25bca28e85 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -110,6 +110,7 @@ "depends_on": "eval:doc.content_type === 'Markdown'", "fieldname": "content_md", "fieldtype": "Markdown Editor", + "ignore_xss_filter": 1, "label": "Content (Markdown)" }, { @@ -193,7 +194,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2020-07-21 16:25:17.154911", + "modified": "2020-08-31 16:55:03.687862", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index 955b34f44e..42ca81391e 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -126,6 +126,7 @@ "depends_on": "eval:doc.content_type==='Markdown'", "fieldname": "main_section_md", "fieldtype": "Markdown Editor", + "ignore_xss_filter": 1, "label": "Main Section (Markdown)" }, { @@ -294,7 +295,7 @@ "is_published_field": "published", "links": [], "max_attachments": 20, - "modified": "2020-08-07 10:55:54.885448", + "modified": "2020-08-31 16:55:52.015249", "modified_by": "Administrator", "module": "Website", "name": "Web Page", From 4de73810765f43d149b8aff6432452c0b154672c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 17:23:41 +0530 Subject: [PATCH 069/142] feat: update category in tests --- frappe/website/doctype/blog_post/test_blog_post.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 4b4d062a2d..eccc1258f3 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -61,7 +61,7 @@ class TestBlogPost(unittest.TestCase): frappe.delete_doc("Blog Category", blog.blog_category) def make_test_blog(): - if not frappe.db.exists('Blog Category', 'Test Blog Category'): + if not frappe.db.exists('Blog Category', '-test-blog-category'): # Set different title and name for the category frappe.get_doc(dict( doctype = 'Blog Category', @@ -73,7 +73,7 @@ def make_test_blog(): full_name='Test Blogger')).insert() test_blog = frappe.get_doc(dict( doctype = 'Blog Post', - blog_category = 'test-blog-category', + blog_category = '-test-blog-category', blogger = 'test-blogger', title = random_string(20), route = random_string(20), From c6f6ff6b5cee9345a650695e667beb11b8c0734c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 31 Aug 2020 17:33:03 +0530 Subject: [PATCH 070/142] feat: use blog category name --- frappe/website/doctype/blog_post/test_blog_post.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index eccc1258f3..ea1b6125db 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -44,8 +44,8 @@ class TestBlogPost(unittest.TestCase): # On blog post page find link to the category page soup = BeautifulSoup(blog_page_html, "lxml") - category_title = frappe.db.get_value("Blog Category", blog.blog_category, "title") - category_page_link = list(soup.find_all('a', string=category_title))[0] + + category_page_link = list(soup.find_all('a', string=blog.blog_category))[0] category_page_url = category_page_link["href"] # Visit the category page (by following the link found in above stage) From 1eb1cba6664774aeb693b0ca53bc715eb806c141 Mon Sep 17 00:00:00 2001 From: marination Date: Mon, 31 Aug 2020 19:54:19 +0530 Subject: [PATCH 071/142] feat: Show Status Section in Query Report --- frappe/public/js/frappe/views/reports/query_report.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7958ff46cc..875be7d29e 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -592,6 +592,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.render_summary(data.report_summary); } + if(data.message && !data.prepared_report) this.show_status(data.message); + this.toggle_message(false); if (data.result && data.result.length) { this.prepare_report_data(data); From 4b2c82b9c90bb02432a76b34c2611cd1b51acd09 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 31 Aug 2020 20:14:34 +0530 Subject: [PATCH 072/142] fix: Set blog route if title and category are set Set blog route on client side as soon as title and category are selected. This behavious is in line with Web Page, where the route is set as soon as the title is entered. This will ensure blog routes are consistent and contain category as the part of the route. The user can change the route ofcourse, but this behaviour is the most common expectation. --- frappe/website/doctype/blog_post/blog_post.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js index 7aa83f536d..bfff947948 100644 --- a/frappe/website/doctype/blog_post/blog_post.js +++ b/frappe/website/doctype/blog_post/blog_post.js @@ -11,16 +11,29 @@ frappe.ui.form.on('Blog Post', { }, title: function(frm) { generate_google_search_preview(frm); + frm.trigger('set_route'); }, meta_description: function(frm) { generate_google_search_preview(frm); }, blog_intro: function(frm) { generate_google_search_preview(frm); + }, + blog_category(frm) { + frm.trigger('set_route'); + }, + set_route(frm) { + if (frm.doc.route) return; + if (frm.doc.title && frm.doc.blog_category) { + frm.call('make_route').then(r => { + frm.set_value('route', r.message); + }); + } } }); function generate_google_search_preview(frm) { + if (!frm.doc.title) return; let google_preview = frm.get_field("google_preview"); let seo_title = (frm.doc.title).slice(0, 60); let seo_description = (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160); From 04dbb4c2613f345007ab992cd5b610fb1bc31f3d Mon Sep 17 00:00:00 2001 From: Marica Date: Mon, 31 Aug 2020 20:16:02 +0530 Subject: [PATCH 073/142] fix: Spacing --- 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 875be7d29e..1bec65e460 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -592,7 +592,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.render_summary(data.report_summary); } - if(data.message && !data.prepared_report) this.show_status(data.message); + if (data.message && !data.prepared_report) this.show_status(data.message); this.toggle_message(false); if (data.result && data.result.length) { From f9e6f0e8e41a64e9eed308c54037f2b3dd5509d9 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 31 Aug 2020 21:07:51 +0530 Subject: [PATCH 074/142] fix(Blog): Ability to set meta_title separately --- frappe/website/doctype/blog_post/blog_post.js | 3 ++- frappe/website/doctype/blog_post/blog_post.json | 10 ++++++++-- frappe/website/doctype/blog_post/blog_post.py | 7 ++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js index 7aa83f536d..545051db7f 100644 --- a/frappe/website/doctype/blog_post/blog_post.js +++ b/frappe/website/doctype/blog_post/blog_post.js @@ -21,8 +21,9 @@ frappe.ui.form.on('Blog Post', { }); function generate_google_search_preview(frm) { + if (!(frm.doc.meta_title && frm.doc.title)) return; let google_preview = frm.get_field("google_preview"); - let seo_title = (frm.doc.title).slice(0, 60); + let seo_title = (frm.doc.meta_title || frm.doc.title).slice(0, 60); let seo_description = (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160); let date = frm.doc.published_on ? new frappe.datetime.datetime(frm.doc.published_on).moment.format('ll') + ' - ' : ''; let route_array = frm.doc.route ? frm.doc.route.split('/') : []; diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index 25bca28e85..48e9a18e71 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -26,6 +26,7 @@ "content_html", "email_sent", "meta_tags", + "meta_title", "meta_description", "column_break_18", "meta_image", @@ -110,7 +111,6 @@ "depends_on": "eval:doc.content_type === 'Markdown'", "fieldname": "content_md", "fieldtype": "Markdown Editor", - "ignore_xss_filter": 1, "label": "Content (Markdown)" }, { @@ -185,6 +185,12 @@ "fieldtype": "Check", "hidden": 1, "label": "Hide CTA" + }, + { + "fieldname": "meta_title", + "fieldtype": "Data", + "label": "Meta Title", + "length": 60 } ], "has_web_view": 1, @@ -194,7 +200,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2020-08-31 16:55:03.687862", + "modified": "2020-08-31 21:01:51.100349", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index beffcdca25..1a07dbed86 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -36,6 +36,11 @@ class BlogPost(WebsiteGenerator): if self.blog_intro: self.blog_intro = self.blog_intro[:200] + if not self.meta_title: + self.meta_title = self.title[:60] + else: + self.meta_title = self.meta_title[:60] + if not self.meta_description: self.meta_description = self.blog_intro[:140] else: @@ -88,7 +93,7 @@ class BlogPost(WebsiteGenerator): context.description = self.meta_description or self.blog_intro or strip_html_tags(context.content[:140]) context.metatags = { - "name": self.title, + "name": self.meta_title, "description": context.description, } From 8f819da4ff7afdf9c218d0bf45417ee9fe167704 Mon Sep 17 00:00:00 2001 From: Anupam K Date: Tue, 1 Sep 2020 12:43:58 +0530 Subject: [PATCH 075/142] fix: failed test case --- frappe/email/doctype/newsletter/newsletter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 929855ea30..14bd7eb1dc 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -37,8 +37,8 @@ class Newsletter(WebsiteGenerator): self.recipients = self.get_recipients() if self.recipients: + self.queue_all() if getattr(frappe.local, "is_ajax", False): - self.queue_all() frappe.msgprint(_("Email queued to {0} recipients").format(len(self.recipients))) else: From f772aee2110b2383d42c2ee276c766baa19a7dca Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 Sep 2020 12:48:26 +0530 Subject: [PATCH 076/142] fix(minor): don't allow access to global flags --- frappe/utils/safe_exec.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index c95b7e4699..b393939f92 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -50,7 +50,7 @@ def get_safe_globals(): dict=dict, _dict=frappe._dict, frappe=frappe._dict( - flags=frappe.flags, + flags=frappe._dict(), format=frappe.format_value, format_value=frappe.format_value, date_format=date_format, From c53813950fde81bd884f601690a9c5c15c070c1c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 1 Sep 2020 12:59:22 +0530 Subject: [PATCH 077/142] fix(minor): Server Script can return values in frappe.flags --- frappe/core/doctype/server_script/server_script.py | 4 ++-- .../core/doctype/server_script/test_server_script.py | 12 ++++++++++++ frappe/utils/safe_exec.py | 5 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/frappe/core/doctype/server_script/server_script.py b/frappe/core/doctype/server_script/server_script.py index 55d7a33b8c..839b784651 100644 --- a/frappe/core/doctype/server_script/server_script.py +++ b/frappe/core/doctype/server_script/server_script.py @@ -24,8 +24,8 @@ class ServerScript(Document): # validate if guest is allowed if frappe.session.user == 'Guest' and not self.allow_guest: raise frappe.PermissionError - safe_exec(self.script) - return frappe.flags # output can be stored in flags + _globals, _locals = safe_exec(self.script) + return _globals.frappe.flags # output can be stored in flags else: # wrong report type! raise frappe.DoesNotExistError diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py index 5c12858e8a..3356e584af 100644 --- a/frappe/core/doctype/server_script/test_server_script.py +++ b/frappe/core/doctype/server_script/test_server_script.py @@ -36,6 +36,15 @@ if "validate" in doc.description: allow_guest = 1, script = ''' frappe.response['message'] = 'hello' +''' + ), + dict( + name='test_return_value', + script_type = 'API', + api_method = 'test_return_value', + allow_guest = 1, + script = ''' +frappe.flags = 'hello' ''' ) ] @@ -73,3 +82,6 @@ class TestServerScript(unittest.TestCase): response = requests.post(get_site_url(frappe.local.site) + "/api/method/test_server_script") self.assertEqual(response.status_code, 200) self.assertEqual("hello", response.json()["message"]) + + def test_api_return(self): + self.assertEqual(frappe.get_doc('Server Script', 'test_return_value').execute_method(), 'hello') diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index a070d287da..56c5fe90c8 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -28,6 +28,8 @@ def safe_exec(script, _globals=None, _locals=None): # execute script compiled by RestrictedPython exec(compile_restricted(script), exec_globals, _locals) # pylint: disable=exec-used + return exec_globals, _locals + def get_safe_globals(): datautils = frappe._dict() if frappe.db: @@ -146,8 +148,7 @@ def read_sql(query, *args, **kwargs): def run_script(script): '''run another server script''' - frappe.get_doc('Server Script', script).execute_method() - return frappe.flags + return frappe.get_doc('Server Script', script).execute_method() def _getitem(obj, key): # guard function for RestrictedPython From f533acabe6927cfe296197ecb05272be2e3131cf Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 1 Sep 2020 13:46:08 +0530 Subject: [PATCH 078/142] test: use regex to search for link --- frappe/website/doctype/blog_post/test_blog_post.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index ea1b6125db..7c6e64dc5a 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe import unittest from bs4 import BeautifulSoup +import re from frappe.utils import set_request from frappe.website.render import render @@ -44,8 +45,7 @@ class TestBlogPost(unittest.TestCase): # On blog post page find link to the category page soup = BeautifulSoup(blog_page_html, "lxml") - - category_page_link = list(soup.find_all('a', string=blog.blog_category))[0] + category_page_link = list(soup.find_all('a', href=re.compile(blog.blog_category)))[0] category_page_url = category_page_link["href"] # Visit the category page (by following the link found in above stage) @@ -61,7 +61,7 @@ class TestBlogPost(unittest.TestCase): frappe.delete_doc("Blog Category", blog.blog_category) def make_test_blog(): - if not frappe.db.exists('Blog Category', '-test-blog-category'): + if not frappe.db.exists('Blog Category', 'test-blog-category'): # Set different title and name for the category frappe.get_doc(dict( doctype = 'Blog Category', @@ -73,7 +73,7 @@ def make_test_blog(): full_name='Test Blogger')).insert() test_blog = frappe.get_doc(dict( doctype = 'Blog Post', - blog_category = '-test-blog-category', + blog_category = 'test-blog-category', blogger = 'test-blogger', title = random_string(20), route = random_string(20), From 7efe1db6287043f3d6d2f34c07ba447daf7d079d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Tue, 1 Sep 2020 14:07:16 +0530 Subject: [PATCH 079/142] Revert "fix: child table rendering with escape_html" --- frappe/public/js/frappe/form/grid_row.js | 38 ++++++++++++------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 366f746dc5..733c1bea5f 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -276,32 +276,32 @@ export default class GridRow { make_column(df, colsize, txt, ci) { let me = this; - var add_class = ((["Text", "Small Text"].indexOf(df.fieldtype) !== -1) ? + var add_class = ((["Text", "Small Text"].indexOf(df.fieldtype)!==-1) ? " grid-overflow-no-ellipsis" : ""); - add_class += (["Int", "Currency", "Float", "Percent"].indexOf(df.fieldtype) !== -1) ? - " text-right" : ""; - add_class += (["Check"].indexOf(df.fieldtype) !== -1) ? - " text-center" : ""; + add_class += (["Int", "Currency", "Float", "Percent"].indexOf(df.fieldtype)!==-1) ? + " text-right": ""; + add_class += (["Check"].indexOf(df.fieldtype)!==-1) ? + " text-center": ""; - var $col = $('
') + var $col = $('
') .attr("data-fieldname", df.fieldname) .attr("data-fieldtype", df.fieldtype) .data("df", df) .appendTo(this.row) - .on('click', function () { - if (frappe.ui.form.editable_row === me) { + .on('click', function() { + if(frappe.ui.form.editable_row===me) { return; } var out = me.toggle_editable_row(); var col = this; - setTimeout(function () { + setTimeout(function() { $(col).find('input[type="Text"]:first').focus(); }, 500); return out; }); $col.field_area = $('
').appendTo($col).toggle(false); - $col.static_area = $('
').appendTo($col).html(frappe.utils.escape_html(txt)); + $col.static_area = $('
').appendTo($col).html(txt); $col.df = df; $col.column_index = ci; @@ -577,39 +577,39 @@ export default class GridRow { var df = this.grid.get_docfield(fieldname) || undefined; // format values if no frm - if (!df) { + if(!df) { df = this.grid.visible_columns.find((col) => { return col[0].fieldname === fieldname; }); - if (df && this.doc) { + if(df && this.doc) { var txt = frappe.format(this.doc[fieldname], df[0], null, this.doc); } } - if (txt === undefined && this.frm) { + if(txt===undefined && this.frm) { var txt = frappe.format(this.doc[fieldname], df, null, this.frm.doc); } // reset static value var column = this.columns[fieldname]; - if (column) { - column.static_area.html(frappe.utils.escape_html(txt) || ""); - if (df && df.reqd) { - column.toggleClass('error', !!(txt === null || txt === '')); + if(column) { + column.static_area.html(txt || ""); + if(df && df.reqd) { + column.toggleClass('error', !!(txt===null || txt==='')); } } // reset field value var field = this.on_grid_fields_dict[fieldname]; - if (field) { + if(field) { field.docname = this.doc.name; field.refresh(); } // in form - if (this.grid_form) { + if(this.grid_form) { this.grid_form.refresh_field(fieldname); } } From 428080bc56003427a113826c488f2d55459c1841 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 1 Sep 2020 21:04:57 +0530 Subject: [PATCH 080/142] fix: Send email notification to all document assignees --- .../email/doctype/notification/notification.json | 13 +++++++++++-- frappe/email/doctype/notification/notification.py | 15 +++++++++++++-- .../notification_recipient.json | 3 ++- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/frappe/email/doctype/notification/notification.json b/frappe/email/doctype/notification/notification.json index 95f218ad73..8918709fa0 100644 --- a/frappe/email/doctype/notification/notification.json +++ b/frappe/email/doctype/notification/notification.json @@ -34,6 +34,7 @@ "set_property_after_alert", "property_value", "column_break_5", + "send_to_all_assignees", "recipients", "message_sb", "message", @@ -216,7 +217,7 @@ "fieldname": "recipients", "fieldtype": "Table", "label": "Recipients", - "mandatory_depends_on": "eval:doc.channel!=='Slack'", + "mandatory_depends_on": "eval:doc.channel!=='Slack' && !doc.send_to_all_assignees", "options": "Notification Recipient" }, { @@ -277,11 +278,19 @@ "fieldname": "send_system_notification", "fieldtype": "Check", "label": "Send System Notification" + }, + { + "default": "0", + "depends_on": "eval:doc.channel == 'Email'", + "fieldname": "send_to_all_assignees", + "fieldtype": "Check", + "label": "Send To All Assignees" } ], "icon": "fa fa-envelope", + "index_web_pages_for_search": 1, "links": [], - "modified": "2020-08-11 19:24:35.479373", + "modified": "2020-09-01 18:36:22.550891", "modified_by": "Administrator", "module": "Email", "name": "Notification", diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index 2ec208c89d..cfa3c43ff7 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -189,6 +189,7 @@ def get_context(context): recipients, cc, bcc = self.get_list_of_recipients(doc, context) if not (recipients or cc or bcc): return + sender = None if self.sender and self.sender_email: sender = formataddr((self.sender, self.sender_email)) @@ -239,8 +240,6 @@ def get_context(context): email_ids = email_ids_value.replace(",", "\n") recipients = recipients + email_ids.split("\n") - # else: - # print "invalid email" if recipient.cc and "{" in recipient.cc: recipient.cc = frappe.render_template(recipient.cc, context) @@ -262,6 +261,9 @@ def get_context(context): for email in emails: recipients = recipients + email.split("\n") + if self.send_to_all_assignees: + recipients = recipients + get_assignees(doc) + if not recipients and not cc and not bcc: return None, None, None return list(set(recipients)), list(set(cc)), list(set(bcc)) @@ -405,3 +407,12 @@ def evaluate_alert(doc, alert, event): def get_context(doc): return {"doc": doc, "nowdate": nowdate, "frappe": frappe._dict(utils=frappe.utils)} + +def get_assignees(doc): + assignees = [] + assignees = frappe.get_all('ToDo', filters={'status': 'Open', 'reference_name': doc.name, + 'reference_type': doc.doctype}, fields=['owner']) + + recipients = [d.owner for d in assignees] + + return recipients \ No newline at end of file diff --git a/frappe/email/doctype/notification_recipient/notification_recipient.json b/frappe/email/doctype/notification_recipient/notification_recipient.json index 201899cd57..0670320a77 100644 --- a/frappe/email/doctype/notification_recipient/notification_recipient.json +++ b/frappe/email/doctype/notification_recipient/notification_recipient.json @@ -46,9 +46,10 @@ "options": "Role" } ], + "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-02-21 11:18:40.125233", + "modified": "2020-09-01 17:40:27.289105", "modified_by": "Administrator", "module": "Email", "name": "Notification Recipient", From 3eb0e5ce8a88f39bc79f61415f2af6bc0a7c45e2 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Sep 2020 09:21:24 +0530 Subject: [PATCH 081/142] Update frappe/desk/doctype/system_console/system_console.js Co-authored-by: Aditya Hase --- frappe/desk/doctype/system_console/system_console.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/desk/doctype/system_console/system_console.js b/frappe/desk/doctype/system_console/system_console.js index 0aae8bd519..c7eac39490 100644 --- a/frappe/desk/doctype/system_console/system_console.js +++ b/frappe/desk/doctype/system_console/system_console.js @@ -2,6 +2,16 @@ // For license information, please see license.txt frappe.ui.form.on('System Console', { + onload: function(frm) { + frappe.ui.keys.add_shortcut({ + shortcut: 'shift+enter', + action: () => frm.execute_action('Execute'), + page: frm.page, + description: __('Execute Console script'), + ignore_inputs: true, + }); + }, + refresh: function(frm) { frm.disable_save(); frm.page.set_primary_action(__("Execute"), () => { From ac76c551600408f2020c192ceb4dfa1016746ccf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 2 Sep 2020 09:22:28 +0530 Subject: [PATCH 082/142] Update frappe/desk/doctype/system_console/system_console.json Co-authored-by: Aditya Hase --- frappe/desk/doctype/system_console/system_console.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/system_console/system_console.json b/frappe/desk/doctype/system_console/system_console.json index 296647a17a..14e36e6fd3 100644 --- a/frappe/desk/doctype/system_console/system_console.json +++ b/frappe/desk/doctype/system_console/system_console.json @@ -26,7 +26,8 @@ "description": "To print output use log(text)", "fieldname": "console", "fieldtype": "Code", - "label": "Console" + "label": "Console", + "options": "Python" }, { "fieldname": "output", @@ -64,4 +65,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +} From aecb77ce9b5023dab233e55ee918cb87f169812e Mon Sep 17 00:00:00 2001 From: Anupam K Date: Wed, 2 Sep 2020 12:19:34 +0530 Subject: [PATCH 083/142] fix: removing condition --- frappe/email/doctype/newsletter/newsletter.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 14bd7eb1dc..0a0a13a6ce 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -38,8 +38,7 @@ class Newsletter(WebsiteGenerator): if self.recipients: self.queue_all() - if getattr(frappe.local, "is_ajax", False): - frappe.msgprint(_("Email queued to {0} recipients").format(len(self.recipients))) + frappe.msgprint(_("Email queued to {0} recipients").format(len(self.recipients))) else: frappe.msgprint(_("Newsletter should have atleast one recipient")) From 0b8ac586c0f98c8d69777ac1b6b52dd402cd7348 Mon Sep 17 00:00:00 2001 From: Anupam Kumar Date: Wed, 2 Sep 2020 12:51:15 +0530 Subject: [PATCH 084/142] fix: newsletter issues (#11321) * fix: newsletter fix * fix: review changes * fix: test case * fix: failed test case * fix: removing condition Co-authored-by: Prssanna Desai --- frappe/email/doctype/newsletter/newsletter.js | 3 -- .../email/doctype/newsletter/newsletter.json | 48 +++++++++++++++---- frappe/email/doctype/newsletter/newsletter.py | 40 ++++++++-------- .../doctype/newsletter/newsletter_list.js | 6 ++- .../doctype/newsletter/test_newsletter.py | 1 + frappe/patches.txt | 1 + .../v13_0/update_newsletter_content_type.py | 12 +++++ 7 files changed, 76 insertions(+), 35 deletions(-) create mode 100644 frappe/patches/v13_0/update_newsletter_content_type.py diff --git a/frappe/email/doctype/newsletter/newsletter.js b/frappe/email/doctype/newsletter/newsletter.js index 0f1e8dc57c..3277d8e9ee 100644 --- a/frappe/email/doctype/newsletter/newsletter.js +++ b/frappe/email/doctype/newsletter/newsletter.js @@ -14,9 +14,6 @@ frappe.ui.form.on('Newsletter', { }); }, "fa fa-play", "btn-success"); } - if (!doc.__islocal && cint(doc.email_sent)) { - frm.set_df_property('schedule_send', "read_only", 1); - } frm.events.setup_dashboard(frm); diff --git a/frappe/email/doctype/newsletter/newsletter.json b/frappe/email/doctype/newsletter/newsletter.json index 4804b3d6fa..1dd6115b43 100644 --- a/frappe/email/doctype/newsletter/newsletter.json +++ b/frappe/email/doctype/newsletter/newsletter.json @@ -15,7 +15,10 @@ "email_sent", "newsletter_content", "subject", + "content_type", "message", + "message_md", + "message_html", "send_unsubscribe_link", "send_attachments", "published", @@ -37,8 +40,7 @@ "fieldname": "send_from", "fieldtype": "Data", "ignore_xss_filter": 1, - "label": "Sender", - "no_copy": 1 + "label": "Sender" }, { "default": "0", @@ -50,7 +52,8 @@ }, { "fieldname": "newsletter_content", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Content" }, { "fieldname": "subject", @@ -61,11 +64,12 @@ "reqd": 1 }, { + "depends_on": "eval: doc.content_type === 'Rich Text'", "fieldname": "message", "fieldtype": "Text Editor", "in_list_view": 1, "label": "Message", - "reqd": 1 + "mandatory_depends_on": "eval: doc.content_type === 'Rich Text'" }, { "default": "1", @@ -87,16 +91,20 @@ "read_only": 1 }, { + "collapsible": 1, "fieldname": "test_the_newsletter", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Testing" }, { "description": "A Lead with this Email Address should exist", "fieldname": "test_email_id", "fieldtype": "Data", - "label": "Test Email Address" + "label": "Test Email Address", + "options": "Email" }, { + "depends_on": "eval: doc.test_email_id", "fieldname": "test_send", "fieldtype": "Button", "label": "Test", @@ -117,7 +125,8 @@ "depends_on": "eval: doc.schedule_sending", "fieldname": "schedule_send", "fieldtype": "Datetime", - "label": "Schedule Send" + "label": "Schedule Send", + "read_only_depends_on": "eval: doc.email_sent" }, { "default": "0", @@ -125,11 +134,32 @@ "fieldtype": "Check", "label": "Send Attachments" }, + { + "fieldname": "content_type", + "fieldtype": "Select", + "label": "Content Type", + "options": "Rich Text\nMarkdown\nHTML" + }, + { + "depends_on": "eval:doc.content_type === 'Markdown'", + "fieldname": "message_md", + "fieldtype": "Markdown Editor", + "label": "Message (Markdown)", + "mandatory_depends_on": "eval:doc.content_type === 'Markdown'" + }, + { + "depends_on": "eval:doc.content_type === 'HTML'", + "fieldname": "message_html", + "fieldtype": "HTML Editor", + "label": "Message (HTML)", + "mandatory_depends_on": "eval:doc.content_type === 'HTML'" + }, { "default": "0", "fieldname": "schedule_sending", "fieldtype": "Check", - "label": "Schedule Sending" + "label": "Schedule Sending", + "read_only_depends_on": "eval: doc.email_sent" } ], "has_web_view": 1, @@ -139,7 +169,7 @@ "is_published_field": "published", "links": [], "max_attachments": 3, - "modified": "2020-08-17 18:11:59.541686", + "modified": "2020-08-24 19:59:37.262500", "modified_by": "Administrator", "module": "Email", "name": "Newsletter", diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 849c21f768..0a0a13a6ce 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -8,12 +8,9 @@ import frappe.utils 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.email.queue import send from frappe.email.doctype.email_group.email_group import add_subscribers -from frappe.utils import parse_addr, now_datetime -from frappe.utils import validate_email_address - +from frappe.utils import parse_addr, now_datetime, markdown, validate_email_address class Newsletter(WebsiteGenerator): def onload(self): @@ -29,8 +26,8 @@ class Newsletter(WebsiteGenerator): def test_send(self, doctype="Lead"): self.recipients = frappe.utils.split_emails(self.test_email_id) - self.queue_all() - frappe.msgprint(_("Scheduled to send to {0}").format(self.test_email_id)) + self.queue_all(test_email=True) + frappe.msgprint(_("Test email sent to {0}").format(self.test_email_id)) def send_emails(self): """send emails to leads and customers""" @@ -40,21 +37,13 @@ class Newsletter(WebsiteGenerator): self.recipients = self.get_recipients() if self.recipients: - if getattr(frappe.local, "is_ajax", False): - self.validate_send() - # using default queue with a longer timeout as this isn't a scheduled task - enqueue(send_newsletter, queue='default', timeout=6000, event='send_newsletter', - newsletter=self.name) - - else: - self.queue_all() - - frappe.msgprint(_("Scheduled to send to {0} recipients").format(len(self.recipients))) + self.queue_all() + frappe.msgprint(_("Email queued to {0} recipients").format(len(self.recipients))) else: frappe.msgprint(_("Newsletter should have atleast one recipient")) - def queue_all(self): + def queue_all(self, test_email=False): if not self.get("recipients"): # in case it is called via worker self.recipients = self.get_recipients() @@ -80,7 +69,7 @@ class Newsletter(WebsiteGenerator): frappe.throw(_("Unable to find attachment {0}").format(file.name)) send(recipients=self.recipients, sender=sender, - subject=self.subject, message=self.message, + subject=self.subject, message=self.get_message(), reference_doctype=self.doctype, reference_name=self.name, add_unsubscribe_link=self.send_unsubscribe_link, attachments=attachments, unsubscribe_method="/unsubscribe", @@ -90,9 +79,18 @@ class Newsletter(WebsiteGenerator): if not frappe.flags.in_test: frappe.db.auto_commit_on_many_writes = False - self.db_set("email_sent", 1) - self.db_set("schedule_send", now_datetime()) - self.db_set("scheduled_to_send", len(self.recipients)) + if not test_email: + self.db_set("email_sent", 1) + self.db_set("schedule_send", now_datetime()) + self.db_set("scheduled_to_send", len(self.recipients)) + + def get_message(self): + + return { + 'Rich Text': self.message, + 'Markdown': markdown(self.message_md), + 'HTML': self.message_html + }[self.content_type] def get_recipients(self): """Get recipients from Email Group""" diff --git a/frappe/email/doctype/newsletter/newsletter_list.js b/frappe/email/doctype/newsletter/newsletter_list.js index e95d29545d..9ded6148e0 100644 --- a/frappe/email/doctype/newsletter/newsletter_list.js +++ b/frappe/email/doctype/newsletter/newsletter_list.js @@ -1,8 +1,10 @@ frappe.listview_settings['Newsletter'] = { - add_fields: ["subject", "email_sent"], + add_fields: ["subject", "email_sent", "schedule_sending"], get_indicator: function(doc) { - if(doc.email_sent) { + if (doc.email_sent) { return [__("Sent"), "green", "email_sent,=,Yes"]; + } else if (doc.schedule_sending) { + return [__("Scheduled"), "orange", "email_sent,=,No|schedule_sending,=,Yes"]; } else { return [__("Not Sent"), "orange", "email_sent,=,No"]; } diff --git a/frappe/email/doctype/newsletter/test_newsletter.py b/frappe/email/doctype/newsletter/test_newsletter.py index bb339165d3..ee7f123b7e 100644 --- a/frappe/email/doctype/newsletter/test_newsletter.py +++ b/frappe/email/doctype/newsletter/test_newsletter.py @@ -67,6 +67,7 @@ class TestNewsletter(unittest.TestCase): "doctype": "Newsletter", "subject": "_Test Newsletter", "send_from": "Test Sender ", + "content_type": "Rich Text", "message": "Testing my news.", "published": published, "schedule_sending": bool(schedule_send), diff --git a/frappe/patches.txt b/frappe/patches.txt index 9c9fd71661..35389eee43 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -306,3 +306,4 @@ frappe.patches.v13_0.add_toggle_width_in_navbar_settings frappe.patches.v13_0.rename_notification_fields frappe.patches.v13_0.remove_duplicate_navbar_items frappe.patches.v13_0.enable_custom_script +frappe.patches.v13_0.update_newsletter_content_type diff --git a/frappe/patches/v13_0/update_newsletter_content_type.py b/frappe/patches/v13_0/update_newsletter_content_type.py new file mode 100644 index 0000000000..0b32fb49ed --- /dev/null +++ b/frappe/patches/v13_0/update_newsletter_content_type.py @@ -0,0 +1,12 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + frappe.reload_doc('email', 'doctype', 'Newsletter') + frappe.db.sql(""" + UPDATE tabNewsletter + SET content_type = 'Rich Text' + """) \ No newline at end of file From fda7999bdd6b67561e7ded71f12e9264f417dd27 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 2 Sep 2020 15:48:49 +0530 Subject: [PATCH 085/142] fix: Send email notification by child table fields --- .../doctype/notification/notification.js | 22 ++++++++++++++----- .../doctype/notification/notification.py | 15 +++++++++---- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/frappe/email/doctype/notification/notification.js b/frappe/email/doctype/notification/notification.js index 454514f922..5eae016573 100644 --- a/frappe/email/doctype/notification/notification.js +++ b/frappe/email/doctype/notification/notification.js @@ -19,9 +19,11 @@ frappe.notification = { } frappe.model.with_doctype(frm.doc.document_type, function() { - let get_select_options = function(df) { + let get_select_options = function(df, parent_field) { + let select_value = parent_field ? df.fieldname + ',' + parent_field : df.fieldname; + return { - value: df.fieldname, + value: select_value, label: df.fieldname + ' (' + __(df.label) + ')' }; }; @@ -59,9 +61,19 @@ frappe.notification = { let receiver_fields = []; if (frm.doc.channel === 'Email') { receiver_fields = $.map(fields, function(d) { - return d.options == 'Email' || - (d.options == 'User' && d.fieldtype == 'Link') - ? get_select_options(d) : null; + + if (d.fieldtype == 'Table') { + let child_fields = frappe.get_doc('DocType', d.options).fields; + return $.map(child_fields, function(df) { + return df.options == 'Email' || + (df.options == 'User' && df.fieldtype == 'Link') + ? get_select_options(df, d.fieldname) : null; + }); + } else { + return d.options == 'Email' || + (d.options == 'User' && d.fieldtype == 'Link') + ? get_select_options(d) : null; + } }); } else if (in_list(['WhatsApp', 'SMS'], frm.doc.channel)) { receiver_fields = $.map(fields, function(d) { diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index cfa3c43ff7..a51afbf7aa 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -235,10 +235,17 @@ def get_context(context): if not frappe.safe_eval(recipient.condition, None, context): continue if recipient.receiver_by_document_field: - email_ids_value = doc.get(recipient.receiver_by_document_field) - if validate_email_address(email_ids_value): - email_ids = email_ids_value.replace(",", "\n") - recipients = recipients + email_ids.split("\n") + fields = recipient.receiver_by_document_field.split(',') + if len(fields) > 1: + for d in doc.get(fields[1]): + email_id = d.get(fields[0]) + if validate_email_address(email_id): + recipients.append(email_id) + else: + email_ids_value = doc.get(fields[0]) + if validate_email_address(email_ids_value): + email_ids = email_ids_value.replace(",", "\n") + recipients = recipients + email_ids.split("\n") if recipient.cc and "{" in recipient.cc: recipient.cc = frappe.render_template(recipient.cc, context) From 07728df16af98858accc34cb339bce6e92ebc26f Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 2 Sep 2020 15:49:55 +0530 Subject: [PATCH 086/142] fix: Add test cases --- .../doctype/notification/test_notification.py | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index 9bdf09375d..71d46cbdfa 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe, frappe.utils, frappe.utils.scheduler +from frappe.desk.form import assign_to import unittest test_records = frappe.get_test_records('Notification') @@ -177,3 +178,92 @@ class TestNotification(unittest.TestCase): frappe.db.sql("""delete from `tabUser` where email='test_jinja@example.com'""") frappe.db.sql("""delete from `tabEmail Queue`""") frappe.db.sql("""delete from `tabEmail Queue Recipient`""") + + def test_notification_to_assignee(self): + frappe.set_user("Administrator") + + todo = frappe.new_doc('ToDo') + todo.description = 'Test Notification' + todo.save() + + assign_to.add({ + "assign_to": ["test2@example.com"], + "doctype": todo.doctype, + "name": todo.name, + "description": "Close this Todo" + }) + + assign_to.add({ + "assign_to": ["test1@example.com"], + "doctype": todo.doctype, + "name": todo.name, + "description": "Close this Todo" + }) + + if not frappe.db.exists('Notification', {'name': 'ToDo Status Update'}, 'name'): + notification = frappe.new_doc('Notification') + notification.name = 'ToDo Status Update' + notification.subject = 'ToDo Status Update' + notification.document_type = 'ToDo' + notification.event = 'Value Change' + notification.value_changed = 'status' + notification.send_to_all_assignees = 1 + notification.save() + + #change status of todo + todo.status = 'Closed' + todo.save() + + email_queue = frappe.get_doc('Email Queue', {'reference_doctype': 'ToDo', + 'reference_name': todo.name}) + + self.assertTrue(email_queue) + + recipients = [d.recipient for d in email_queue.recipients] + self.assertTrue('test2@example.com' in recipients) + self.assertTrue('test1@example.com' in recipients) + + def test_notification_by_child_table_field(self): + frappe.set_user("Administrator") + + if not frappe.db.exists('Notification', {'name': 'Contact Status Update'}, 'name'): + notification = frappe.new_doc('Notification') + notification.name = 'Contact Status Update' + notification.subject = 'Contact Status Update' + notification.document_type = 'Contact' + notification.event = 'Value Change' + notification.value_changed = 'status' + notification.message = 'Test Contact Update' + notification.append('recipients', { + 'receiver_by_document_field': 'email_id,email_ids' + }) + notification.save() + + contact = frappe.new_doc('Contact') + contact.first_name = 'John Doe' + contact.status = 'Open' + contact.append('email_ids', { + 'email_id': 'test2@example.com', + 'is_primary': 1 + }) + + contact.append('email_ids', { + 'email_id': 'test1@example.com' + }) + + contact.save() + + #change status of todo + contact.status = 'Replied' + contact.save() + + email_queue = frappe.get_doc('Email Queue', {'reference_doctype': 'Contact', + 'reference_name': contact.name}) + + self.assertTrue(email_queue) + + recipients = [d.recipient for d in email_queue.recipients] + self.assertTrue('test2@example.com' in recipients) + self.assertTrue('test1@example.com' in recipients) + + From 6ef4536c697885d1fdd617edafd30ab21733b578 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 2 Sep 2020 16:20:32 +0530 Subject: [PATCH 087/142] fix: Update comment --- frappe/email/doctype/notification/test_notification.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index 71d46cbdfa..e370bac9e5 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -253,7 +253,7 @@ class TestNotification(unittest.TestCase): contact.save() - #change status of todo + #change status of contact contact.status = 'Replied' contact.save() From 87c06ef5a49a86150680f9102f81f0883a567285 Mon Sep 17 00:00:00 2001 From: Anupam K Date: Wed, 2 Sep 2020 17:19:00 +0530 Subject: [PATCH 088/142] fix: tabs --- frappe/patches/v13_0/update_newsletter_content_type.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/patches/v13_0/update_newsletter_content_type.py b/frappe/patches/v13_0/update_newsletter_content_type.py index 0b32fb49ed..01f4bacd16 100644 --- a/frappe/patches/v13_0/update_newsletter_content_type.py +++ b/frappe/patches/v13_0/update_newsletter_content_type.py @@ -5,8 +5,8 @@ from __future__ import unicode_literals import frappe def execute(): - frappe.reload_doc('email', 'doctype', 'Newsletter') - frappe.db.sql(""" - UPDATE tabNewsletter - SET content_type = 'Rich Text' - """) \ No newline at end of file + frappe.reload_doc('email', 'doctype', 'Newsletter') + frappe.db.sql(""" + UPDATE tabNewsletter + SET content_type = 'Rich Text' + """) \ No newline at end of file From b373f10432cc5be1df2f5922eeae1eaecd227890 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 2 Sep 2020 20:00:36 +0530 Subject: [PATCH 089/142] fix: Add sleep to fix test cases --- frappe/email/doctype/notification/test_notification.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index e370bac9e5..5b8ceb03d4 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe, frappe.utils, frappe.utils.scheduler from frappe.desk.form import assign_to import unittest +import time test_records = frappe.get_test_records('Notification') @@ -214,6 +215,8 @@ class TestNotification(unittest.TestCase): todo.status = 'Closed' todo.save() + # adding sleep so that email queue is fetched once its created + time.sleep(10) email_queue = frappe.get_doc('Email Queue', {'reference_doctype': 'ToDo', 'reference_name': todo.name}) @@ -257,6 +260,8 @@ class TestNotification(unittest.TestCase): contact.status = 'Replied' contact.save() + # adding sleep so that email queue is fetched once its created + time.sleep(10) email_queue = frappe.get_doc('Email Queue', {'reference_doctype': 'Contact', 'reference_name': contact.name}) From b65e6588282eb29843b91cb6a868ccb945751f93 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 2 Sep 2020 20:42:43 +0530 Subject: [PATCH 090/142] fix: Move notification creation in setup --- .../doctype/notification/test_notification.py | 58 ++++++++----------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py index 5b8ceb03d4..45a1587c1a 100644 --- a/frappe/email/doctype/notification/test_notification.py +++ b/frappe/email/doctype/notification/test_notification.py @@ -6,7 +6,6 @@ from __future__ import unicode_literals import frappe, frappe.utils, frappe.utils.scheduler from frappe.desk.form import assign_to import unittest -import time test_records = frappe.get_test_records('Notification') @@ -15,7 +14,31 @@ test_dependencies = ["User"] class TestNotification(unittest.TestCase): def setUp(self): frappe.db.sql("""delete from `tabEmail Queue`""") - frappe.set_user("test1@example.com") + frappe.set_user("test@example.com") + + if not frappe.db.exists('Notification', {'name': 'ToDo Status Update'}, 'name'): + notification = frappe.new_doc('Notification') + notification.name = 'ToDo Status Update' + notification.subject = 'ToDo Status Update' + notification.document_type = 'ToDo' + notification.event = 'Value Change' + notification.value_changed = 'status' + notification.send_to_all_assignees = 1 + notification.save() + + if not frappe.db.exists('Notification', {'name': 'Contact Status Update'}, 'name'): + notification = frappe.new_doc('Notification') + notification.name = 'Contact Status Update' + notification.subject = 'Contact Status Update' + notification.document_type = 'Contact' + notification.event = 'Value Change' + notification.value_changed = 'status' + notification.message = 'Test Contact Update' + notification.append('recipients', { + 'receiver_by_document_field': 'email_id,email_ids' + }) + notification.save() + def tearDown(self): frappe.set_user("Administrator") @@ -181,8 +204,6 @@ class TestNotification(unittest.TestCase): frappe.db.sql("""delete from `tabEmail Queue Recipient`""") def test_notification_to_assignee(self): - frappe.set_user("Administrator") - todo = frappe.new_doc('ToDo') todo.description = 'Test Notification' todo.save() @@ -201,22 +222,10 @@ class TestNotification(unittest.TestCase): "description": "Close this Todo" }) - if not frappe.db.exists('Notification', {'name': 'ToDo Status Update'}, 'name'): - notification = frappe.new_doc('Notification') - notification.name = 'ToDo Status Update' - notification.subject = 'ToDo Status Update' - notification.document_type = 'ToDo' - notification.event = 'Value Change' - notification.value_changed = 'status' - notification.send_to_all_assignees = 1 - notification.save() - #change status of todo todo.status = 'Closed' todo.save() - # adding sleep so that email queue is fetched once its created - time.sleep(10) email_queue = frappe.get_doc('Email Queue', {'reference_doctype': 'ToDo', 'reference_name': todo.name}) @@ -227,21 +236,6 @@ class TestNotification(unittest.TestCase): self.assertTrue('test1@example.com' in recipients) def test_notification_by_child_table_field(self): - frappe.set_user("Administrator") - - if not frappe.db.exists('Notification', {'name': 'Contact Status Update'}, 'name'): - notification = frappe.new_doc('Notification') - notification.name = 'Contact Status Update' - notification.subject = 'Contact Status Update' - notification.document_type = 'Contact' - notification.event = 'Value Change' - notification.value_changed = 'status' - notification.message = 'Test Contact Update' - notification.append('recipients', { - 'receiver_by_document_field': 'email_id,email_ids' - }) - notification.save() - contact = frappe.new_doc('Contact') contact.first_name = 'John Doe' contact.status = 'Open' @@ -260,8 +254,6 @@ class TestNotification(unittest.TestCase): contact.status = 'Replied' contact.save() - # adding sleep so that email queue is fetched once its created - time.sleep(10) email_queue = frappe.get_doc('Email Queue', {'reference_doctype': 'Contact', 'reference_name': contact.name}) From 0bdb4c8b4e00e37a5353561419dff82337fe3f97 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 2 Sep 2020 21:12:26 +0530 Subject: [PATCH 091/142] fix: Linting issues --- frappe/email/doctype/notification/notification.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/doctype/notification/notification.js b/frappe/email/doctype/notification/notification.js index 5eae016573..cb49232906 100644 --- a/frappe/email/doctype/notification/notification.js +++ b/frappe/email/doctype/notification/notification.js @@ -65,7 +65,7 @@ frappe.notification = { if (d.fieldtype == 'Table') { let child_fields = frappe.get_doc('DocType', d.options).fields; return $.map(child_fields, function(df) { - return df.options == 'Email' || + return df.options == 'Email' || (df.options == 'User' && df.fieldtype == 'Link') ? get_select_options(df, d.fieldname) : null; }); From 66934b311fd9a0275252b71f7b43c61f7cc1ae22 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 2 Sep 2020 22:18:05 +0530 Subject: [PATCH 092/142] chore(deps): [security] bump bl from 3.0.0 to 3.0.1 (#11403) Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- yarn.lock | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/yarn.lock b/yarn.lock index 41fd1926c2..e5c975c357 100644 --- a/yarn.lock +++ b/yarn.lock @@ -937,9 +937,9 @@ big.js@^3.1.3: integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== bl@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88" - integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A== + version "3.0.1" + resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" + integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== dependencies: readable-stream "^3.0.1" @@ -6157,7 +6157,7 @@ readable-stream@1.1.x: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.2.2, readable-stream@~2.3.6: +readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -6170,19 +6170,6 @@ readable-stream@2, readable-stream@^2.0.0, readable-stream@^2.2.2, readable-stre string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" - integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - readable-stream@^3.0.1, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" @@ -6612,11 +6599,16 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.2: version "5.2.0" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" From 9eb903038144e6823f7857d180788a01e33b0da8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Sep 2020 08:42:42 +0530 Subject: [PATCH 093/142] fix(minor): move get_source_value to data_migration_mapper --- .../data_migration_mapping/data_migration_mapping.py | 8 +++++++- .../doctype/data_migration_run/data_migration_run.py | 3 ++- frappe/utils/data.py | 7 ------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py b/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py index e89282885f..b346864f02 100644 --- a/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py +++ b/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document -from frappe.utils import get_source_value class DataMigrationMapping(Document): def get_filters(self): @@ -70,3 +69,10 @@ def get_value_from_fieldname(field_map, fieldname_field, doc): else: value = get_source_value(doc, field_name) return value + +def get_source_value(source, key): + '''Get value from source (object or dict) based on key''' + if isinstance(source, dict): + return source.get(key) + else: + return getattr(source, key) diff --git a/frappe/data_migration/doctype/data_migration_run/data_migration_run.py b/frappe/data_migration/doctype/data_migration_run/data_migration_run.py index b2ce4606f8..473acfb3d0 100644 --- a/frappe/data_migration/doctype/data_migration_run/data_migration_run.py +++ b/frappe/data_migration/doctype/data_migration_run/data_migration_run.py @@ -6,7 +6,8 @@ from __future__ import unicode_literals import frappe, json, math from frappe.model.document import Document from frappe import _ -from frappe.utils import get_source_value, cstr +from frappe.utils import cstr +from frappe.data_migration.doctype.data_migration_mapping.data_migration_mapping import get_source_value class DataMigrationRun(Document): def run(self): diff --git a/frappe/utils/data.py b/frappe/utils/data.py index fd5c838b57..8dad5f3e92 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -1226,13 +1226,6 @@ def md_to_html(markdown_text): return html -def get_source_value(source, key): - '''Get value from source (object or dict) based on key''' - if isinstance(source, dict): - return source.get(key) - else: - return getattr(source, key) - def is_subset(list_a, list_b): '''Returns whether list_a is a subset of list_b''' return len(list(set(list_a) & set(list_b))) == len(list_a) From 4d91d72d1ace10725cb74a146af911e6b6275d45 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 3 Sep 2020 09:00:58 +0530 Subject: [PATCH 094/142] refactor: Client-side get_role_permissions --- frappe/public/js/frappe/form/form.js | 11 +++---- frappe/public/js/frappe/model/perm.js | 43 ++++++++++++--------------- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index ff48ad2f60..cae0cb3c4a 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -1405,19 +1405,16 @@ frappe.ui.form.Form = class FrappeForm { } set_read_only() { - var perm = []; - var docperms = frappe.perm.get_perm(this.doc.doctype); - for (var i=0, l=docperms.length; i { + return { read: p.read, cancel: p.cancel, share: p.share, print: p.print, email: p.email }; - } - this.perm = perm; + }); } trigger(event, doctype, docname) { diff --git a/frappe/public/js/frappe/model/perm.js b/frappe/public/js/frappe/model/perm.js index f30368bbc3..2a1f52fbfb 100644 --- a/frappe/public/js/frappe/model/perm.js +++ b/frappe/public/js/frappe/model/perm.js @@ -42,7 +42,7 @@ $.extend(frappe.perm, { }, get_perm: (doctype, doc) => { - let perm = [{ read: 0 }]; + let perm = [{ read: 0, permlevel: 0 }]; let meta = frappe.get_doc("DocType", doctype); const user = frappe.session.user; @@ -53,7 +53,7 @@ $.extend(frappe.perm, { if (!meta) return perm; - frappe.perm.build_role_permissions(perm, meta); + perm = frappe.perm.get_role_permissions(meta); if (doc) { // apply user permissions via docinfo (which is processed server-side) @@ -107,35 +107,30 @@ $.extend(frappe.perm, { return perm; }, - build_role_permissions: (perm, meta) => { + get_role_permissions: (meta) => { + let perm = [{ read: 0, permlevel: 0 }]; // Returns a `dict` of evaluated Role Permissions - $.each(meta.permissions || [], (i, p) => { + (meta.permissions || []).forEach(p => { // if user has this role - if (frappe.user_roles.includes(p.role)) { - let permlevel = cint(p.permlevel); - if (!perm[permlevel]) { - perm[permlevel] = {}; - perm[permlevel]["permlevel"] = permlevel - } + let permlevel = cint(p.permlevel); + if (!perm[permlevel]) { + perm[permlevel] = {}; + perm[permlevel]["permlevel"] = permlevel; + } - $.each(frappe.perm.rights, (i, key) => { - perm[permlevel][key] = perm[permlevel][key] || (p[key] || 0); + if (frappe.user_roles.includes(p.role)) { + frappe.perm.rights.forEach(right => { + let value = perm[permlevel][right] || (p[right] || 0); + if (value) { + perm[permlevel][right] = value; + } }); } }); - // remove values with 0 - $.each(perm[0], (key, val) => { - if (!val) { - delete perm[0][key]; - } - }); - - $.each(perm, (i, v) => { - if (v === undefined) { - perm[i] = {}; - } - }); + // fill gaps with empty object + perm = perm.map(p => p || {}); + return perm; }, get_match_rules: (doctype, ptype) => { From ba9c7bdc09b658238391c913b45922b06340a57c Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 3 Sep 2020 13:55:55 +0530 Subject: [PATCH 095/142] fix: Also check if name is set, since empty object is truthy --- frappe/public/js/frappe/form/controls/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/data.js b/frappe/public/js/frappe/form/controls/data.js index 355f35891a..bbf9a89072 100644 --- a/frappe/public/js/frappe/form/controls/data.js +++ b/frappe/public/js/frappe/form/controls/data.js @@ -61,7 +61,7 @@ frappe.ui.form.ControlData = frappe.ui.form.ControlInput.extend({ // check if name exists frappe.db.get_value(this.doctype, this.$input.val(), 'name', (val) => { - if (val) { + if (val && val.name) { this.set_description(__('{0} already exists. Select another name', [val.name])); } }, From 5b449d1084abba1016940bd49975b38225ed9e9e Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Thu, 3 Sep 2020 14:24:19 +0530 Subject: [PATCH 096/142] chore: Add comments --- frappe/email/doctype/notification/notification.js | 3 +++ frappe/email/doctype/notification/notification.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/frappe/email/doctype/notification/notification.js b/frappe/email/doctype/notification/notification.js index cb49232906..059f5518fc 100644 --- a/frappe/email/doctype/notification/notification.js +++ b/frappe/email/doctype/notification/notification.js @@ -20,6 +20,7 @@ frappe.notification = { frappe.model.with_doctype(frm.doc.document_type, function() { let get_select_options = function(df, parent_field) { + // Append parent_field name along with fieldname for child table fields let select_value = parent_field ? df.fieldname + ',' + parent_field : df.fieldname; return { @@ -62,6 +63,7 @@ frappe.notification = { if (frm.doc.channel === 'Email') { receiver_fields = $.map(fields, function(d) { + // Add User and Email fields from child into select dropdown if (d.fieldtype == 'Table') { let child_fields = frappe.get_doc('DocType', d.options).fields; return $.map(child_fields, function(df) { @@ -69,6 +71,7 @@ frappe.notification = { (df.options == 'User' && df.fieldtype == 'Link') ? get_select_options(df, d.fieldname) : null; }); + // Add User and Email fields from parent into select dropdown } else { return d.options == 'Email' || (d.options == 'User' && d.fieldtype == 'Link') diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index a51afbf7aa..cd5aacabbd 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -236,11 +236,13 @@ def get_context(context): continue if recipient.receiver_by_document_field: fields = recipient.receiver_by_document_field.split(',') + # fields from child table if len(fields) > 1: for d in doc.get(fields[1]): email_id = d.get(fields[0]) if validate_email_address(email_id): recipients.append(email_id) + # field from parent doc else: email_ids_value = doc.get(fields[0]) if validate_email_address(email_ids_value): From 8c8f7313f41d9d6e350295403d0a21c59537e6b4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 3 Sep 2020 14:26:01 +0530 Subject: [PATCH 097/142] fix(minor): make utils explicit in safe_globals (#11408) * fix(minor): make utils explicit in safe_globals * fix(minor): import subprocess * fix(minor): fix globals in safe_eval; * fix(minor): import subprocess * fix(minor): add test * fix(minor): webhook.py * fix(minor): document_type_mapping.py --- .../data_migration_mapping.py | 3 +- .../document_type_mapping.py | 2 +- .../integrations/doctype/webhook/webhook.py | 4 +- frappe/tests/test_safe_exec.py | 11 +- frappe/utils/data.py | 15 --- frappe/utils/pdf.py | 17 ++- frappe/utils/safe_exec.py | 110 +++++++++++++++++- 7 files changed, 139 insertions(+), 23 deletions(-) diff --git a/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py b/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py index b346864f02..097652fb88 100644 --- a/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py +++ b/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py @@ -5,11 +5,12 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document +from frappe.utils.safe_exec import get_safe_globals class DataMigrationMapping(Document): def get_filters(self): if self.condition: - return frappe.safe_eval(self.condition, dict(frappe=frappe)) + return frappe.safe_eval(self.condition, get_safe_globals()) def get_fields(self): fields = [] diff --git a/frappe/event_streaming/doctype/document_type_mapping/document_type_mapping.py b/frappe/event_streaming/doctype/document_type_mapping/document_type_mapping.py index 8ace4f57d3..bf96e4e27b 100644 --- a/frappe/event_streaming/doctype/document_type_mapping/document_type_mapping.py +++ b/frappe/event_streaming/doctype/document_type_mapping/document_type_mapping.py @@ -102,7 +102,7 @@ class DocumentTypeMapping(Document): filters = json.loads(mapping.remote_value_filters) for key, value in iteritems(filters): if value.startswith('eval:'): - val = frappe.safe_eval(value[5:], dict(frappe=frappe)) + val = frappe.safe_eval(value[5:], None, dict(doc=doc)) filters[key] = val if doc.get(value): filters[key] = doc.get(value) diff --git a/frappe/integrations/doctype/webhook/webhook.py b/frappe/integrations/doctype/webhook/webhook.py index 8e6c8d58e4..f1556aa661 100644 --- a/frappe/integrations/doctype/webhook/webhook.py +++ b/frappe/integrations/doctype/webhook/webhook.py @@ -18,6 +18,7 @@ import frappe from frappe import _ from frappe.model.document import Document from frappe.utils.jinja import validate_template +from frappe.utils.safe_exec import get_safe_globals WEBHOOK_SECRET_HEADER = "X-Frappe-Webhook-Signature" @@ -75,8 +76,7 @@ class Webhook(Document): def get_context(doc): - return {"doc": doc, "utils": frappe.utils} - + return {'doc': doc, 'utils': get_safe_globals().get('frappe').get('utils')} def enqueue_webhook(doc, webhook): webhook = frappe.get_doc("Webhook", webhook.get("name")) diff --git a/frappe/tests/test_safe_exec.py b/frappe/tests/test_safe_exec.py index 95bbae6746..d7b25b8194 100644 --- a/frappe/tests/test_safe_exec.py +++ b/frappe/tests/test_safe_exec.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals import unittest, frappe -from frappe.utils.safe_exec import safe_exec +from frappe.utils.safe_exec import safe_exec, get_safe_globals class TestSafeExec(unittest.TestCase): def test_import_fails(self): @@ -9,6 +9,15 @@ class TestSafeExec(unittest.TestCase): def test_internal_attributes(self): self.assertRaises(SyntaxError, safe_exec, '().__class__.__call__') + def test_utils(self): + _locals = dict(out=None) + safe_exec('''out = frappe.utils.cint("1")''', None, _locals) + self.assertEqual(_locals['out'], 1) + + def test_safe_eval(self): + self.assertEqual(frappe.safe_eval('1+1'), 2) + self.assertRaises(AttributeError, frappe.safe_eval, 'frappe.utils.os.path', get_safe_globals()) + def test_sql(self): _locals = dict(out=None) safe_exec('''out = frappe.db.sql("select name from tabDocType where name='DocType'")''', None, _locals) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 8dad5f3e92..8a25c84276 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -3,10 +3,8 @@ from __future__ import unicode_literals -# IMPORTANT: only import safe functions as this module will be included in jinja environment import frappe from dateutil.parser._parser import ParserError -import subprocess import operator import json import re, datetime, math, time @@ -427,19 +425,6 @@ def flt(s, precision=None): return num -def get_wkhtmltopdf_version(): - wkhtmltopdf_version = frappe.cache().hget("wkhtmltopdf_version", None) - - if not wkhtmltopdf_version: - try: - res = subprocess.check_output(["wkhtmltopdf", "--version"]) - wkhtmltopdf_version = res.decode('utf-8').split(" ")[1] - frappe.cache().hset("wkhtmltopdf_version", None, wkhtmltopdf_version) - except Exception: - pass - - return (wkhtmltopdf_version or '0') - def cint(s): """Convert to integer""" try: num = int(float(s)) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index f3d2e75c2b..51febb5f72 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -6,6 +6,7 @@ import io import os import re from distutils.version import LooseVersion +import subprocess import pdfkit import six @@ -14,7 +15,7 @@ from PyPDF2 import PdfFileReader, PdfFileWriter import frappe from frappe import _ -from frappe.utils import get_wkhtmltopdf_version, scrub_urls +from frappe.utils import scrub_urls PDF_CONTENT_ERRORS = ["ContentNotFoundError", "ContentOperationNotPermittedError", @@ -191,7 +192,6 @@ def cleanup(fname, options): if options.get(key) and os.path.exists(options[key]): os.remove(options[key]) - def toggle_visible_pdf(soup): for tag in soup.find_all(attrs={"class": "visible-pdf"}): # remove visible-pdf class to unhide @@ -200,3 +200,16 @@ def toggle_visible_pdf(soup): for tag in soup.find_all(attrs={"class": "hidden-pdf"}): # remove tag from html tag.extract() + +def get_wkhtmltopdf_version(): + wkhtmltopdf_version = frappe.cache().hget("wkhtmltopdf_version", None) + + if not wkhtmltopdf_version: + try: + res = subprocess.check_output(["wkhtmltopdf", "--version"]) + wkhtmltopdf_version = res.decode('utf-8').split(" ")[1] + frappe.cache().hset("wkhtmltopdf_version", None, wkhtmltopdf_version) + except Exception: + pass + + return (wkhtmltopdf_version or '0') diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py index 738ce2ba0f..12382e85cd 100644 --- a/frappe/utils/safe_exec.py +++ b/frappe/utils/safe_exec.py @@ -39,7 +39,7 @@ def get_safe_globals(): date_format = "yyyy-mm-dd" time_format = "HH:mm:ss" - add_module_properties(frappe.utils.data, datautils, lambda obj: hasattr(obj, "__call__")) + add_data_utils(datautils) if "_" in getattr(frappe.local, 'form_dict', {}): del frappe.local.form_dict["_"] @@ -162,6 +162,11 @@ def _write(obj): # allow writing to any object return obj +def add_data_utils(data): + for key, obj in frappe.utils.data.__dict__.items(): + if key in VALID_UTILS: + data[key] = obj + def add_module_properties(module, data, filter_method): for key, obj in module.__dict__.items(): if key.startswith("_"): @@ -171,3 +176,106 @@ def add_module_properties(module, data, filter_method): if filter_method(obj): # only allow functions data[key] = obj + +VALID_UTILS = ( +"DATE_FORMAT", +"TIME_FORMAT", +"DATETIME_FORMAT", +"is_invalid_date_string", +"getdate", +"get_datetime", +"to_timedelta", +"add_to_date", +"add_days", +"add_months", +"add_years", +"date_diff", +"month_diff", +"time_diff", +"time_diff_in_seconds", +"time_diff_in_hours", +"now_datetime", +"get_timestamp", +"get_eta", +"get_time_zone", +"convert_utc_to_user_timezone", +"now", +"nowdate", +"today", +"nowtime", +"get_first_day", +"get_quarter_start", +"get_first_day_of_week", +"get_year_start", +"get_last_day_of_week", +"get_last_day", +"get_time", +"get_datetime_str", +"get_date_str", +"get_time_str", +"get_user_date_format", +"get_user_time_format", +"format_date", +"format_time", +"format_datetime", +"format_duration", +"get_weekdays", +"get_weekday", +"get_timespan_date_range", +"global_date_format", +"has_common", +"flt", +"cint", +"floor", +"ceil", +"cstr", +"rounded", +"remainder", +"safe_div", +"round_based_on_smallest_currency_fraction", +"encode", +"parse_val", +"fmt_money", +"get_number_format_info", +"money_in_words", +"in_words", +"is_html", +"is_image", +"get_thumbnail_base64_for_image", +"image_to_base64", +"strip_html", +"escape_html", +"pretty_date", +"comma_or", +"comma_and", +"comma_sep", +"new_line_sep", +"filter_strip_join", +"get_url", +"get_host_name_from_request", +"url_contains_port", +"get_host_name", +"get_link_to_form", +"get_link_to_report", +"get_absolute_url", +"get_url_to_form", +"get_url_to_list", +"get_url_to_report", +"get_url_to_report_with_filters", +"evaluate_filters", +"compare", +"get_filter", +"make_filter_tuple", +"make_filter_dict", +"sanitize_column", +"scrub_urls", +"expand_relative_urls", +"quoted", +"quote_urls", +"unique", +"strip", +"to_markdown", +"md_to_html", +"is_subset", +"generate_hash" +) \ No newline at end of file From dffc0ca5b7fc230fbb9925efbc0e85838b036007 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 4 Sep 2020 13:15:12 +0530 Subject: [PATCH 098/142] fix(minor): Use get_safe_globals --- .../doctype/data_migration_mapping/data_migration_mapping.py | 2 +- frappe/email/doctype/notification/notification.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py b/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py index 097652fb88..1cc54a0d1a 100644 --- a/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py +++ b/frappe/data_migration/doctype/data_migration_mapping/data_migration_mapping.py @@ -64,7 +64,7 @@ def get_value_from_fieldname(field_map, fieldname_field, doc): field_name = get_source_value(field_map, fieldname_field) if field_name.startswith('eval:'): - value = frappe.safe_eval(field_name[5:], dict(frappe=frappe)) + value = frappe.safe_eval(field_name[5:], get_safe_globals()) elif field_name[0] in ('"', "'"): value = field_name[1:-1] else: diff --git a/frappe/email/doctype/notification/notification.py b/frappe/email/doctype/notification/notification.py index cd5aacabbd..5355d56b35 100644 --- a/frappe/email/doctype/notification/notification.py +++ b/frappe/email/doctype/notification/notification.py @@ -10,6 +10,7 @@ from frappe.model.document import Document from frappe.core.doctype.role.role import get_info_based_on_role, get_user_info from frappe.utils import validate_email_address, nowdate, parse_val, is_html, add_to_date from frappe.utils.jinja import validate_template +from frappe.utils.safe_exec import get_safe_globals from frappe.modules.utils import export_module_json, get_doc_module from six import string_types from frappe.integrations.doctype.slack_webhook_url.slack_webhook_url import send_slack_message @@ -415,7 +416,7 @@ def evaluate_alert(doc, alert, event): frappe.utils.get_link_to_form('Error Log', error_log.name))) def get_context(doc): - return {"doc": doc, "nowdate": nowdate, "frappe": frappe._dict(utils=frappe.utils)} + return {"doc": doc, "nowdate": nowdate, "frappe": frappe._dict(utils=get_safe_globals().get("frappe").get("utils"))} def get_assignees(doc): assignees = [] From 0109bde0657f74c784c044e505f6109ac75bb512 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 4 Sep 2020 15:52:13 +0530 Subject: [PATCH 099/142] feat: add razorpay dependency --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index af3104cce7..3c0a984f7b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -71,4 +71,5 @@ zxcvbn-python==4.4.24 pycryptodome==3.9.8 paytmchecksum==1.7.0 wrapt==1.10.11 -twilio==6.44.2 \ No newline at end of file +twilio==6.44.2 +razorpay=1.2.0 \ No newline at end of file From cd39bbc33813ad01906f91118377795c12ef6d01 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Fri, 4 Sep 2020 15:52:21 +0530 Subject: [PATCH 100/142] feat: add init client API --- .../doctype/razorpay_settings/razorpay_settings.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py index 1d2f7f9495..5e7e75c745 100644 --- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py +++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py @@ -65,6 +65,7 @@ import frappe from frappe import _ import json import hmac +import razorpay import hashlib from six.moves.urllib.parse import urlencode from frappe.model.document import Document @@ -75,6 +76,11 @@ from frappe.integrations.utils import (make_get_request, make_post_request, crea class RazorpaySettings(Document): supported_currencies = ["INR"] + def init_client(self): + if self.api_key: + self.secret = self.get_password(fieldname="api_secret", raise_exception=False) + self.client = razorpay.Client(auth=(self.api_key, self.secret)) + def validate(self): create_payment_gateway('Razorpay') call_hook_method('payment_gateway_enabled', gateway='Razorpay') From 3349c9f9426b9ad6f346abea28b894baa1c78cf9 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Fri, 4 Sep 2020 16:28:50 +0530 Subject: [PATCH 101/142] fix(minor): Prevent path traversal --- frappe/utils/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/data.py b/frappe/utils/data.py index 8a25c84276..e9593ff89e 100644 --- a/frappe/utils/data.py +++ b/frappe/utils/data.py @@ -738,7 +738,7 @@ def get_thumbnail_base64_for_image(src): if not src: frappe.throw('Invalid source for image: {0}'.format(src)) - if not src.startswith('/files'): + if not src.startswith('/files') or '..' in src: return def _get_base64(): From d94a1313f068b48a1f76759822aa07400cff572d Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 5 Sep 2020 13:14:12 +0530 Subject: [PATCH 102/142] fix: catch exception while setting In-Reply-To in email header --- frappe/email/email_body.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index d545190c47..6d0c6f8f33 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -207,7 +207,11 @@ class EMail: def set_in_reply_to(self, in_reply_to): """Used to send the Message-Id of a received email back as In-Reply-To""" - self.msg_root["In-Reply-To"] = in_reply_to + try: + self.msg_root["In-Reply-To"] = in_reply_to + except ValueError: + # in_reply_to may contain line feed characters, so ignore in that case + pass def make(self): """build into msg_root""" From e48ed816c3b2802b389c231f1fb8d902f22048e8 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Sun, 6 Sep 2020 16:35:28 +0530 Subject: [PATCH 103/142] fix(Event Streaming): remove in_test flag from Event Consumer --- .../doctype/event_consumer/event_consumer.json | 13 ++----------- .../doctype/event_consumer/event_consumer.py | 7 ++++--- .../doctype/event_producer/event_producer.py | 5 +---- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.json b/frappe/event_streaming/doctype/event_consumer/event_consumer.json index d863677e03..85970dc277 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.json +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.json @@ -13,8 +13,7 @@ "api_secret", "column_break_6", "user", - "incoming_change", - "in_test" + "incoming_change" ], "fields": [ { @@ -60,14 +59,6 @@ "label": "Incoming Change", "read_only": 1 }, - { - "default": "0", - "fieldname": "in_test", - "fieldtype": "Check", - "hidden": 1, - "label": "In Test", - "read_only": 1 - }, { "fieldname": "consumer_doctypes", "fieldtype": "Table", @@ -78,7 +69,7 @@ ], "in_create": 1, "links": [], - "modified": "2019-12-30 11:52:16.276047", + "modified": "2020-09-06 15:42:00.746493", "modified_by": "Administrator", "module": "Event Streaming", "name": "Event Consumer", diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index a53d046be5..2e10c71d0d 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe import json import requests +import os from frappe.model.document import Document from frappe.frappeclient import FrappeClient from frappe.utils.data import get_url @@ -14,10 +15,11 @@ from frappe.utils.background_jobs import get_jobs class EventConsumer(Document): def validate(self): - if self.in_test: + # approve subscribed doctypes for tests + # frappe.flags.in_test won't work here as tests are running on the consumer site + if os.environ.get('CI'): for entry in self.consumer_doctypes: entry.status = 'Approved' - self.in_test = False def on_update(self): if not self.incoming_change: @@ -80,7 +82,6 @@ def register_consumer(data): api_secret = frappe.generate_hash(length=10) consumer.api_key = api_key consumer.api_secret = api_secret - consumer.in_test = data['in_test'] consumer.insert(ignore_permissions=True) frappe.db.commit() diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.py b/frappe/event_streaming/doctype/event_producer/event_producer.py index 73aea114ab..555b71f851 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/event_producer.py @@ -75,8 +75,7 @@ class EventProducer(Document): return { 'event_consumer': get_url(), 'consumer_doctypes': json.dumps(consumer_doctypes), - 'user': self.user, - 'in_test': frappe.flags.in_test + 'user': self.user } def create_custom_fields(self): @@ -110,8 +109,6 @@ class EventProducer(Document): 'status': get_approval_status(config, ref_doctype), 'unsubscribed': entry.unsubscribe }) - if frappe.flags.in_test: - event_consumer.in_test = True event_consumer.user = self.user event_consumer.incoming_change = True producer_site.update(event_consumer) From 3f5a50d677e7a3bc3a58e32377956689904e1a00 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Sun, 6 Sep 2020 18:37:22 +0530 Subject: [PATCH 104/142] fix: Restrict ui test helper method to dev server mode --- frappe/__init__.py | 1 + frappe/tests/ui_test_helpers.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/frappe/__init__.py b/frappe/__init__.py index 36a8b48ecd..46792e82a8 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -182,6 +182,7 @@ def init(site, sites_path=None, new_site=False): local.meta_cache = {} local.form_dict = _dict() local.session = _dict() + local.dev_server = os.environ.get('DEV_SERVER', False) setup_module_map() diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index 40ebc8ea6e..ef572c6971 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -9,6 +9,9 @@ def create_if_not_exists(doc): :param doc: dict of field value pairs. can be a list of dict for multiple records. ''' + if not frappe.local.dev_server: + frappe.throw('This method can only be accessed in development', frappe.PermissionError) + doc = frappe.parse_json(doc) if not isinstance(doc, list): From 4f5acf3d9b31609d60e12e0220790ff07f7b29e9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 7 Sep 2020 09:21:07 +0530 Subject: [PATCH 105/142] chore(deps): [security] bump js-yaml from 3.12.2 to 3.14.0 (#11413) Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.2 to 3.14.0. **This update includes security fixes.** - [Release notes](https://github.com/nodeca/js-yaml/releases) - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](https://github.com/nodeca/js-yaml/compare/3.12.2...3.14.0) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- yarn.lock | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index e5c975c357..23bfe25255 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3965,7 +3965,7 @@ js-tokens@^4.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.10.0: +js-yaml@^3.10.0, js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.9.0: version "3.14.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" integrity sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A== @@ -3973,22 +3973,6 @@ js-yaml@^3.10.0: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@^3.12.0, js-yaml@^3.9.0: - version "3.12.2" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc" - integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - jsbarcode@^3.9.0: version "3.11.0" resolved "https://registry.yarnpkg.com/jsbarcode/-/jsbarcode-3.11.0.tgz#20623e008b101ef45d0cce9c8022cdf49be28547" From 59a74c0634440d3ad13305b62825891e436bd698 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 7 Sep 2020 10:08:27 +0530 Subject: [PATCH 106/142] fix: minor typo in requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3c0a984f7b..67952d54b8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -72,4 +72,4 @@ pycryptodome==3.9.8 paytmchecksum==1.7.0 wrapt==1.10.11 twilio==6.44.2 -razorpay=1.2.0 \ No newline at end of file +razorpay==1.2.0 From a24104da539d804109feb825b370c098caf5ee32 Mon Sep 17 00:00:00 2001 From: Glen Whitney Date: Sun, 6 Sep 2020 21:54:30 -0700 Subject: [PATCH 107/142] feat(treeview): Display multiple roots automatically in tree view (#10967) Co-authored-by: Prssanna Desai --- frappe/desk/treeview.py | 5 ++-- frappe/public/js/frappe/ui/tree.js | 30 +++++++++++++---------- frappe/public/js/frappe/views/treeview.js | 17 +++++++++++-- 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/frappe/desk/treeview.py b/frappe/desk/treeview.py index 2944f20a37..811143be03 100644 --- a/frappe/desk/treeview.py +++ b/frappe/desk/treeview.py @@ -6,12 +6,11 @@ import frappe from frappe import _ @frappe.whitelist() -def get_all_nodes(doctype, parent, tree_method, **filters): +def get_all_nodes(doctype, label, parent, tree_method, **filters): '''Recursively gets all data from tree nodes''' if 'cmd' in filters: del filters['cmd'] - filters.pop('data', None) tree_method = frappe.get_attr(tree_method) @@ -20,7 +19,7 @@ def get_all_nodes(doctype, parent, tree_method, **filters): frappe.throw(_("Not Permitted"), frappe.PermissionError) data = tree_method(doctype, parent, **filters) - out = [dict(parent=parent, data=data)] + out = [dict(parent=label, data=data)] if 'is_root' in filters: del filters['is_root'] diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js index a6287ed2c8..d50d78a7e5 100644 --- a/frappe/public/js/frappe/ui/tree.js +++ b/frappe/public/js/frappe/ui/tree.js @@ -5,17 +5,20 @@ frappe.provide('frappe.ui'); frappe.ui.Tree = class { constructor({ - parent, label, icon_set, toolbar, expandable, with_skeleton=1, // eslint-disable-line + parent, label, root_value, icon_set, toolbar, expandable, with_skeleton=1, // eslint-disable-line args, method, get_label, on_render, on_click // eslint-disable-line }) { $.extend(this, arguments[0]); + if (root_value == null) { + this.root_value = label; + } this.setup_treenode_class(); this.nodes = {}; this.wrapper = $('
').appendTo(this.parent); - if(with_skeleton) this.wrapper.addClass('with-skeleton'); + if (with_skeleton) this.wrapper.addClass('with-skeleton'); - if(!icon_set) { + if (!icon_set) { this.icon_set = { open: 'fa fa-fw fa-folder-open', closed: 'fa fa-fw fa-folder', @@ -42,8 +45,9 @@ frappe.ui.Tree = class { }); } - get_all_nodes(value, is_root) { + get_all_nodes(value, is_root, label) { var args = Object.assign({}, this.args); + args.label = label || value; args.parent = value; args.is_root = is_root; @@ -88,7 +92,7 @@ frappe.ui.Tree = class { expandable: true, is_root: true, data: { - value: this.label + value: this.root_value } }); this.expand_node(this.root_node, false); @@ -144,25 +148,25 @@ frappe.ui.Tree = class { } load_children(node, deep=false) { - let value = node.data.value, is_root = node.is_root; + let lab = node.label, value = node.data.value, is_root = node.is_root; if(!deep) { frappe.run_serially([ - () => {return this.get_nodes(value, is_root);}, - (data_set) => { this.render_node_children(node, data_set); }, - () => { this.set_selected_node(node); } + () => this.get_nodes(value, is_root), + (data_set) => this.render_node_children(node, data_set), + () => this.set_selected_node(node) ]); } else { frappe.run_serially([ - () => {return this.get_all_nodes(value, is_root);}, - (data_list) => { this.render_children_of_all_nodes(data_list); }, - () => { this.set_selected_node(node); } + () => this.get_all_nodes(value, is_root, lab), + (data_list) => this.render_children_of_all_nodes(data_list), + () => this.set_selected_node(node) ]); } } render_children_of_all_nodes(data_list) { - data_list.map(d => { this.render_node_children(this.nodes[d.parent], d.data); }); + data_list.map(d => this.render_node_children(this.nodes[d.parent], d.data)); } render_node_children(node, data_set) { diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index 815e561f41..777ce14da6 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -39,6 +39,7 @@ frappe.views.TreeView = Class.extend({ this.get_permissions(); this.make_page(); this.make_filters(); + this.root_value = null; if (me.opts.get_tree_root) { this.get_root(); @@ -129,7 +130,13 @@ frappe.views.TreeView = Class.extend({ args: me.args, callback: function(r) { if (r.message) { - me.root_label = r.message[0]["value"]; + if (r.message.length > 1) { + me.root_label = me.doctype; + me.root_value = ""; + } else { + me.root_label = r.message[0]["value"]; + me.root_value = me.root_label; + } me.make_tree(); } } @@ -138,9 +145,15 @@ frappe.views.TreeView = Class.extend({ make_tree: function() { $(this.parent).find(".tree").remove(); + var use_label = this.args[this.opts.root_label] || this.root_label || this.opts.root_label; + var use_value = this.root_value; + if (use_value == null) { + use_value = use_label; + } this.tree = new frappe.ui.Tree({ parent: this.body, - label: this.args[this.opts.root_label] || this.root_label || this.opts.root_label, + label: use_label, + root_value: use_value, expandable: true, args: this.args, From 8413f920de8b14db26f79de5364cce16e9674af2 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 7 Sep 2020 11:10:46 +0530 Subject: [PATCH 108/142] fix: Permission check on adding custom columns in query reports --- frappe/desk/query_report.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index a1cfd02132..411c3759cf 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -462,6 +462,9 @@ def add_total_row(result, columns, meta = None): @frappe.whitelist() def get_data_for_custom_field(doctype, field): + if not frappe.has_permission(doctype, "read"): + frappe.throw(_("Not permitted"), frappe.PermissionError) + value_map = frappe._dict(frappe.get_all(doctype, fields=["name", field], as_list=1)) From a8e7ffd7672a392dd22051c080fd7e7080cf349f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Mon, 7 Sep 2020 11:36:31 +0530 Subject: [PATCH 109/142] refactor: don't attach secret to self (#11428) --- .../doctype/razorpay_settings/razorpay_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py index 5e7e75c745..af7686c9b0 100644 --- a/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py +++ b/frappe/integrations/doctype/razorpay_settings/razorpay_settings.py @@ -78,8 +78,8 @@ class RazorpaySettings(Document): def init_client(self): if self.api_key: - self.secret = self.get_password(fieldname="api_secret", raise_exception=False) - self.client = razorpay.Client(auth=(self.api_key, self.secret)) + secret = self.get_password(fieldname="api_secret", raise_exception=False) + self.client = razorpay.Client(auth=(self.api_key, secret)) def validate(self): create_payment_gateway('Razorpay') From 22701346762a583b5c5ccd3b01fb714111deb2c4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 7 Sep 2020 12:47:56 +0530 Subject: [PATCH 110/142] fix(Newsletter): default content type while getting message --- frappe/email/doctype/newsletter/newsletter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py index 0a0a13a6ce..a4d60706eb 100755 --- a/frappe/email/doctype/newsletter/newsletter.py +++ b/frappe/email/doctype/newsletter/newsletter.py @@ -85,12 +85,12 @@ class Newsletter(WebsiteGenerator): self.db_set("scheduled_to_send", len(self.recipients)) def get_message(self): - + return { 'Rich Text': self.message, 'Markdown': markdown(self.message_md), 'HTML': self.message_html - }[self.content_type] + }[self.content_type or 'Rich Text'] def get_recipients(self): """Get recipients from Email Group""" From 99bd9fc3cfe3bc2f92b511c2d982e59d3dd29685 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 7 Sep 2020 13:17:24 +0530 Subject: [PATCH 111/142] fix: Not permitted in title case --- frappe/desk/query_report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 411c3759cf..08ef7ae485 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -463,7 +463,7 @@ def add_total_row(result, columns, meta = None): def get_data_for_custom_field(doctype, field): if not frappe.has_permission(doctype, "read"): - frappe.throw(_("Not permitted"), frappe.PermissionError) + frappe.throw(_("Not Permitted"), frappe.PermissionError) value_map = frappe._dict(frappe.get_all(doctype, fields=["name", field], From baa9afc9454bb432d715ca50e3ad3e283ad21d79 Mon Sep 17 00:00:00 2001 From: prssanna Date: Mon, 7 Sep 2020 16:20:28 +0530 Subject: [PATCH 112/142] fix(Email): replace newline characters in In-Reply-To in email header (cherry picked from commit 3f2827bf03ecf57c20e9583bd40c43faccde16b8) --- frappe/email/email_body.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 6d0c6f8f33..001ba59e95 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -207,11 +207,7 @@ class EMail: def set_in_reply_to(self, in_reply_to): """Used to send the Message-Id of a received email back as In-Reply-To""" - try: - self.msg_root["In-Reply-To"] = in_reply_to - except ValueError: - # in_reply_to may contain line feed characters, so ignore in that case - pass + self.msg_root["In-Reply-To"] = in_reply_to.replace("\r", "").replace("\n", "") def make(self): """build into msg_root""" From 426a9464080bdcfda7001a2f4f6fa3ec11cb6a85 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 7 Sep 2020 16:58:20 +0530 Subject: [PATCH 113/142] fix(minor): file name cannot contain separator (#11426) --- frappe/core/doctype/file/file.py | 3 +++ frappe/model/document.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 316915e43a..a54df756dd 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -359,6 +359,9 @@ class File(Document): """write file to disk with a random name (to compare)""" file_path = get_files_path(is_private=self.is_private) + if os.path.sep in self.file_name: + frappe.throw(_('File name cannot have {0}').format(os.path.sep)) + # create directory (if not exists) frappe.create_folder(file_path) # write the file diff --git a/frappe/model/document.py b/frappe/model/document.py index 2b171547d1..53fcd99f78 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -905,9 +905,9 @@ class Document(BaseDocument): """Cancel the document. Sets `docstatus` = 2, then saves.""" self._cancel() - def delete(self): + def delete(self, ignore_permissions=False): """Delete document.""" - frappe.delete_doc(self.doctype, self.name, flags=self.flags) + frappe.delete_doc(self.doctype, self.name, ignore_permissions = ignore_permissions, flags=self.flags) def run_before_save_methods(self): """Run standard methods before `INSERT` or `UPDATE`. Standard Methods are: From cb23da1ed96fff4b262881f7f3a676540643e34b Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 7 Sep 2020 18:34:42 +0530 Subject: [PATCH 114/142] chore(query-builder): Remove unused code --- frappe/desk/query_builder.py | 263 ----------------------------------- 1 file changed, 263 deletions(-) delete mode 100644 frappe/desk/query_builder.py diff --git a/frappe/desk/query_builder.py b/frappe/desk/query_builder.py deleted file mode 100644 index 81eba35e05..0000000000 --- a/frappe/desk/query_builder.py +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -from __future__ import unicode_literals -import frappe - -out = frappe.response - -from frappe.utils import cint -import frappe.defaults -from six import text_type - -def get_sql_tables(q): - if q.find('WHERE') != -1: - tl = q.split('FROM')[1].split('WHERE')[0].split(',') - elif q.find('GROUP BY') != -1: - tl = q.split('FROM')[1].split('GROUP BY')[0].split(',') - else: - tl = q.split('FROM')[1].split('ORDER BY')[0].split(',') - return [t.strip().strip('`')[3:] for t in tl] - -def get_parent_dt(dt): - pdt = '' - if frappe.db.sql('select name from `tabDocType` where istable=1 and name=%s', dt): - import frappe.model.meta - return frappe.model.meta.get_parent_dt(dt) - return pdt - -def get_sql_meta(tl): - std_columns = { - 'owner':('Owner', '', '', '100'), - 'creation':('Created on', 'Date', '', '100'), - 'modified':('Last modified on', 'Date', '', '100'), - 'modified_by':('Modified By', '', '', '100') - } - - meta = {} - - for dt in tl: - meta[dt] = std_columns.copy() - - # for table doctype, the ID is the parent id - pdt = get_parent_dt(dt) - if pdt: - meta[dt]['parent'] = ('ID', 'Link', pdt, '200') - - # get the field properties from DocField - res = frappe.db.sql("select fieldname, label, fieldtype, options, width \ - from tabDocField where parent=%s", dt) - for r in res: - if r[0]: - meta[dt][r[0]] = (r[1], r[2], r[3], r[4]); - - # name - meta[dt]['name'] = ('ID', 'Link', dt, '200') - - return meta - -def add_match_conditions(q, tl): - from frappe.desk.reportview import build_match_conditions - sl = [] - for dt in tl: - s = build_match_conditions(dt) - if s: - sl.append(s) - - # insert the conditions - if sl: - condition_st = q.find('WHERE')!=-1 and ' AND ' or ' WHERE ' - condition_end = q.find('ORDER BY')!=-1 and 'ORDER BY' or 'LIMIT' - condition_end = q.find('GROUP BY')!=-1 and 'GROUP BY' or condition_end - - if q.find('ORDER BY')!=-1 or q.find('LIMIT')!=-1 or q.find('GROUP BY')!=-1: # if query continues beyond conditions - q = q.split(condition_end) - q = q[0] + condition_st + '(' + ' OR '.join(sl) + ') ' + condition_end + q[1] - else: - q = q + condition_st + '(' + ' OR '.join(sl) + ')' - - return q - -def guess_type(m): - """ - Returns fieldtype depending on the MySQLdb Description - """ - if frappe.db.is_type_number(m): - return 'Currency' - elif m in frappe.is_type_datetime(m): - return 'Date' - else: - return 'Data' - -def build_description_simple(): - colnames, coltypes, coloptions, colwidths = [], [], [], [] - - for m in frappe.db.get_description(): - colnames.append(m[0]) - coltypes.append(guess_type[m[1]]) - coloptions.append('') - colwidths.append('100') - - return colnames, coltypes, coloptions, colwidths - -def build_description_standard(meta, tl): - - desc = frappe.db.get_description() - - colnames, coltypes, coloptions, colwidths = [], [], [], [] - - # merged metadata - used if we are unable to - # get both the table name and field name from - # the description - in case of joins - merged_meta = {} - for d in meta: - merged_meta.update(meta[d]) - - for f in desc: - fn, dt = f[0], '' - if '.' in fn: - dt, fn = fn.split('.') - - if (not dt) and merged_meta.get(fn): - # no "AS" given, find type from merged description - - desc = merged_meta[fn] - colnames.append(desc[0] or fn) - coltypes.append(desc[1] or '') - coloptions.append(desc[2] or '') - colwidths.append(desc[3] or '100') - - elif fn in meta.get(dt,{}): - # type specified for a multi-table join - # usually from Report Builder - - desc = meta[dt][fn] - colnames.append(desc[0] or fn) - coltypes.append(desc[1] or '') - coloptions.append(desc[2] or '') - colwidths.append(desc[3] or '100') - - else: - # nothing found - # guess - colnames.append(fn) - coltypes.append(guess_type(f[1])) - coloptions.append('') - colwidths.append('100') - - return colnames, coltypes, coloptions, colwidths - -@frappe.whitelist() -def runquery(q='', ret=0, from_export=0): - import frappe.utils - - formatted = cint(frappe.form_dict.get('formatted')) - - # CASE A: Simple Query - # -------------------- - if frappe.form_dict.get('simple_query') or frappe.form_dict.get('is_simple'): - if not q: q = frappe.form_dict.get('simple_query') or frappe.form_dict.get('query') - if q.split()[0].lower() != 'select': - raise Exception('Query must be a SELECT') - - as_dict = cint(frappe.form_dict.get('as_dict')) - res = frappe.db.sql(q, as_dict = as_dict, as_list = not as_dict, formatted=formatted) - - # build colnames etc from metadata - colnames, coltypes, coloptions, colwidths = [], [], [], [] - - # CASE B: Standard Query - # ----------------------- - else: - if not q: q = frappe.form_dict.get('query') - - tl = get_sql_tables(q) - meta = get_sql_meta(tl) - - q = add_match_conditions(q, tl) - - # replace special variables - q = q.replace('__user', frappe.session.user) - q = q.replace('__today', frappe.utils.nowdate()) - - res = frappe.db.sql(q, as_list=1, formatted=formatted) - - colnames, coltypes, coloptions, colwidths = build_description_standard(meta, tl) - - # run server script - # ----------------- - style, header_html, footer_html, page_template = '', '', '', '' - - out['colnames'] = colnames - out['coltypes'] = coltypes - out['coloptions'] = coloptions - out['colwidths'] = colwidths - out['header_html'] = header_html - out['footer_html'] = footer_html - out['page_template'] = page_template - - if style: - out['style'] = style - - # just the data - return - if ret==1: - return res - - out['values'] = res - - # return num of entries - qm = frappe.form_dict.get('query_max') or '' - if qm and qm.strip(): - if qm.split()[0].lower() != 'select': - raise Exception('Query (Max) must be a SELECT') - if not frappe.form_dict.get('simple_query'): - qm = add_match_conditions(qm, tl) - - out['n_values'] = frappe.utils.cint(frappe.db.sql(qm)[0][0]) - - -@frappe.whitelist() -def runquery_csv(): - global out - - q = frappe.form_dict.get('query') - - rep_name = frappe.form_dict.get('report_name') - if not frappe.form_dict.get('simple_query'): - - # Report Name - if not rep_name: - rep_name = get_sql_tables(q)[0] - - if not rep_name: rep_name = 'DataExport' - - rows = [[rep_name], out['colnames']] + out['values'] - - from six import StringIO - import csv - - f = StringIO() - writer = csv.writer(f) - for r in rows: - # encode only unicode type strings and not int, floats etc. - writer.writerow(map(lambda v: isinstance(v, text_type) and v.encode('utf-8') or v, r)) - - f.seek(0) - out['result'] = text_type(f.read(), 'utf-8') - out['type'] = 'csv' - out['doctype'] = rep_name - -def add_limit_to_query(query, args): - """ - Add limit condition to query - can be used by methods called in listing to add limit condition - """ - if args.get('limit_page_length'): - query += """ - limit %(limit_start)s, %(limit_page_length)s""" - - import frappe.utils - args['limit_start'] = frappe.utils.cint(args.get('limit_start')) - args['limit_page_length'] = frappe.utils.cint(args.get('limit_page_length')) - - return query, args From 555c52fc70e3f320603d782a95f4c840b474dc3f Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 7 Sep 2020 18:56:24 +0530 Subject: [PATCH 115/142] fix(db_query): Reject `user` argument in whitelisted methods --- frappe/desk/reportview.py | 1 + frappe/model/db_query.py | 1 + 2 files changed, 2 insertions(+) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 6102be61ce..d4fc8833ae 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -36,6 +36,7 @@ def get_form_params(): data.pop('data', None) data.pop('ignore_permissions', None) data.pop('view', None) + data.pop('user', None) if "csrf_token" in data: del data["csrf_token"] diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index ac87b1d907..bea37f1ef1 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -769,6 +769,7 @@ def get_list(doctype, *args, **kwargs): kwargs.pop('ignore_permissions', None) kwargs.pop('data', None) kwargs.pop('strict', None) + kwargs.pop('user', None) # If doctype is child table if frappe.is_table(doctype): From 6ad3156233f9bc585995daa55eda4d5f0a4b1bef Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 7 Sep 2020 19:30:15 +0530 Subject: [PATCH 116/142] fix(package): Only allow System Managers to import a package --- .../custom/doctype/package_publish_tool/package_publish_tool.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py index a01dd0ba47..b73f93a628 100644 --- a/frappe/custom/doctype/package_publish_tool/package_publish_tool.py +++ b/frappe/custom/doctype/package_publish_tool/package_publish_tool.py @@ -100,6 +100,7 @@ def export_package(): @frappe.whitelist() def import_package(package=None): """Import package from JSON.""" + frappe.only_for("System Manager") if isinstance(package, string_types): package = json.loads(package) From 2050c2b9b31f2684bb4fa89189075801de9c90ac Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Mon, 7 Sep 2020 19:53:41 +0530 Subject: [PATCH 117/142] fix(auto-repeat): Add permission check for rendering message preview --- frappe/automation/doctype/auto_repeat/auto_repeat.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py index c09e347e71..a9a358ce5f 100644 --- a/frappe/automation/doctype/auto_repeat/auto_repeat.py +++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py @@ -403,6 +403,7 @@ def update_reference(docname, reference): @frappe.whitelist() def generate_message_preview(reference_dt, reference_doc, message=None, subject=None): + frappe.has_permission("Auto Repeat", "write", throw=True) doc = frappe.get_doc(reference_dt, reference_doc) subject_preview = _("Please add a subject to your email") msg_preview = frappe.render_template(message, {'doc': doc}) From 8261eded1966002e44c513834871ca14821a9f39 Mon Sep 17 00:00:00 2001 From: Anupam K Date: Mon, 7 Sep 2020 18:51:24 +0530 Subject: [PATCH 118/142] fix: Report Include Indentation UI --- .../js/frappe/views/reports/query_report.js | 15 ++++++++++----- 1 file changed, 10 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 706cde13b7..5cfd54ee1e 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1257,7 +1257,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { return; } - this.export_dialog = frappe.prompt([ + let export_dialog_fields = [ { label: __('Select File Format'), fieldname: 'file_format', @@ -1265,13 +1265,18 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { options: ['Excel', 'CSV'], default: 'Excel', reqd: 1 - }, - { + } + ]; + + if (this.tree_report) { + export_dialog_fields.push({ label: __("Include indentation"), fieldname: "include_indentation", fieldtype: "Check", - } - ], ({ file_format, include_indentation }) => { + }); + } + + this.export_dialog = frappe.prompt(export_dialog_fields, ({ file_format, include_indentation }) => { this.make_access_log('Export', file_format); if (file_format === 'CSV') { const column_row = this.columns.reduce((acc, col) => { From dba454f94136c9480db3bb32081fb4b1b2df47fe Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 8 Sep 2020 10:37:25 +0530 Subject: [PATCH 119/142] fix(security): Remove ignore_permissions flag from API request --- frappe/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/__init__.py b/frappe/__init__.py index 46792e82a8..7d3d34428e 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1110,6 +1110,7 @@ def get_newargs(fn, kwargs): if (a in fnargs) or varkw: newargs[a] = kwargs.get(a) + newargs.pop('ignore_permissions', None) if "flags" in newargs: del newargs["flags"] From 9e43e887555d90f73b539cab4085f409a3691636 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 8 Sep 2020 10:38:26 +0530 Subject: [PATCH 120/142] fix: Remove unnecessary whitelisting of rename_doc method --- frappe/model/rename_doc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 1e3f127b99..7a2129e76e 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -25,7 +25,6 @@ def update_document_title(doctype, docname, title_field=None, old_title=None, ne return docname -@frappe.whitelist() def rename_doc(doctype, old, new, force=False, merge=False, ignore_permissions=False, ignore_if_exists=False, show_alert=True): """ Renames a doc(dt, old) to doc(dt, new) and From 0449ba0b6d25bf87c3821ad853dccd322cac2740 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 8 Sep 2020 10:58:03 +0530 Subject: [PATCH 121/142] refactor: Use .pop instead of del --- frappe/__init__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 7d3d34428e..4b60181bd1 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1110,9 +1110,8 @@ def get_newargs(fn, kwargs): if (a in fnargs) or varkw: newargs[a] = kwargs.get(a) - newargs.pop('ignore_permissions', None) - if "flags" in newargs: - del newargs["flags"] + newargs.pop("ignore_permissions", None) + newargs.pop("flags", None) return newargs From 864e8441eb588add6e6d341b452f3508ce0ed19e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 8 Sep 2020 11:53:58 +0530 Subject: [PATCH 122/142] fix: condition Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/website/doctype/blog_post/blog_post.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/blog_post.js b/frappe/website/doctype/blog_post/blog_post.js index 1c602cd5e1..97916b6fc6 100644 --- a/frappe/website/doctype/blog_post/blog_post.js +++ b/frappe/website/doctype/blog_post/blog_post.js @@ -33,7 +33,7 @@ frappe.ui.form.on('Blog Post', { }); function generate_google_search_preview(frm) { - if (!(frm.doc.meta_title && frm.doc.title)) return; + if (!(frm.doc.meta_title || frm.doc.title)) return; let google_preview = frm.get_field("google_preview"); let seo_title = (frm.doc.meta_title || frm.doc.title).slice(0, 60); let seo_description = (frm.doc.meta_description || frm.doc.blog_intro || "").slice(0, 160); From 936af9916a4ab442f344fb860aa6da8e81b30115 Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 8 Sep 2020 12:28:20 +0530 Subject: [PATCH 123/142] fix(Activity Log): Update modified details ref: https://github.com/frappe/frappe/pull/11373 --- frappe/core/doctype/activity_log/activity_log.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/activity_log/activity_log.json b/frappe/core/doctype/activity_log/activity_log.json index 0d85855504..a1ee4dafdb 100644 --- a/frappe/core/doctype/activity_log/activity_log.json +++ b/frappe/core/doctype/activity_log/activity_log.json @@ -155,7 +155,7 @@ "index_web_pages_for_search": 1, "links": [], "modified": "2020-08-28 11:43:57.504565", - "modified_by": "gavin18d@gmail.com", + "modified_by": "Administrator", "module": "Core", "name": "Activity Log", "owner": "Administrator", @@ -184,4 +184,4 @@ "title_field": "subject", "track_changes": 1, "track_seen": 1 -} \ No newline at end of file +} From 770730489036e13033a76add4edf60b709197363 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 8 Sep 2020 17:08:57 +0530 Subject: [PATCH 124/142] fix: Handle None value --- frappe/core/doctype/file/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py index 316915e43a..aa7584d7d3 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -938,7 +938,7 @@ def attach_files_to_document(doc, event): # we dont want the update to fail if file cannot be attached for some reason try: value = doc.get(df.fieldname) - if not value.startswith(("/files", "/private/files")): + if not (value or '').startswith(("/files", "/private/files")): return if frappe.db.exists("File", { From d7ea913605b0d14d493d467012848d88b6a67e80 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 8 Sep 2020 19:01:08 +0530 Subject: [PATCH 125/142] fix: event streaming fixes --- .../event_consumer/event_consumer.json | 8 +++-- .../doctype/event_consumer/event_consumer.py | 26 ++++++++------ .../event_producer/event_producer.json | 11 +++--- .../doctype/event_producer/event_producer.py | 36 ++++++++++++++----- .../event_producer/test_event_producer.py | 30 +++++++++++++--- 5 files changed, 80 insertions(+), 31 deletions(-) diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.json b/frappe/event_streaming/doctype/event_consumer/event_consumer.json index 85970dc277..42b47ce949 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.json +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.json @@ -21,6 +21,7 @@ "fieldtype": "Data", "in_list_view": 1, "label": "Callback URL", + "read_only": 1, "reqd": 1, "unique": 1 }, @@ -28,19 +29,20 @@ "fieldname": "api_key", "fieldtype": "Data", "label": "API Key", - "read_only": 1 + "reqd": 1 }, { "fieldname": "api_secret", "fieldtype": "Password", "label": "API Secret", - "read_only": 1 + "reqd": 1 }, { "fieldname": "user", "fieldtype": "Link", "label": "Event Subscriber", "options": "User", + "read_only": 1, "reqd": 1 }, { @@ -69,7 +71,7 @@ ], "in_create": 1, "links": [], - "modified": "2020-09-06 15:42:00.746493", + "modified": "2020-09-08 16:42:39.828085", "modified_by": "Administrator", "module": "Event Streaming", "name": "Event Consumer", diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index 2e10c71d0d..122e11a3c5 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -7,6 +7,7 @@ import frappe import json import requests import os +from frappe import _ from frappe.model.document import Document from frappe.frappeclient import FrappeClient from frappe.utils.data import get_url @@ -58,17 +59,26 @@ class EventConsumer(Document): return 'offline' return 'online' - -@frappe.whitelist(allow_guest=True) +@frappe.whitelist() def register_consumer(data): """create an event consumer document for registering a consumer""" data = json.loads(data) # to ensure that consumer is created only once if frappe.db.exists('Event Consumer', data['event_consumer']): return None + + user = data['user'] + if not frappe.db.exists('User', user): + frappe.throw(_('User {0} not found on the producer site').format(user)) + + if not "System Manager" in frappe.get_roles(user): + frappe.throw(_("Event Subscriber has to be a System Manager.")) + consumer = frappe.new_doc('Event Consumer') consumer.callback_url = data['event_consumer'] consumer.user = data['user'] + consumer.api_key = data['api_key'] + consumer.api_secret = data['api_secret'] consumer.incoming_change = True consumer_doctypes = json.loads(data['consumer_doctypes']) @@ -78,18 +88,13 @@ def register_consumer(data): 'status': 'Pending' }) - api_key = frappe.generate_hash(length=10) - api_secret = frappe.generate_hash(length=10) - consumer.api_key = api_key - consumer.api_secret = api_secret - consumer.insert(ignore_permissions=True) - frappe.db.commit() + consumer.insert() # consumer's 'last_update' field should point to the latest update # in producer's update log when subscribing # so that, updates after subscribing are consumed and not the old ones. last_update = str(get_last_update()) - return json.dumps({'api_key': api_key, 'api_secret': api_secret, 'last_update': last_update}) + return json.dumps({'last_update': last_update}) def get_consumer_site(consumer_url): @@ -98,8 +103,7 @@ def get_consumer_site(consumer_url): consumer_site = FrappeClient( url=consumer_url, api_key=consumer_doc.api_key, - api_secret=consumer_doc.get_password('api_secret'), - frappe_authorization_source='Event Producer' + api_secret=consumer_doc.get_password('api_secret') ) return consumer_site diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.json b/frappe/event_streaming/doctype/event_producer/event_producer.json index 8eba1924f5..8fafdc3bb2 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.json +++ b/frappe/event_streaming/doctype/event_producer/event_producer.json @@ -32,23 +32,26 @@ "read_only": 1 }, { + "description": "API Key of the user(Event Subscriber) on the producer site", "fieldname": "api_key", "fieldtype": "Data", "label": "API Key", - "read_only": 1 + "reqd": 1 }, { + "description": "API Secret of the user(Event Subscriber) on the producer site", "fieldname": "api_secret", "fieldtype": "Password", "label": "API Secret", - "read_only": 1 + "reqd": 1 }, { "fieldname": "user", "fieldtype": "Link", "label": "Event Subscriber", "options": "User", - "reqd": 1 + "reqd": 1, + "set_only_once": 1 }, { "fieldname": "column_break_6", @@ -74,7 +77,7 @@ } ], "links": [], - "modified": "2019-12-26 13:04:11.438349", + "modified": "2020-09-08 18:50:57.687979", "modified_by": "Administrator", "module": "Event Streaming", "name": "Event Producer", diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.py b/frappe/event_streaming/doctype/event_producer/event_producer.py index 555b71f851..5fb2c22d89 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/event_producer.py @@ -12,7 +12,8 @@ from frappe import _ from frappe.model.document import Document from frappe.frappeclient import FrappeClient from frappe.utils.background_jobs import get_jobs -from frappe.utils.data import get_url +from frappe.utils.data import get_url, get_link_to_form +from frappe.utils.password import get_decrypted_password from frappe.custom.doctype.custom_field.custom_field import create_custom_field from frappe.integrations.oauth2 import validate_url @@ -25,14 +26,25 @@ class EventProducer(Document): self.create_custom_fields() def validate(self): + self.validate_event_subscriber() if frappe.flags.in_test: for entry in self.producer_doctypes: entry.status = 'Approved' + def validate_event_subscriber(self): + if not frappe.db.get_value('User', self.user, 'api_key'): + frappe.throw(_('Please generate keys for the Event Subscriber User {0} first.').format( + frappe.bold(get_link_to_form('User', self.user)) + )) + def on_update(self): if not self.incoming_change: - self.update_event_consumer() - self.create_custom_fields() + if frappe.db.exists('Event Producer', self.name): + if not self.api_key or not self.api_secret: + frappe.throw(_('Please set API Key and Secret on the producer and consumer sites first.')) + else: + self.update_event_consumer() + self.create_custom_fields() else: # when producer doc is updated it updates the consumer doc, set flag to avoid deadlock self.db_set('incoming_change', 0) @@ -50,15 +62,18 @@ class EventProducer(Document): def create_event_consumer(self): """register event consumer on the producer site""" if self.is_producer_online(): - producer_site = FrappeClient(self.producer_url, verify=False) + producer_site = FrappeClient( + url=self.producer_url, + api_key=self.api_key, + api_secret=self.get_password('api_secret') + ) + response = producer_site.post_api( 'frappe.event_streaming.doctype.event_consumer.event_consumer.register_consumer', params={'data': json.dumps(self.get_request_data())} ) if response: response = json.loads(response) - self.api_key = response['api_key'] - self.api_secret = response['api_secret'] self.last_update = response['last_update'] else: frappe.throw(_('Failed to create an Event Consumer or an Event Consumer for the current site is already registered.')) @@ -72,10 +87,14 @@ class EventProducer(Document): else: consumer_doctypes.append(entry.ref_doctype) + user_key = frappe.db.get_value('User', self.user, 'api_key') + user_secret = get_decrypted_password('User', self.user, 'api_secret') return { 'event_consumer': get_url(), 'consumer_doctypes': json.dumps(consumer_doctypes), - 'user': self.user + 'user': self.user, + 'api_key': user_key, + 'api_secret': user_secret } def create_custom_fields(self): @@ -131,8 +150,7 @@ def get_producer_site(producer_url): producer_site = FrappeClient( url=producer_url, api_key=producer_doc.api_key, - api_secret=producer_doc.get_password('api_secret'), - frappe_authorization_source='Event Consumer' + api_secret=producer_doc.get_password('api_secret') ) return producer_site diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index 4fea55eb39..7724830bc7 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -8,6 +8,7 @@ import unittest import json from frappe.frappeclient import FrappeClient from frappe.event_streaming.doctype.event_producer.event_producer import pull_from_node +from frappe.core.doctype.user.user import generate_keys producer_url = 'http://test_site_producer:8000' @@ -171,8 +172,7 @@ class TestEventProducer(unittest.TestCase): producer_site = FrappeClient( url=producer_doc.producer_url, api_key=producer_doc.api_key, - api_secret=producer_doc.get_password('api_secret'), - frappe_authorization_source='Event Consumer' + api_secret=producer_doc.get_password('api_secret') ) return producer_site @@ -291,6 +291,27 @@ def get_mapping(mapping_name, local, remote, field_map): def create_event_producer(producer_url): + generate_keys('Administrator') + frappe.db.commit() + + producer_site = FrappeClient( + url=producer_url, + username='Administrator', + password='admin' + ) + + response = producer_site.post_api( + 'frappe.core.doctype.user.user.generate_keys', + params={'user': 'Administrator'} + ) + + response = json.loads(response) + api_secret = response.api_secret + + response = producer_site.get_value('User', 'api_key', {'name': 'Administrator'}) + response = json.loads(response) + api_key = response.api_key + if frappe.db.exists('Event Producer', producer_url): event_producer = frappe.get_doc('Event Producer', producer_url) for entry in event_producer.producer_doctypes: @@ -310,6 +331,8 @@ def create_event_producer(producer_url): 'use_same_name': 1 }) event_producer.user = 'Administrator' + event_producer.api_key = api_key + event_producer.api_secret = api_secret event_producer.save() def reset_configuration(producer_url): @@ -332,8 +355,7 @@ def get_remote_site(): producer_site = FrappeClient( url=producer_doc.producer_url, api_key=producer_doc.api_key, - api_secret=producer_doc.get_password('api_secret'), - frappe_authorization_source='Event Consumer' + api_secret=producer_doc.get_password('api_secret') ) return producer_site From ed5f332bb9f6946d4ff7d558f08a4b3ecd835192 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 8 Sep 2020 19:29:46 +0530 Subject: [PATCH 126/142] fix: sider issue --- frappe/event_streaming/doctype/event_consumer/event_consumer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index 122e11a3c5..000126bbed 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -71,7 +71,7 @@ def register_consumer(data): if not frappe.db.exists('User', user): frappe.throw(_('User {0} not found on the producer site').format(user)) - if not "System Manager" in frappe.get_roles(user): + if "System Manager" not in frappe.get_roles(user): frappe.throw(_("Event Subscriber has to be a System Manager.")) consumer = frappe.new_doc('Event Consumer') From 3b5c4043781f6bd8fbfd9f5a281dc7a009af6310 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 8 Sep 2020 20:55:53 +0530 Subject: [PATCH 127/142] fix: tests --- .../event_producer/test_event_producer.py | 37 +++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index 7724830bc7..e20b6e53b3 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -167,15 +167,6 @@ class TestEventProducer(unittest.TestCase): def pull_producer_data(self): pull_from_node(producer_url) - def get_remote_site(self): - producer_doc = frappe.get_doc('Event Producer', producer_url) - producer_site = FrappeClient( - url=producer_doc.producer_url, - api_key=producer_doc.api_key, - api_secret=producer_doc.get_password('api_secret') - ) - return producer_site - def test_mapping(self): producer = get_remote_site() event_producer = frappe.get_doc('Event Producer', producer_url, for_update=True) @@ -291,13 +282,21 @@ def get_mapping(mapping_name, local, remote, field_map): def create_event_producer(producer_url): + if frappe.db.exists('Event Producer', producer_url): + event_producer = frappe.get_doc('Event Producer', producer_url) + for entry in event_producer.producer_doctypes: + entry.unsubscribe = 0 + event_producer.save() + return + generate_keys('Administrator') frappe.db.commit() producer_site = FrappeClient( url=producer_url, username='Administrator', - password='admin' + password='admin', + verify=False ) response = producer_site.post_api( @@ -305,19 +304,10 @@ def create_event_producer(producer_url): params={'user': 'Administrator'} ) - response = json.loads(response) - api_secret = response.api_secret + api_secret = response.get('api_secret') response = producer_site.get_value('User', 'api_key', {'name': 'Administrator'}) - response = json.loads(response) - api_key = response.api_key - - if frappe.db.exists('Event Producer', producer_url): - event_producer = frappe.get_doc('Event Producer', producer_url) - for entry in event_producer.producer_doctypes: - entry.unsubscribe = 0 - event_producer.save() - return + api_key = response.get('api_key') event_producer = frappe.new_doc('Event Producer') event_producer.producer_doctypes = [] @@ -354,8 +344,9 @@ def get_remote_site(): producer_doc = frappe.get_doc('Event Producer', producer_url) producer_site = FrappeClient( url=producer_doc.producer_url, - api_key=producer_doc.api_key, - api_secret=producer_doc.get_password('api_secret') + username='Administrator', + password='admin', + verify=False ) return producer_site From 220c4b734e4c0944b39e8bf88eb6e918a7c9dcf6 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Tue, 8 Sep 2020 22:56:18 +0530 Subject: [PATCH 128/142] fix: event subscriber validation --- frappe/event_streaming/doctype/event_producer/event_producer.py | 1 + .../doctype/event_producer/test_event_producer.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.py b/frappe/event_streaming/doctype/event_producer/event_producer.py index 5fb2c22d89..f69458731e 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/event_producer.py @@ -21,6 +21,7 @@ from frappe.integrations.oauth2 import validate_url class EventProducer(Document): def before_insert(self): self.check_url() + self.validate_event_subscriber() self.incoming_change = True self.create_event_consumer() self.create_custom_fields() diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index e20b6e53b3..d1fa76329f 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -290,7 +290,6 @@ def create_event_producer(producer_url): return generate_keys('Administrator') - frappe.db.commit() producer_site = FrappeClient( url=producer_url, From 21a299752bd9a0b12d71d53957b1b72e74682dd9 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 9 Sep 2020 00:02:25 +0530 Subject: [PATCH 129/142] fix: test --- .../event_producer/test_event_producer.py | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index d1fa76329f..3ac053117d 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe import unittest import json +import time from frappe.frappeclient import FrappeClient from frappe.event_streaming.doctype.event_producer.event_producer import pull_from_node from frappe.core.doctype.user.user import generate_keys @@ -291,12 +292,7 @@ def create_event_producer(producer_url): generate_keys('Administrator') - producer_site = FrappeClient( - url=producer_url, - username='Administrator', - password='admin', - verify=False - ) + producer_site = connect() response = producer_site.post_api( 'frappe.core.doctype.user.user.generate_keys', @@ -353,4 +349,18 @@ def unsubscribe_doctypes(producer_url): event_producer = frappe.get_doc('Event Producer', producer_url) for entry in event_producer.producer_doctypes: entry.unsubscribe = 1 - event_producer.save() \ No newline at end of file + event_producer.save() + +def connect(): + try: + producer_site = FrappeClient( + url=producer_url, + username='Administrator', + password='admin', + verify=False + ) + return producer_site + + except json.decoder.JSONDecodeError: + time.sleep(1) + connect() \ No newline at end of file From efdeab6dad292992755e9d6cedcb6535b2d93f1b Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 9 Sep 2020 00:43:50 +0530 Subject: [PATCH 130/142] fix: test --- .../doctype/event_producer/test_event_producer.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index 3ac053117d..843b343688 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -6,7 +6,6 @@ from __future__ import unicode_literals import frappe import unittest import json -import time from frappe.frappeclient import FrappeClient from frappe.event_streaming.doctype.event_producer.event_producer import pull_from_node from frappe.core.doctype.user.user import generate_keys @@ -359,8 +358,7 @@ def connect(): password='admin', verify=False ) - return producer_site - - except json.decoder.JSONDecodeError: - time.sleep(1) - connect() \ No newline at end of file + except Exception: + connect() + else: + return producer_site \ No newline at end of file From 8cffea5c8e599e21be65a2e70b043d8a8414b134 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 9 Sep 2020 01:13:06 +0530 Subject: [PATCH 131/142] fix: test --- .../doctype/event_producer/test_event_producer.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index 843b343688..313ccbc4d6 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -361,4 +361,7 @@ def connect(): except Exception: connect() else: - return producer_site \ No newline at end of file + if not producer_site: + connect() + else: + return producer_site \ No newline at end of file From 386b4847b4afcf53d8d788008a0298c57721755a Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 9 Sep 2020 09:36:20 +0530 Subject: [PATCH 132/142] chore: Attempt at fixing event-streaming tests --- .../doctype/event_producer/test_event_producer.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py index 313ccbc4d6..fa2461a9d8 100644 --- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py @@ -351,17 +351,14 @@ def unsubscribe_doctypes(producer_url): event_producer.save() def connect(): - try: - producer_site = FrappeClient( + def _connect(): + return FrappeClient( url=producer_url, username='Administrator', password='admin', verify=False ) + try: + return _connect() except Exception: - connect() - else: - if not producer_site: - connect() - else: - return producer_site \ No newline at end of file + return _connect() From f24d87726ae1bc797d51ca09b177cc72a84dddd0 Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Wed, 9 Sep 2020 11:10:47 +0530 Subject: [PATCH 133/142] fix: added patch for deleting old keys --- .../doctype/event_consumer/event_consumer.py | 4 ++++ .../doctype/event_producer/event_producer.py | 4 ++++ frappe/patches.txt | 1 + .../v13_0/delete_event_producer_and_consumer_keys.py | 11 +++++++++++ 4 files changed, 20 insertions(+) create mode 100644 frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py diff --git a/frappe/event_streaming/doctype/event_consumer/event_consumer.py b/frappe/event_streaming/doctype/event_consumer/event_consumer.py index 000126bbed..1505c3a05d 100644 --- a/frappe/event_streaming/doctype/event_consumer/event_consumer.py +++ b/frappe/event_streaming/doctype/event_consumer/event_consumer.py @@ -24,6 +24,10 @@ class EventConsumer(Document): def on_update(self): if not self.incoming_change: + doc_before_save = self.get_doc_before_save() + if doc_before_save.api_key != self.api_key or doc_before_save.api_secret != self.api_secret: + return + self.update_consumer_status() else: frappe.db.set_value(self.doctype, self.name, 'incoming_change', 0) diff --git a/frappe/event_streaming/doctype/event_producer/event_producer.py b/frappe/event_streaming/doctype/event_producer/event_producer.py index f69458731e..b0ec998ab9 100644 --- a/frappe/event_streaming/doctype/event_producer/event_producer.py +++ b/frappe/event_streaming/doctype/event_producer/event_producer.py @@ -44,6 +44,10 @@ class EventProducer(Document): if not self.api_key or not self.api_secret: frappe.throw(_('Please set API Key and Secret on the producer and consumer sites first.')) else: + doc_before_save = self.get_doc_before_save() + if doc_before_save.api_key != self.api_key or doc_before_save.api_secret != self.api_secret: + return + self.update_event_consumer() self.create_custom_fields() else: diff --git a/frappe/patches.txt b/frappe/patches.txt index 35389eee43..5dfe0c61b0 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -307,3 +307,4 @@ frappe.patches.v13_0.rename_notification_fields frappe.patches.v13_0.remove_duplicate_navbar_items frappe.patches.v13_0.enable_custom_script frappe.patches.v13_0.update_newsletter_content_type +frappe.patches.v13_0.delete_event_producer_and_consumer_keys \ No newline at end of file diff --git a/frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py b/frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py new file mode 100644 index 0000000000..1eba5871c2 --- /dev/null +++ b/frappe/patches/v13_0/delete_event_producer_and_consumer_keys.py @@ -0,0 +1,11 @@ +# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt + +from __future__ import unicode_literals +import frappe + +def execute(): + if frappe.db.exists("DocType", "Event Producer"): + frappe.db.sql("""UPDATE `tabEvent Producer` SET api_key='', api_secret=''""") + if frappe.db.exists("DocType", "Event Consumer"): + frappe.db.sql("""UPDATE `tabEvent Consumer` SET api_key='', api_secret=''""") From a706971b9b47fb2fb3daa51333dc26cf7e9961d6 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Wed, 9 Sep 2020 11:35:33 +0530 Subject: [PATCH 134/142] fix(recorder): Fix Cypress Tests --- cypress/integration/recorder.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/recorder.js b/cypress/integration/recorder.js index ed2a9c86ba..8a4aeddd0a 100644 --- a/cypress/integration/recorder.js +++ b/cypress/integration/recorder.js @@ -61,10 +61,10 @@ context('Recorder', () => { cy.visit('/desk#recorder'); - cy.get('.list-row-container span').contains('frappe.desk.reportview.get').click(); + cy.get('.list-row-container span').contains('/api/method/frappe').click(); cy.location('hash').should('contain', '#recorder/request/'); - cy.get('form').should('contain', 'frappe.desk.reportview.get'); + cy.get('form').should('contain', '/api/method/frappe'); cy.get('#page-recorder .primary-action').should('contain', 'Stop').click(); cy.get('#page-recorder .btn-secondary').should('contain', 'Clear').click(); From 2b12a34d7ecc931bd148ccfa3b400285ead06746 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Wed, 9 Sep 2020 12:45:17 +0530 Subject: [PATCH 135/142] refactor(translation linter): Handle multiline translation syntax (#11461) --- .github/frappe_linter/translation.py | 36 ++++++++++++++++------------ 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/frappe_linter/translation.py b/.github/frappe_linter/translation.py index d9fc98c76e..5d33355a1b 100644 --- a/.github/frappe_linter/translation.py +++ b/.github/frappe_linter/translation.py @@ -7,22 +7,28 @@ start_pattern = re.compile(r"_{1,2}\([\"']{1,3}") # skip first argument files = sys.argv[1:] -for _file in files: - if not _file.endswith(('.py', '.js')): - continue +files_to_scan = [_file for _file in files if _file.endswith(('.py', '.js'))] + +for _file in files_to_scan: with open(_file, 'r') as f: print(f'Checking: {_file}') - for num, line in enumerate(f, 1): - all_matches = start_pattern.finditer(line) - if all_matches: - for match in all_matches: - verify = pattern.search(line) - if not verify: - errors_encounter += 1 - print(f'A syntax error has been discovered at line number: {num}') - print(f'Syntax error occurred with: {line}') + file_lines = f.readlines() + for line_number, line in enumerate(file_lines, 1): + start_matches = start_pattern.search(line) + if start_matches: + match = pattern.search(line) + if not match and line.endswith(',\n'): + # concat remaining text to validate multiline pattern + line = "".join(file_lines[line_number - 1:]) + line = line[start_matches.start() + 1:] + match = pattern.match(line) + + if not match: + errors_encounter += 1 + print(f'\nTranslation syntax error at line number: {line_number + 1}\n{line.strip()[:100]}') + if errors_encounter > 0: - print('You can visit "https://frappeframework.com/docs/user/en/translations" to resolve this error.') - assert 1+1 == 3 + print('\nYou can visit "https://frappeframework.com/docs/user/en/translations" to resolve this error.') + sys.exit(1) else: - print('Good To Go!') + print('\nGood To Go!') From ee7d119546c488969a6893e9e343219f0c86f527 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 9 Sep 2020 14:03:56 +0530 Subject: [PATCH 136/142] fix: Escape invalid email in throw --- frappe/utils/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 1da220dc30..557a2fd647 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -135,7 +135,8 @@ def validate_email_address(email_str, throw=False): if not _valid: if throw: - frappe.throw(frappe._("{0} is not a valid Email Address").format(e), + invalid_email = frappe.utils.escape_html(e) + frappe.throw(frappe._("{0} is not a valid Email Address").format(invalid_email), frappe.InvalidEmailAddressError) return None else: From 3f42f4b5256e75618871aebb31183489ae6e24c4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 9 Sep 2020 17:12:38 +0530 Subject: [PATCH 137/142] fix: set overflow auto for report builder wrapper (cherry picked from commit 2ec014228637d40a23b794d108a282b8529e94b3) --- frappe/public/less/report.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/less/report.less b/frappe/public/less/report.less index f519640f7c..0a8d37b9ba 100644 --- a/frappe/public/less/report.less +++ b/frappe/public/less/report.less @@ -72,7 +72,7 @@ margin-bottom: 10px; } -.report-wrapper { +.report-wrapper, .datatable-wrapper { overflow: auto; } From 40748d7fa88c18f64600081b986d95f3b5cf0721 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 9 Sep 2020 23:42:46 +0530 Subject: [PATCH 138/142] fix: boot if module is not present in desk --- frappe/desk/desktop.py | 2 +- frappe/desk/doctype/desk_page/desk_page.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 94a38a5304..72c4519120 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -40,7 +40,7 @@ class Workspace: self.doc = self.get_page_for_user() - if self.doc.module not in self.allowed_modules: + if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError self.can_read = self.get_cached('user_perm_can_read', self.get_can_read_items) diff --git a/frappe/desk/doctype/desk_page/desk_page.py b/frappe/desk/doctype/desk_page/desk_page.py index cc2db53481..e92844ac0b 100644 --- a/frappe/desk/doctype/desk_page/desk_page.py +++ b/frappe/desk/doctype/desk_page/desk_page.py @@ -38,7 +38,7 @@ class DeskPage(Document): pages = frappe.get_all("Desk Page", fields=["name", "module"], filters=filters, as_list=1) - return { page[1]: page[0] for page in pages } + return { page[1]: page[0] for page in pages if page[1] } def disable_saving_as_standard(): return frappe.flags.in_install or \ From d8377dccc22b0ba83b6cbfec1a4e94dfdaa8ad77 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 10 Sep 2020 11:10:45 +0530 Subject: [PATCH 139/142] chore(tests): Cleanup property setter added for Blog Post --- frappe/tests/test_form_load.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_form_load.py b/frappe/tests/test_form_load.py index 459a3f52bd..78562e1055 100644 --- a/frappe/tests/test_form_load.py +++ b/frappe/tests/test_form_load.py @@ -40,7 +40,7 @@ class TestFormLoad(unittest.TestCase): user.remove_roles(*user_roles) user.add_roles('Blogger') - make_property_setter('Blog Post', 'published', 'permlevel', 1, 'Int') + blog_post_property_setter = make_property_setter('Blog Post', 'published', 'permlevel', 1, 'Int') reset('Blog Post') add('Blog Post', 'Website Manager', 1) update('Blog Post', 'Website Manager', 1, 'write', 1) @@ -80,6 +80,7 @@ class TestFormLoad(unittest.TestCase): user.add_roles(*user_roles) blog_doc.delete() + frappe.delete_doc(blog_post_property_setter.doctype, blog_post_property_setter.name) def test_fieldlevel_permissions_in_load_for_child_table(self): contact = frappe.new_doc('Contact') From 2b413319c1244d814fdd7d606dc3a1b3cec6f5f3 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 10 Sep 2020 12:36:59 +0530 Subject: [PATCH 140/142] fix(Dashboard Chart): only encode key if type is not string --- frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py index 4ea61ec6a9..7e2d952928 100644 --- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py @@ -60,11 +60,11 @@ def has_permission(doc, ptype, user): if doc.chart_type == 'Report': - allowed_reports = tuple([key.encode('UTF8') for key in get_allowed_reports()]) + allowed_reports = [key if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()] if doc.report_name in allowed_reports: return True else: - allowed_doctypes = tuple(frappe.permissions.get_doctypes_with_read()) + allowed_doctypes = [frappe.permissions.get_doctypes_with_read()] if doc.document_type in allowed_doctypes: return True From f4a22683d5c9703fe8d2767abd2c53301c0074c9 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 10 Sep 2020 12:58:52 +0530 Subject: [PATCH 141/142] test(blog): Add tests for blog post pagination --- .../doctype/blog_post/test_blog_post.py | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 7c6e64dc5a..cdf53122b2 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -9,6 +9,8 @@ import re from frappe.utils import set_request from frappe.website.render import render from frappe.utils import random_string +from frappe.website.doctype.blog_post.blog_post import get_blog_list +from frappe.website.website_generator import WebsiteGenerator class TestBlogPost(unittest.TestCase): def test_generator_view(self): @@ -60,12 +62,36 @@ class TestBlogPost(unittest.TestCase): frappe.delete_doc("Blog Post", blog.name) frappe.delete_doc("Blog Category", blog.blog_category) -def make_test_blog(): - if not frappe.db.exists('Blog Category', 'test-blog-category'): - # Set different title and name for the category + def test_blog_pagination(self): + # Create some Blog Posts for a Blog Category + category_title, blogs, BLOG_COUNT = "List Category", [], 4 + + for index in range(BLOG_COUNT): + blog = make_test_blog(category_title) + blogs.append(blog) + + filters = frappe._dict({"blog_category": scrub(category_title)}) + # Assert that get_blog_list returns results as expected + + self.assertEqual(len(get_blog_list(None, None, filters, 0, 3)), 3) + self.assertEqual(len(get_blog_list(None, None, filters, 0, BLOG_COUNT)), BLOG_COUNT) + self.assertEqual(len(get_blog_list(None, None, filters, 0, 2)), 2) + self.assertEqual(len(get_blog_list(None, None, filters, 2, BLOG_COUNT)), 2) + + # Cleanup Blog Post and linked Blog Category + for blog in blogs: + frappe.delete_doc(blog.doctype, blog.name) + frappe.delete_doc("Blog Category", blogs[0].blog_category) + +def scrub(text): + return WebsiteGenerator.scrub(None, text) + +def make_test_blog(category_title="Test Blog Category"): + category_name = scrub(category_title) + if not frappe.db.exists('Blog Category', category_name): frappe.get_doc(dict( doctype = 'Blog Category', - title='Test Blog Category')).insert() + title=category_title)).insert() if not frappe.db.exists('Blogger', 'test-blogger'): frappe.get_doc(dict( doctype = 'Blogger', @@ -73,7 +99,7 @@ def make_test_blog(): full_name='Test Blogger')).insert() test_blog = frappe.get_doc(dict( doctype = 'Blog Post', - blog_category = 'test-blog-category', + blog_category = category_name, blogger = 'test-blogger', title = random_string(20), route = random_string(20), From 40c29158e5a9bbd76d50010e7fb2cbdf9d281f46 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Thu, 10 Sep 2020 13:03:06 +0530 Subject: [PATCH 142/142] fix(blog): Use `LIMIT row_count OFFSET offset` syntax instead of `LIMIT offset, row_count` Reference: https://www.postgresql.org/docs/9.5/queries-limit.html --- frappe/website/doctype/blog_post/blog_post.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index beffcdca25..79d0754af4 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -242,7 +242,7 @@ def get_blog_list(doctype, txt=None, filters=None, limit_start=0, limit_page_len and t1.blogger = t2.name %(condition)s order by featured desc, published_on desc, name asc - limit %(start)s, %(page_len)s""" % { + limit %(page_len)s OFFSET %(start)s""" % { "start": limit_start, "page_len": limit_page_length, "condition": (" and " + " and ".join(conditions)) if conditions else "" }