From a601360d5e26beb1bbc7ab8f7e80c11bc1656890 Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Wed, 26 Apr 2017 14:55:40 +0530 Subject: [PATCH 01/20] remove awesomplete filtering frappe/erpnext#8275 (#3071) --- frappe/public/js/frappe/form/control.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index f7a986d6f4..0345a51024 100755 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1343,10 +1343,7 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ }; }, filter: function(item, input) { - var d = this.get_item(item.value); - return Awesomplete.FILTER_CONTAINS(d.value, '__link_option') || - Awesomplete.FILTER_CONTAINS(d.value, input) || - Awesomplete.FILTER_CONTAINS(d.description, input); + return true; }, item: function (item, input) { d = this.get_item(item.value); From 9ed4ce4a36953dae3916b06de4a9cf4a3e214494 Mon Sep 17 00:00:00 2001 From: slushpuppy Date: Wed, 26 Apr 2017 17:29:35 +0800 Subject: [PATCH 02/20] Fix for localhost SMTP servers without authentication (#3139) * Update email_account.py Fix for passwordless localhost SMTP servers * Update smtp.py * Update smtp.py Updated * Update smtp.py Syntax error fix * Update email_account.py --- frappe/email/doctype/email_account/email_account.py | 4 ++-- frappe/email/smtp.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index b330b1570d..5789848e97 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -61,7 +61,7 @@ class EmailAccount(Document): if (not self.awaiting_password and not frappe.local.flags.in_install and not frappe.local.flags.in_patch): - if self.password: + if self.password or self.smtp_server in ('127.0.0.1' or 'localhost'): if self.enable_incoming: self.get_incoming_server() self.no_failed = 0 @@ -716,4 +716,4 @@ def get_max_email_uid(email_account): return 1 else: max_uid = int(result[0].get("uid", 0)) + 1 - return max_uid \ No newline at end of file + return max_uid diff --git a/frappe/email/smtp.py b/frappe/email/smtp.py index 8daedc567c..4e58beeebc 100644 --- a/frappe/email/smtp.py +++ b/frappe/email/smtp.py @@ -59,7 +59,10 @@ def get_outgoing_email_account(raise_exception_not_set=True, append_to=None): if email_account: if email_account.enable_outgoing and not getattr(email_account, 'from_site_config', False): - email_account.password = email_account.get_password() + raise_exception = True + if email_account.smtp_server in ['localhost','127.0.0.1']: + raise_exception = False + email_account.password = email_account.get_password(raise_exception=raise_exception) email_account.default_sender = email.utils.formataddr((email_account.name, email_account.get("email_id"))) frappe.local.outgoing_email_account[append_to or "default"] = email_account From 4832c3b50f660b3b6d7dfc398391669deac1520b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 25 Apr 2017 14:19:10 +0530 Subject: [PATCH 03/20] [fix] missing first column in HTML for auto_email_report --- .../doctype/auto_email_report/auto_email_report.py | 13 +++++++++---- frappe/model/db_query.py | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py index 2f0c5c19f9..a6238865ff 100644 --- a/frappe/email/doctype/auto_email_report/auto_email_report.py +++ b/frappe/email/doctype/auto_email_report/auto_email_report.py @@ -40,7 +40,7 @@ class AutoEmailReport(Document): count = frappe.db.sql('select count(*) from `tabAuto Email Report` where user=%s and enabled=1', self.user)[0][0] if count > max_reports_per_user + (-1 if self.flags.in_insert else 0): frappe.throw(_('Only {0} emailed reports are allowed per user').format(max_reports_per_user)) - + def validate_report_format(self): """ check if user has select correct report format """ valid_report_formats = ["HTML", "XLS", "CSV"] @@ -59,6 +59,11 @@ class AutoEmailReport(Document): columns, data = report.get_data(limit=self.no_of_rows or 100, user = self.user, filters = self.filters, as_dict=True) + # add serial numbers + columns.insert(0, frappe._dict(fieldname='idx', label='', width='30px')) + for i in range(len(data)): + data[i]['idx'] = i+1 + if len(data)==0 and self.send_if_data: return None @@ -77,7 +82,7 @@ class AutoEmailReport(Document): def get_html_table(self, columns, data): return frappe.render_template('frappe/templates/includes/print_table.html', { 'columns': columns, - 'data': data[1:] + 'data': data }) def get_csv(self, columns, data): @@ -96,7 +101,7 @@ class AutoEmailReport(Document): def send(self): if self.filter_meta and not self.filters: frappe.throw(_("Please set filters value in Report Filter table.")) - + data = self.get_report_content() if not data: return @@ -135,7 +140,7 @@ class AutoEmailReport(Document): def get_report_footer(self): return """

