From cd5867da01e0eaa039d4090dd7c7ff9c599194ee Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 16 Aug 2017 19:56:45 +0530 Subject: [PATCH 1/3] [Urgent] Wrong workflow status showing on the form (#3940) --- frappe/public/js/frappe/list/list_renderer.js | 9 ++------- frappe/public/js/frappe/model/indicator.js | 5 ++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index 394d7d3f16..b0ab853062 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -410,7 +410,7 @@ frappe.views.ListRenderer = Class.extend({ }, get_indicator_html: function (doc) { - var indicator = this.get_indicator_from_doc(doc); + var indicator = frappe.get_indicator(doc, this.doctype); if (indicator) { return ` @@ -420,17 +420,12 @@ frappe.views.ListRenderer = Class.extend({ return ''; }, get_indicator_dot: function (doc) { - var indicator = this.get_indicator_from_doc(doc); + var indicator = frappe.get_indicator(doc, this.doctype); if (!indicator) { return ''; } return ``; }, - get_indicator_from_doc: function (doc) { - var workflow = frappe.workflow.workflows[this.doctype]; - var override = workflow ? workflow['override_status'] : true; - return frappe.get_indicator(doc, this.doctype, override); - }, prepare_data: function (data) { if (data.modified) this.prepare_when(data, data.modified); diff --git a/frappe/public/js/frappe/model/indicator.js b/frappe/public/js/frappe/model/indicator.js index d4c0807d7c..ff2fb05d80 100644 --- a/frappe/public/js/frappe/model/indicator.js +++ b/frappe/public/js/frappe/model/indicator.js @@ -14,13 +14,16 @@ frappe.has_indicator = function(doctype) { return false; } -frappe.get_indicator = function(doc, doctype, without_workflow = true) { +frappe.get_indicator = function(doc, doctype) { if(doc.__unsaved) { return [__("Not Saved"), "orange"]; } if(!doctype) doctype = doc.doctype; + var workflow = frappe.workflow.workflows[doctype]; + var without_workflow = workflow ? workflow['override_status'] : true; + var settings = frappe.listview_settings[doctype] || {}; var is_submittable = frappe.model.is_submittable(doctype), From 965a7460ac21860050b9e1727b36301df741f2c0 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 16 Aug 2017 20:04:10 +0530 Subject: [PATCH 2/3] [hotfix] set email queue status to Not Sent (#3941) --- frappe/patches.txt | 1 + frappe/patches/v8_7/__init__.py | 0 frappe/patches/v8_7/update_email_queue_status.py | 13 +++++++++++++ 3 files changed, 14 insertions(+) create mode 100644 frappe/patches/v8_7/__init__.py create mode 100644 frappe/patches/v8_7/update_email_queue_status.py diff --git a/frappe/patches.txt b/frappe/patches.txt index a9a28d5f05..ce0a749126 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -191,3 +191,4 @@ frappe.patches.v8_1.delete_custom_docperm_if_doctype_not_exists frappe.patches.v8_5.delete_email_group_member_with_invalid_emails frappe.patches.v8_x.update_user_permission frappe.patches.v8_5.patch_event_colors +frappe.patches.v8_7.update_email_queue_status diff --git a/frappe/patches/v8_7/__init__.py b/frappe/patches/v8_7/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/patches/v8_7/update_email_queue_status.py b/frappe/patches/v8_7/update_email_queue_status.py new file mode 100644 index 0000000000..8dcbcc57d6 --- /dev/null +++ b/frappe/patches/v8_7/update_email_queue_status.py @@ -0,0 +1,13 @@ +from __future__ import unicode_literals +import frappe +from frappe.email.smtp import get_default_outgoing_email_account + +def execute(): + # set the email queue status to Not Sent if google_analytics_id is UA-8911157-19 + default_email_account = get_default_outgoing_email_account() + + if frappe.conf.get("google_analytics_id") == "UA-8911157-19" or \ + default_email_account.email_id == "notifications@erpnext.com": + + frappe.db.sql("""update `tabEmail Queue` set status='Not Sent' where + creation>=DATE_SUB(NOW(), INTERVAL 16 HOUR)""") \ No newline at end of file From 3575329c95d92b36c8636ed62f4d327c52b525bb Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 16 Aug 2017 20:34:53 +0600 Subject: [PATCH 3/3] bumped to version 8.7.7 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index befcfee04e..b0fd570187 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '8.7.6' +__version__ = '8.7.7' __title__ = "Frappe Framework" local = Local()