- View report in your browser: + View report in your browser: {{report_name}}

Edit Auto Email Report Settings: {{edit_report_settings}}

""" diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index e0140c5d53..9361e807db 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -73,7 +73,7 @@ class DatabaseQuery(object): self.user = user or frappe.session.user self.update = update self.user_settings_fields = copy.deepcopy(self.fields) - # self.debug = True + #self.debug = True if user_settings: self.user_settings = json.loads(user_settings) From b6c36a67b0031ffaac56cd8f508ff757ee54d20b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 26 Apr 2017 15:31:10 +0530 Subject: [PATCH 04/20] [fix] filter_dashboard naming #3158 #3128 --- .../public/js/frappe/ui/filters/filter_dashboard_head.html | 6 +++--- frappe/public/js/frappe/ui/filters/filters.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/ui/filters/filter_dashboard_head.html b/frappe/public/js/frappe/ui/filters/filter_dashboard_head.html index b4c61949ce..b2008394be 100644 --- a/frappe/public/js/frappe/ui/filters/filter_dashboard_head.html +++ b/frappe/public/js/frappe/ui/filters/filter_dashboard_head.html @@ -1,6 +1,6 @@
-
{{ label }}
+
{{ label }}
{% if (type!=="Date" && type!=="Datetime" && type!=="DateRange") { %}
  • @@ -34,7 +34,7 @@
    {% } else { %} -
      +
      {% } %} diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js index acb87efb8e..263fdf89b6 100644 --- a/frappe/public/js/frappe/ui/filters/filters.js +++ b/frappe/public/js/frappe/ui/filters/filters.js @@ -117,7 +117,7 @@ frappe.ui.FilterList = Class.extend({ return } - var active = this.wrapper.find(".filter-sort-active[data-name='"+__(field.label)+"']"); + var active = this.wrapper.find(".filter-sort-active[data-name='"+__(field.name)+"']"); // sort filters if(active.attr('data-sort-by')==='alphabet') { @@ -168,7 +168,7 @@ frappe.ui.FilterList = Class.extend({ label: __(field.label), labels:labels }; - var dashboard_filter = this.wrapper.find(".filter-stat[data-name='" + __(field.label) + "']") + var dashboard_filter = this.wrapper.find(".filter-stat[data-name='" + __(field.name) + "']") dashboard_filter.html(frappe.render_template("filter_dashboard_value", context)) .on("click", ".filter-stat-link", function() { var fieldname = $(this).attr('data-field'); From 9ee2f07b3047ecef8fdb973accdc8e18f2514cb7 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 09:03:24 +0530 Subject: [PATCH 05/20] [hot] fix email_account --- frappe/email/doctype/email_account/email_account.py | 10 +++++----- frappe/public/js/frappe/desk.js | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 5789848e97..acf72cdea2 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -61,7 +61,7 @@ class EmailAccount(Document): if (not self.awaiting_password and not frappe.local.flags.in_install and not frappe.local.flags.in_patch): - if self.password or self.smtp_server in ('127.0.0.1' or 'localhost'): + if self.password or self.smtp_server in ('127.0.0.1', 'localhost'): if self.enable_incoming: self.get_incoming_server() self.no_failed = 0 @@ -331,7 +331,7 @@ class EmailAccount(Document): raise SentEmailInInbox if email.message_id: - names = frappe.db.sql("""select distinct name from tabCommunication + names = frappe.db.sql("""select distinct name from tabCommunication where message_id='{message_id}' order by creation desc limit 1""".format( message_id=email.message_id @@ -591,7 +591,7 @@ class EmailAccount(Document): if not self.use_imap: return - flags = frappe.db.sql("""select name, communication, uid, action from + flags = frappe.db.sql("""select name, communication, uid, action from `tabEmail Flag Queue` where is_completed=0 and email_account='{email_account}' """.format(email_account=self.name), as_dict=True) @@ -614,7 +614,7 @@ class EmailAccount(Document): self.set_communication_seen_status(docnames, seen=0) docnames = ",".join([ "'%s'"%flag.get("name") for flag in flags ]) - frappe.db.sql(""" update `tabEmail Flag Queue` set is_completed=1 + frappe.db.sql(""" update `tabEmail Flag Queue` set is_completed=1 where name in ({docnames})""".format(docnames=docnames)) def set_communication_seen_status(self, docnames, seen=0): @@ -622,7 +622,7 @@ class EmailAccount(Document): if not docnames: return - frappe.db.sql(""" update `tabCommunication` set seen={seen} + frappe.db.sql(""" update `tabCommunication` set seen={seen} where name in ({docnames})""".format(docnames=docnames, seen=seen)) @frappe.whitelist() diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 6de6d318b3..2f00c2ea63 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -328,6 +328,7 @@ frappe.Application = Class.extend({ if(!frappe.app.session_expired_dialog) { var dialog = new frappe.ui.Dialog({ title: __('Session Expired'), + keep_open: true, fields: [ { fieldtype:'Password', fieldname:'password', label: __('Please Enter Your Password to Continue') }, @@ -369,7 +370,7 @@ frappe.Application = Class.extend({ // add backdrop $('.modal-backdrop').css({ 'opacity': 1, - 'background-color': '#EBEFF2' + 'background-color': '#4B4C9D' }); } }, From 6f17070cdda95cc43088f6272616ad8231d5e041 Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Thu, 27 Apr 2017 06:50:50 +0100 Subject: [PATCH 06/20] Fix for #3136 (#3149) * places `scheduled_backup()` in try statement to catch any occurrence of ProgrammingError(1146) as per #3136 * adds option `--force` to drop-site * adds code that notifies the user of ProgrammingErrors and hints on next steps to take * adds correct help text for --force option --- frappe/commands/site.py | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/frappe/commands/site.py b/frappe/commands/site.py index e5379b04f9..bbbd30fbca 100755 --- a/frappe/commands/site.py +++ b/frappe/commands/site.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals, absolute_import import click import hashlib, os, sys import frappe +from _mysql_exceptions import ProgrammingError from frappe.commands import pass_context, get_site from frappe.commands.scheduler import _is_scheduler_enabled from frappe.limits import update_limits, get_limits @@ -323,7 +324,8 @@ def uninstall(context, app, dry_run=False, yes=False): @click.option('--root-login', default='root') @click.option('--root-password') @click.option('--archived-sites-path') -def drop_site(site, root_login='root', root_password=None, archived_sites_path=None): +@click.option('--force', help='Force drop-site even if an error is encountered', is_flag=True, default=False) +def drop_site(site, root_login='root', root_password=None, archived_sites_path=None, force=False): "Remove site from database and filesystem" from frappe.installer import get_root_connection from frappe.model.db_schema import DbManager @@ -331,7 +333,22 @@ def drop_site(site, root_login='root', root_password=None, archived_sites_path=N frappe.init(site=site) frappe.connect() - scheduled_backup(ignore_files=False, force=True) + + try: + scheduled_backup(ignore_files=False, force=True) + except ProgrammingError as err: + if err[0] == 1146: + if force: + pass + else: + click.echo("="*80) + click.echo("Error: The operation has stopped because backup of {s}'s database failed.".format(s=site)) + click.echo("Reason: {reason}{sep}".format(reason=err[1], sep="\n")) + click.echo("Fix the issue and try again.") + click.echo( + "Hint: Use 'bench drop-site {s} --force' to force the removal of {s}".format(sep="\n", tab="\t", s=site) + ) + sys.exit(1) db_name = frappe.local.conf.db_name frappe.local.db = get_root_connection(root_login, root_password) From 4a181b2cf64d49341d8882c536f656d8f66e3863 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 11:37:10 +0530 Subject: [PATCH 07/20] [fix] for #3159 --- frappe/public/js/frappe/form/dashboard.js | 2 +- frappe/public/js/frappe/form/templates/form_dashboard.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 8b279b4ded..8fa5a526ae 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -333,7 +333,7 @@ frappe.ui.form.Dashboard = Class.extend({ if(!this.heatmap) { this.heatmap = new CalHeatMap(); this.heatmap.init({ - itemSelector: "#heatmap-" + this.frm.doctype, + itemSelector: "#heatmap-" + frappe.model.scrub(this.frm.doctype), domain: "month", subDomain: "day", start: moment().subtract(1, 'year').add(1, 'month').toDate(), diff --git a/frappe/public/js/frappe/form/templates/form_dashboard.html b/frappe/public/js/frappe/form/templates/form_dashboard.html index 2c6e5b4342..bf23ff4082 100644 --- a/frappe/public/js/frappe/form/templates/form_dashboard.html +++ b/frappe/public/js/frappe/form/templates/form_dashboard.html @@ -4,7 +4,7 @@ From 2ae5ddb2ff2de61c68db849f051cd402d033b45c Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Thu, 27 Apr 2017 11:40:14 +0530 Subject: [PATCH 08/20] [fix] diminished search dialog cursor in firefox (#3172) --- frappe/public/js/frappe/ui/toolbar/search_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/toolbar/search_header.html b/frappe/public/js/frappe/ui/toolbar/search_header.html index ecf5dbd4f5..f36e87c7ea 100644 --- a/frappe/public/js/frappe/ui/toolbar/search_header.html +++ b/frappe/public/js/frappe/ui/toolbar/search_header.html @@ -1,6 +1,6 @@
      - +

      {%= __("Searching")%} ...

      \ No newline at end of file From 9b5634a46a1aa65ea160a68c1dc6a9ae6642f41b Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 27 Apr 2017 11:40:55 +0530 Subject: [PATCH 09/20] [minor][fix] add indicator for finished status (#3170) --- frappe/core/page/background_jobs/background_jobs.html | 5 +++-- frappe/core/page/background_jobs/background_jobs.py | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/core/page/background_jobs/background_jobs.html b/frappe/core/page/background_jobs/background_jobs.html index 793dadfa28..07b5c16451 100644 --- a/frappe/core/page/background_jobs/background_jobs.html +++ b/frappe/core/page/background_jobs/background_jobs.html @@ -28,9 +28,10 @@

      - Started + Started Queued - Failed + Failed + Finished

      {% else %}

      No pending or current jobs for this site

      diff --git a/frappe/core/page/background_jobs/background_jobs.py b/frappe/core/page/background_jobs/background_jobs.py index 368c6550e9..7fd681652a 100644 --- a/frappe/core/page/background_jobs/background_jobs.py +++ b/frappe/core/page/background_jobs/background_jobs.py @@ -11,7 +11,8 @@ from frappe.utils import format_datetime, cint colors = { 'queued': 'orange', 'failed': 'red', - 'started': 'green' + 'started': 'blue', + 'finished': 'green' } @frappe.whitelist() From b4e4e422231a9b3499b13b5351003e0faf68c13c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 12:01:05 +0530 Subject: [PATCH 10/20] [fix] [patch] frappe/erpnext#8590 --- frappe/patches/v8_0/update_published_in_global_search.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/patches/v8_0/update_published_in_global_search.py b/frappe/patches/v8_0/update_published_in_global_search.py index 830f01cd13..0a6595319a 100644 --- a/frappe/patches/v8_0/update_published_in_global_search.py +++ b/frappe/patches/v8_0/update_published_in_global_search.py @@ -1,6 +1,11 @@ +import frappe + def execute(): from frappe.website.router import get_doctypes_with_web_view from frappe.utils.global_search import rebuild_for_doctype for doctype in get_doctypes_with_web_view(): - rebuild_for_doctype(doctype) + try: + rebuild_for_doctype(doctype) + except frappe.DoesNotExistError: + pass From 14c4796e05abb528c5de76f326df8ef582c28404 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 12:06:42 +0530 Subject: [PATCH 11/20] [fix] for frappe/erpnext#8555 --- frappe/www/list.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/frappe/www/list.py b/frappe/www/list.py index 0d948f3ee4..4a1a56ebde 100644 --- a/frappe/www/list.py +++ b/frappe/www/list.py @@ -123,15 +123,19 @@ def get_list_context(context, doctype): from frappe.website.doctype.web_form.web_form import get_web_form_list list_context = context or frappe._dict() - module = load_doctype_module(doctype) - if hasattr(module, "get_list_context"): - out = frappe._dict(module.get_list_context(list_context) or {}) - if out: - list_context = out + meta = frappe.get_meta(doctype) + + if not meta.custom: + # custom doctypes don't have modules + module = load_doctype_module(doctype) + if hasattr(module, "get_list_context"): + out = frappe._dict(module.get_list_context(list_context) or {}) + if out: + list_context = out # get path from '/templates/' folder of the doctype if not list_context.row_template: - list_context.row_template = frappe.get_meta(doctype).get_row_template() + list_context.row_template = meta.get_row_template() # is web form, show the default web form filters # which is only the owner From 3581ad8db70a6bb03f7dae12e827b0cf13d9480e Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 27 Apr 2017 15:52:18 +0530 Subject: [PATCH 12/20] [fixes] assignment should work witout saving documents (#3163) * [fixes] assignment should work witout saving documents * [minor] check if document is __local before assignement --- frappe/desk/form/assign_to.py | 5 +---- frappe/public/js/frappe/form/footer/assign_to.js | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/frappe/desk/form/assign_to.py b/frappe/desk/form/assign_to.py index c6746831be..8280f6c162 100644 --- a/frappe/desk/form/assign_to.py +++ b/frappe/desk/form/assign_to.py @@ -66,10 +66,7 @@ def add(args=None): notify_assignment(d.assigned_by, d.owner, d.reference_type, d.reference_name, action='ASSIGN',\ description=args.get("description"), notify=args.get('notify')) - if not args.get("bulk_assign"): - return get(args) - else: - return {} + return get(args) @frappe.whitelist() def add_multiple(args=None): diff --git a/frappe/public/js/frappe/form/footer/assign_to.js b/frappe/public/js/frappe/form/footer/assign_to.js index 11a7f4df98..05259e541f 100644 --- a/frappe/public/js/frappe/form/footer/assign_to.js +++ b/frappe/public/js/frappe/form/footer/assign_to.js @@ -80,7 +80,7 @@ frappe.ui.form.AssignTo = Class.extend({ add: function() { var me = this; - if(this.frm.doc.__unsaved == 1) { + if(this.frm.is_new()) { frappe.throw(__("Please save the document before assignment")); return; } @@ -93,7 +93,6 @@ frappe.ui.form.AssignTo = Class.extend({ docname: me.frm.docname, callback: function(r) { me.render(r.message); - me.frm.reload_doc(); } }); } @@ -108,7 +107,7 @@ frappe.ui.form.AssignTo = Class.extend({ remove: function(owner) { var me = this; - if(this.frm.doc.__unsaved == 1) { + if(this.frm.is_new()) { frappe.throw(__("Please save the document before removing assignment")); return; } @@ -122,7 +121,6 @@ frappe.ui.form.AssignTo = Class.extend({ }, callback:function(r,rt) { me.render(r.message); - me.frm.reload_doc(); } }); } From 65730d7bcfb65cee20f2acb7f46bf79bee1f740d Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 16:14:06 +0530 Subject: [PATCH 13/20] [minor] allow method object to return its own response object --- frappe/handler.py | 16 +++++++++++----- frappe/public/css/form.css | 4 ++++ frappe/public/js/frappe/router.js | 3 ++- frappe/public/js/frappe/socketio_client.js | 11 ++++++----- frappe/public/less/form.less | 4 ++++ 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/frappe/handler.py b/frappe/handler.py index 70bdb68cce..1ffa8b214a 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -10,13 +10,22 @@ import frappe.sessions import frappe.utils.file_manager import frappe.desk.form.run_method from frappe.utils.response import build_response +from werkzeug.wrappers import Response def handle(): """handle request""" cmd = frappe.local.form_dict.cmd if cmd!='login': - execute_cmd(cmd) + data = execute_cmd(cmd) + + if data: + if isinstance(data, Response): + # method returns a response object, pass it on + return data + + # add the response to `message` label + frappe.response['message'] = data return build_response("json") @@ -39,11 +48,8 @@ def execute_cmd(cmd, from_async=False): is_whitelisted(method) - ret = frappe.call(method, **frappe.form_dict) + return frappe.call(method, **frappe.form_dict) - # returns with a message - if ret: - frappe.response['message'] = ret def is_whitelisted(method): # check if whitelisted diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css index 735ddec442..24bafa962d 100644 --- a/frappe/public/css/form.css +++ b/frappe/public/css/form.css @@ -497,6 +497,10 @@ h6.uppercase, } .frappe-control pre { white-space: pre-wrap; + background-color: inherit; + border: none; + padding: 0px; + margin: 0px; } .hide-control { display: none !important; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index e59ce7024f..99e51fcb35 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -153,8 +153,9 @@ $(window).on('hashchange', function() { return; // hide open dialog - if(cur_dialog && cur_dialog.hide_on_page_refresh) + if(cur_dialog && cur_dialog.hide_on_page_refresh) { cur_dialog.hide(); + } frappe.route(); diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js index 29dded37c7..8c7d206127 100644 --- a/frappe/public/js/frappe/socketio_client.js +++ b/frappe/public/js/frappe/socketio_client.js @@ -60,6 +60,12 @@ frappe.socket = { if (frappe.flags.doc_subscribe) { return; } + + frappe.flags.doc_subscribe = true; + + // throttle to 1 per sec + setTimeout(function() { frappe.flags.doc_subscribe = false }, 1000); + if (frm.is_new()) { return; } @@ -72,11 +78,6 @@ frappe.socket = { } } - frappe.flags.doc_subscribe = true; - - // throttle to 1 per sec - setTimeout(function() { frappe.flags.doc_subscribe = false }, 1000); - frappe.socket.doc_subscribe(frm.doctype, frm.docname); }); diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less index 285c0c9452..63473532cf 100644 --- a/frappe/public/less/form.less +++ b/frappe/public/less/form.less @@ -625,6 +625,10 @@ h6.uppercase, .h6.uppercase { pre { white-space: pre-wrap; + background-color: inherit; + border: none; + padding: 0px; + margin: 0px; } } From 4f899710f1a722ad3f59d6f35416e902894c7d2b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 27 Apr 2017 16:27:20 +0530 Subject: [PATCH 14/20] [fix] dont auto reload for CI --- frappe/app.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/app.py b/frappe/app.py index 5feecb7823..4536bdaf51 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -11,7 +11,6 @@ from werkzeug.local import LocalManager from werkzeug.exceptions import HTTPException, NotFound from werkzeug.contrib.profiler import ProfilerMiddleware from werkzeug.wsgi import SharedDataMiddleware -from werkzeug.serving import run_with_reloader import frappe import frappe.handler @@ -20,7 +19,7 @@ import frappe.api import frappe.async import frappe.utils.response import frappe.website.render -from frappe.utils import get_site_name, get_site_path +from frappe.utils import get_site_name from frappe.middlewares import StaticDataMiddleware from frappe.utils.error import make_error_snapshot from frappe.core.doctype.communication.comment import update_comments_in_parent_after_request @@ -222,5 +221,9 @@ def serve(port=8000, profile=False, site=None, sites_path='.'): 'SERVER_NAME': 'localhost:8000' } - run_simple('0.0.0.0', int(port), application, use_reloader=True, - use_debugger=True, use_evalex=True, threaded=True) + in_test_env = os.environ.get('CI') + run_simple('0.0.0.0', int(port), application, + use_reloader=not in_test_env, + use_debugger=not in_test_env, + use_evalex=not in_test_env, + threaded=True) From ae8aa7624648637e6506c9384fd0d9ef6702ac88 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 27 Apr 2017 16:48:51 +0530 Subject: [PATCH 15/20] Dynamic link validation, sort the sequence of the doctypes based on the field User Cannot Search (#3173) * Ignore dynamic link validation for the doctypes, which has permission do not search and view by the users * fix test cases * Update * Update dynamic_links.py * Update dynamic_links.py --- frappe/model/dynamic_links.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/frappe/model/dynamic_links.py b/frappe/model/dynamic_links.py index d68c60a2b1..0932ffa623 100644 --- a/frappe/model/dynamic_links.py +++ b/frappe/model/dynamic_links.py @@ -3,9 +3,24 @@ import frappe +# select doctypes that are accessed by the user (not read_only) first, so that the +# the validation message shows the user-facing doctype first. +# For example Journal Entry should be validated before GL Entry (which is an internal doctype) + dynamic_link_queries = [ - """select parent, fieldname, options from tabDocField where fieldtype='Dynamic Link'""", - """select dt as parent, fieldname, options from `tabCustom Field` where fieldtype='Dynamic Link'""", + """select parent, + (select read_only from `tabDocType` where name=tabDocField.parent) as read_only, + fieldname, options + from tabDocField + where fieldtype='Dynamic Link' + order by read_only""", + + """select dt as parent, + (select read_only from `tabDocType` where name=`tabCustom Field`.dt) as read_only, + fieldname, options + from `tabCustom Field` + where fieldtype='Dynamic Link' + order by read_only""", ] def get_dynamic_link_map(for_delete=False): @@ -29,7 +44,6 @@ def get_dynamic_link_map(for_delete=False): dynamic_link_map.setdefault(doctype, []).append(df) frappe.local.dynamic_link_map = dynamic_link_map - return frappe.local.dynamic_link_map def get_dynamic_links(): From 24c13a999635bcccb522b083ebc736d55741f7ba Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Fri, 28 Apr 2017 10:26:34 +0530 Subject: [PATCH 16/20] [hotfix] local veriable data reference before assignment fixes (#3185) --- frappe/handler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/handler.py b/frappe/handler.py index 1ffa8b214a..4845b4d725 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -15,6 +15,7 @@ from werkzeug.wrappers import Response def handle(): """handle request""" cmd = frappe.local.form_dict.cmd + data = None if cmd!='login': data = execute_cmd(cmd) From 72117dd5d3ab99ce7dd7751c8f6be9577e67291b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 28 Apr 2017 12:56:32 +0530 Subject: [PATCH 17/20] [fix] email fixes from failed scheduler logs --- frappe/email/doctype/email_account/email_account.py | 2 +- frappe/email/receive.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index acf72cdea2..8f56f2a435 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -483,7 +483,7 @@ class EmailAccount(Document): parent = frappe.new_doc(self.append_to) if self.subject_field: - parent.set(self.subject_field, frappe.as_unicode(email.subject)) + parent.set(self.subject_field, frappe.as_unicode(email.subject)[:140]) if self.sender_field: parent.set(self.sender_field, frappe.as_unicode(email.from_email)) diff --git a/frappe/email/receive.py b/frappe/email/receive.py index d64eecdf9a..750ad865a9 100644 --- a/frappe/email/receive.py +++ b/frappe/email/receive.py @@ -112,6 +112,10 @@ class EmailServer: self.uid_reindexed = False uid_list = email_list = self.get_new_mails() + + if not email_list: + return + num = num_copy = len(email_list) # WARNING: Hard coded max no. of messages to be popped @@ -166,11 +170,13 @@ class EmailServer: def get_new_mails(self): """Return list of new mails""" if cint(self.settings.use_imap): + email_list = [] self.check_imap_uidvalidity() self.imap.select("Inbox", readonly=True) response, message = self.imap.uid('search', None, self.settings.email_sync_rule) - email_list = message[0].split() + if message[0]: + email_list = message[0].split() else: email_list = self.pop.list()[1] From 95edd73b5b08db1755fb1ece45cef71a57031f55 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 27 Apr 2017 17:31:44 +0530 Subject: [PATCH 18/20] Fix Date between query --- frappe/model/db_query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 9361e807db..584fb5bbc3 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -300,8 +300,8 @@ class DatabaseQuery(object): if f.operator.lower() == 'between' and \ (f.fieldname in ('creation', 'modified') or (df and (df.fieldtype=="Date" or df.fieldtype=="Datetime"))): value = "'%s' AND '%s'" % ( - get_datetime(f.value[0]).strftime("%Y-%m-%d %H:%M:%S.%f"), - add_to_date(get_datetime(f.value[1]),days=1).strftime("%Y-%m-%d %H:%M:%S.%f")) + add_to_date(get_datetime(f.value[0]),days=-1).strftime("%Y-%m-%d %H:%M:%S.%f"), + get_datetime(f.value[1]).strftime("%Y-%m-%d %H:%M:%S.%f")) fallback = "'0000-00-00 00:00:00'" elif df and df.fieldtype=="Date": From 7e625f921957f6039c89b02623ba57e0a33e00d1 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 28 Apr 2017 15:11:35 +0530 Subject: [PATCH 19/20] [fix] escape doctype for patch --- frappe/utils/global_search.py | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 748b14ceb9..d176af87a0 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -58,7 +58,7 @@ def rebuild_for_doctype(doctype): filters.enabled = 1 if meta.has_field("disabled"): filters.disabled = 0 - + return filters meta = frappe.get_meta(doctype) @@ -69,36 +69,36 @@ def rebuild_for_doctype(doctype): }) for p in parent_doctypes: rebuild_for_doctype(p.parent) - + return - + # Delete records delete_global_search_records_for_doctype(doctype) parent_search_fields = meta.get_global_search_fields() fieldnames = get_selected_fields(meta, parent_search_fields) - + # Get all records from parent doctype table all_records = frappe.get_all(doctype, fields=fieldnames, filters=_get_filters()) - + # Children data - all_children, child_search_fields = get_children_data(doctype, meta) + all_children, child_search_fields = get_children_data(doctype, meta) all_contents = [] - + for doc in all_records: content = [] for field in parent_search_fields: value = doc.get(field.fieldname) if value: content.append(get_formatted_value(value, field)) - + # get children data for child_doctype, records in all_children.get(doc.name, {}).items(): for field in child_search_fields.get(child_doctype): for r in records: if r.get(field.fieldname): content.append(get_formatted_value(r.get(field.fieldname), field)) - + if content: # if doctype published in website, push title, route etc. published = 0 @@ -108,9 +108,9 @@ def rebuild_for_doctype(doctype): published = 1 if d.is_website_published() else 0 title = d.get_title() route = d.get("route") - + all_contents.append({ - "doctype": doctype, + "doctype": frappe.db.escape(doctype), "name": frappe.db.escape(doc.name), "content": frappe.db.escape(' ||| '.join(content or '')), "published": published, @@ -119,30 +119,30 @@ def rebuild_for_doctype(doctype): }) if all_contents: insert_values_for_multiple_docs(all_contents) - + def delete_global_search_records_for_doctype(doctype): frappe.db.sql(''' delete from __global_search where doctype = %s''', doctype, as_dict=True) - + def get_selected_fields(meta, global_search_fields): fieldnames = [df.fieldname for df in global_search_fields] if meta.istable==1: fieldnames.append("parent") elif "name" not in fieldnames: fieldnames.append("name") - + if meta.has_field("is_website_published"): fieldnames.append("is_website_published") - + return fieldnames - + def get_children_data(doctype, meta): """ Get all records from all the child tables of a doctype - + all_children = { "parent1": { "child_doctype1": [ @@ -153,41 +153,41 @@ def get_children_data(doctype, meta): ] } } - + """ all_children = frappe._dict() child_search_fields = frappe._dict() - + for child in meta.get_table_fields(): child_meta = frappe.get_meta(child.options) search_fields = child_meta.get_global_search_fields() if search_fields: child_search_fields.setdefault(child.options, search_fields) child_fieldnames = get_selected_fields(child_meta, search_fields) - child_records = frappe.get_all(child.options, fields=child_fieldnames, filters={ + child_records = frappe.get_all(child.options, fields=child_fieldnames, filters={ "docstatus": ["!=", 1], "parenttype": doctype }) - + for record in child_records: all_children.setdefault(record.parent, frappe._dict())\ .setdefault(child.options, []).append(record) - + return all_children, child_search_fields - + def insert_values_for_multiple_docs(all_contents): values = [] for content in all_contents: values.append("( '{doctype}', '{name}', '{content}', '{published}', '{title}', '{route}')" .format(**content)) - + frappe.db.sql(''' insert into __global_search (doctype, name, content, published, title, route) values {0} '''.format(", ".join(values))) - + def update_global_search(doc): '''Add values marked with `in_global_search` to @@ -205,7 +205,7 @@ def update_global_search(doc): for field in doc.meta.get_global_search_fields(): if doc.get(field.fieldname) and field.fieldtype != "Table": content.append(get_formatted_value(doc.get(field.fieldname), field)) - + # Get children for child in doc.meta.get_table_fields(): for d in doc.get(child.fieldname): From 72c2683b4f82231eabecd948adc1724ae18f8520 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 28 Apr 2017 16:08:37 +0600 Subject: [PATCH 20/20] bumped to version 8.0.27 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 8142f8910e..6e3f06807f 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = '8.0.26' +__version__ = '8.0.27' __title__ = "Frappe Framework" local = Local()