From 4db18698d51f67840c6383d4eb177a7c3edd9898 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 17 Oct 2018 15:46:25 +0530 Subject: [PATCH 01/16] [Fix] Report Addresses And Contacts not working --- .../report/addresses_and_contacts/addresses_and_contacts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py index 9dffcdfcd5..edb69b831d 100644 --- a/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py +++ b/frappe/contacts/report/addresses_and_contacts/addresses_and_contacts.py @@ -91,7 +91,7 @@ def get_party_details(party_type, party_list, doctype, party_details): records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True) for d in records: - details = party_details.get(d[0]) + details = party_details.get(d[0]) or {} details.setdefault(frappe.scrub(doctype), []).append(d[1:]) return party_details From b76eb03a65f427d050ff7cc04b5a03f54c119bd8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 17 Oct 2018 16:31:51 +0530 Subject: [PATCH 02/16] fix(web): fixed container_attributes --- frappe/templates/web.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/web.html b/frappe/templates/web.html index 5724141618..2a8460ac76 100644 --- a/frappe/templates/web.html +++ b/frappe/templates/web.html @@ -7,7 +7,7 @@ id="page-{{ name or route }}" data-path="{{ pathname }}" {% endmacro %} {% block content %} -
+
{% if show_sidebar %}
{% include "templates/includes/web_sidebar.html" %} From a6fc2caed02c601b942e1049d95c4e9c787f4fd4 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 17 Oct 2018 16:32:28 +0530 Subject: [PATCH 03/16] wip --- frappe/public/js/frappe/form/controls/comment.js | 9 ++++++--- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js index 6ce9defa3b..df345af379 100644 --- a/frappe/public/js/frappe/form/controls/comment.js +++ b/frappe/public/js/frappe/form/controls/comment.js @@ -1,5 +1,8 @@ +// import Quill from 'quill/dist/quill'; import 'quill-mention'; +// Quill.register('modules/mention', QuillMention); + frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ make_wrapper() { this.comment_wrapper = !this.no_wrapper ? $(` @@ -68,9 +71,9 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ const options = this._super(); return Object.assign(options, { theme: 'bubble', - // modules: Object.assign(options.modules, { - // mention: this.get_mention_options() - // }) + modules: Object.assign(options.modules, { + mention: this.get_mention_options() + }) }); }, diff --git a/package.json b/package.json index 17b6e8300b..fc57af3ea8 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "moment-timezone": "^0.5.21", "quill": "2.0.0-dev.2", "quill-image-drop-module": "^1.0.3", - "quill-mention": "^2.0.2", + "quill-mention": "^2.0.4", "redis": "^2.8.0", "showdown": "^1.8.6", "socket.io": "^2.0.4", diff --git a/yarn.lock b/yarn.lock index 28b5052988..e8ec122113 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3036,10 +3036,10 @@ quill-image-drop-module@^1.0.3: dependencies: quill "^1.2.2" -quill-mention@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.2.tgz#8e89e1d6b625d2df1b5a04af9338e35b18e91fce" - integrity sha512-G6VDFWVXO4ERuPamZEk+2VLvngZV18OxEzjPXsSayQij6K/s3RziiLEQ9MmRAr4umQVJ85W2VB7l4dX2qIW0MQ== +quill-mention@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.4.tgz#4b636a4cc68945697d998d00bc035392dc8dc46a" + integrity sha512-nooIgpYPs1B76lqxCPR63Hdk0LEaMTxmXtC4feZz9q0K6gyNGDItrvdEsc+pltEEEro2pkOP8w1ibM1ldvDVvA== dependencies: quill "^1.3.4" From 0ab71884da0b56b3f05629834fb8566981149f50 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 17 Oct 2018 18:48:51 +0530 Subject: [PATCH 04/16] [Fix] multiple user permissions messages are coming even if permissions are set --- frappe/permissions.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/permissions.py b/frappe/permissions.py index d02f24330f..6899194222 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -89,6 +89,9 @@ def has_permission(doctype, ptype="read", doc=None, verbose=False, user=None): if not perm: perm = false_if_not_shared() + if perm and frappe.message_log: + frappe.message_log.pop() + if verbose: print("Final Permission: {0}".format(perm)) return perm From 97ec70b83ec50955ae9319a2bd983e7e9921f9d7 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 18 Oct 2018 12:29:46 +0530 Subject: [PATCH 05/16] [Fix] Setup wizard timeout error (#6270) --- frappe/desk/page/setup_wizard/setup_wizard.py | 12 +++++++++--- frappe/translate.py | 3 ++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index eef203ab04..b7014c74b1 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -54,9 +54,12 @@ def setup_complete(args): and clears cache. If wizard breaks, calls `setup_wizard_exception` hook""" # Setup complete: do not throw an exception, let the user continue to desk - if cint(frappe.db.get_single_value('System Settings', 'setup_complete')): + if (frappe.cache().hget("setup_wizard", "in_setup") or + cint(frappe.db.get_single_value('System Settings', 'setup_complete'))): return + frappe.cache().hset("setup_wizard", "in_setup", True) + args = parse_args(args) stages = get_setup_stages(args) @@ -70,17 +73,19 @@ def setup_complete(args): for task in stage.get('tasks'): current_task = task task.get('fn')(task.get('args')) - except Exception: handle_setup_exception(args) return {'status': 'fail', 'fail': current_task.get('fail_msg')} else: run_setup_success(args) return {'status': 'ok'} + finally: + frappe.cache().hdel("setup_wizard", "in_setup") def update_global_settings(args): - if args.language and args.language != "english": + if args.language and args.language != "English": set_default_language(get_language_code(args.lang)) + frappe.db.commit() frappe.clear_cache() update_system_settings(args) @@ -236,6 +241,7 @@ def load_messages(language): javascript files""" frappe.clear_cache() set_default_language(get_language_code(language)) + frappe.db.commit() m = get_dict("page", "setup-wizard") for path in frappe.get_hooks("setup_wizard_requires"): diff --git a/frappe/translate.py b/frappe/translate.py index 11172d0a3c..7ab09f4136 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -72,7 +72,8 @@ def get_lang_code(lang): def set_default_language(lang): """Set Global default language""" - frappe.db.set_default("lang", lang) + if frappe.db.get_default("lang") != lang: + frappe.db.set_default("lang", lang) frappe.local.lang = lang def get_all_languages(): From e45a3660d0715b7847e1ee59c76855a24d7a5ddb Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 18 Oct 2018 12:32:36 +0530 Subject: [PATCH 06/16] [Fix] Invalid date format message in quick entry for date field (#6274) --- frappe/public/js/frappe/ui/field_group.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index 71464adc37..57050298ca 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -24,7 +24,13 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({ // set default $.each(this.fields_list, function(i, field) { if (field.df["default"]) { - field.set_input(field.df["default"]); + let def_value = field.df["default"]; + + if (def_value == 'Today' && field.df["fieldtype"] == 'Date') { + def_value = frappe.datetime.get_today(); + } + + field.set_input(def_value); // if default and has depends_on, render its fields. me.refresh_dependency(); } From 04d255bc5fa1bcee8a45cf4bbdef569defdf7ff4 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Thu, 18 Oct 2018 12:33:00 +0530 Subject: [PATCH 07/16] fix(update message): multiple fixes (#6275) - added GitPython as a dependency - use git describe to find the branch version - prevent version popup for prereleases - check for update weekly instead of daily - fixed bug in check for update which used to compare minor version even if there was a mismatch in comparing major versions Signed-off-by: Ameya Shenoy --- frappe/hooks.py | 4 ++-- frappe/utils/change_log.py | 14 +++++++++++--- requirements.txt | 1 + 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 748c8dfeb6..2a3cd586e6 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -171,7 +171,6 @@ scheduler_events = { "frappe.email.doctype.auto_email_report.auto_email_report.send_daily", "frappe.core.doctype.feedback_request.feedback_request.delete_feedback_request", "frappe.core.doctype.activity_log.activity_log.clear_authentication_logs", - "frappe.utils.change_log.check_for_update" ], "daily_long": [ "frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backups_daily", @@ -179,7 +178,8 @@ scheduler_events = { ], "weekly_long": [ "frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backups_weekly", - "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_weekly" + "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_weekly", + "frappe.utils.change_log.check_for_update" ], "monthly": [ "frappe.email.doctype.auto_email_report.auto_email_report.send_monthly" diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index e13e1a8229..fa9d741849 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -9,8 +9,9 @@ import frappe import requests import subprocess # nosec from frappe.utils import cstr -from frappe.utils.gitutils import get_app_last_commit_ref, get_app_branch +from frappe.utils.gitutils import get_app_branch from frappe import _, safe_decode +import git def get_change_log(user=None): if not user: user = frappe.session.user @@ -103,7 +104,12 @@ def get_versions(): } if versions[app]['branch'] != 'master': - branch_version = app_hooks.get('{0}_version'.format(versions[app]['branch'])) + try: + app_repo = git.Repo(os.path.join('..', 'apps', '{}'.format(app))) + branch_version = '-'.join(app_repo.git.describe().split('-')[:2]) + branch_version = [branch_version.strip('v')] + except: + branch_version = app_hooks.get('{0}_version'.format(versions[app]['branch'])) if branch_version: versions[app]['branch_version'] = branch_version[0] + ' ({0})'.format(get_app_last_commit_ref(app)) @@ -145,7 +151,7 @@ def check_for_update(): github_version, org_name = app_details # Get local instance's current version or the app - instance_version = Version(apps[app]['version']) + instance_version = Version(apps[app]['branch_version'].split(' ')[0]) # Compare and popup update message for update_type in updates: if github_version.__dict__[update_type] > instance_version.__dict__[update_type]: @@ -157,6 +163,7 @@ def check_for_update(): title = apps[app]['title'], )) break + if github_version.__dict__[update_type] < instance_version.__dict__[update_type]: break add_message_to_redis(updates) @@ -218,6 +225,7 @@ def show_update_popup(): return updates = json.loads(update_info) + current_versions = get_versions() # Check if user is int the set of users to send update message to update_message = "" diff --git a/requirements.txt b/requirements.txt index 60d00c6ec8..3f44cdf2e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,3 +55,4 @@ google-auth-oauthlib faker stripe coverage +GitPython==2.1.11 From 3e694eb8ff0493086c3f8a2d78d836ca4c3bd580 Mon Sep 17 00:00:00 2001 From: Saif Date: Thu, 18 Oct 2018 12:05:41 +0500 Subject: [PATCH 08/16] Get text from link formatter in indicator formatter function (#6266) --- frappe/public/js/legacy/client_script_helpers.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/legacy/client_script_helpers.js b/frappe/public/js/legacy/client_script_helpers.js index 98fe64835d..60baeb16bd 100644 --- a/frappe/public/js/legacy/client_script_helpers.js +++ b/frappe/public/js/legacy/client_script_helpers.js @@ -446,12 +446,21 @@ _f.Frm.prototype.set_indicator_formatter = function(fieldname, get_color, get_te frappe.meta.docfield_map[doctype][fieldname].formatter = function(value, df, options, doc) { if(value) { + var label; + if(get_text) { + label = get_text(doc); + } else if(frappe.form.link_formatters[df.options]) { + label = frappe.form.link_formatters[df.options](value, doc); + } else { + label = value; + } + const escaped_name = encodeURIComponent(value); return repl('%(label)s', { color: get_color(doc || {}), doctype: df.options, name: escaped_name, - label: get_text ? get_text(doc) : value + label: label }); } else { return ''; From 80b3710f3a7c7c7c2d0b086893899b7bac41cbf8 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Thu, 18 Oct 2018 12:36:09 +0530 Subject: [PATCH 09/16] [Minor] Python 2 - 3 reference issue (#6257) * reference issue * use safe_decode instead of python 2-3 port --- frappe/core/doctype/sms_settings/sms_settings.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/core/doctype/sms_settings/sms_settings.py b/frappe/core/doctype/sms_settings/sms_settings.py index 7e735d87de..8472ba8f2b 100644 --- a/frappe/core/doctype/sms_settings/sms_settings.py +++ b/frappe/core/doctype/sms_settings/sms_settings.py @@ -52,11 +52,9 @@ def send_sms(receiver_list, msg, sender_name = '', success_msg = True): receiver_list = validate_receiver_nos(receiver_list) - if six.PY3: unicode = str - arg = { 'receiver_list' : receiver_list, - 'message' : unicode(msg).encode('utf-8'), + 'message' : frappe.safe_decode(msg).encode('utf-8'), 'success_msg' : success_msg } From b1aee1477ae12c9155f1f8f099bf796eace67ea0 Mon Sep 17 00:00:00 2001 From: Chinmay Pai Date: Thu, 18 Oct 2018 07:07:06 +0000 Subject: [PATCH 10/16] communication: save email as drafts to localStorage (#6251) currently, there is no way to store an email draft. so suppose if someone would like to _not_ lose their email progress, we should store a draft as a safety measure. a cheap way of doing this is by using localStorage. in this, we use - key format in localStorage with the draft mail as the value. the draft is also auto deleted on mail send. Signed-off-by: Chinmay Pai Co-authored-by: Faris Ansari Co-authored-by: Kenneth Sequeira --- .../public/js/frappe/views/communication.js | 39 +++++++++++++++++-- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js index 4923add7bc..9ea08bc9e4 100755 --- a/frappe/public/js/frappe/views/communication.js +++ b/frappe/public/js/frappe/views/communication.js @@ -78,8 +78,14 @@ frappe.views.CommunicationComposer = Class.extend({ {label:__("Subject"), fieldtype:"Data", reqd: 1, fieldname:"subject", length:524288}, {fieldtype: "Section Break"}, - {label:__("Message"), fieldtype:"Text Editor", reqd: 1, - fieldname:"content"}, + { + label:__("Message"), + fieldtype:"Text Editor", reqd: 1, + fieldname:"content", + onchange: frappe.utils.debounce(this.save_as_draft.bind(this), 300), + default: localStorage.getItem(this.frm.doctype + this.frm.docname) || '' + }, + {fieldtype: "Section Break"}, {fieldtype: "Column Break"}, {label:__("Send me a copy"), fieldtype:"Check", @@ -113,7 +119,7 @@ frappe.views.CommunicationComposer = Class.extend({ }, prepare: function() { this.setup_subject_and_recipients(); - this.setup_print_language() + this.setup_print_language(); this.setup_print(); this.setup_attach(); this.setup_email(); @@ -128,7 +134,10 @@ frappe.views.CommunicationComposer = Class.extend({ this.dialog.fields_dict.sender.set_value(this.sender || ''); } this.dialog.fields_dict.subject.set_value(this.subject || ''); - this.setup_earlier_reply(); + + if(!localStorage.getItem(this.frm.doctype + this.frm.docname)) { + this.setup_earlier_reply(); + } }, setup_subject_and_recipients: function() { @@ -488,6 +497,18 @@ frappe.views.CommunicationComposer = Class.extend({ return form_values; }, + save_as_draft: function() { + if (this.dialog) { + try { + localStorage.setItem(this.frm.doctype + this.frm.docname, this.dialog.get_value('content')); + } catch (e) { + // silently fail + console.log(e); + console.warn('[Communication] localStorage is full. Cannot save message as draft'); + } + } + }, + send_email: function(btn, form_values, selected_attachments, print_html, print_format) { var me = this; me.dialog.hide(); @@ -549,6 +570,16 @@ frappe.views.CommunicationComposer = Class.extend({ cur_frm.reload_doc(); } + if (localStorage.getItem(this.frm.doctype + this.frm.docname)) { + try { + localStorage.removeItem(this.frm.doctype + this.frm.docname); + } catch (e) { + // silently fail + console.log(e); + console.warn('[Communication] Failed to delete draft.'); + } + } + // try the success callback if it exists if (me.success) { try { From a65e5aeec974884264edacad9b29f3062d2e9f2d Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 18 Oct 2018 14:13:58 +0530 Subject: [PATCH 11/16] fix(Quill): Add forked quill-mention to make mentions work --- frappe/public/js/frappe/form/controls/comment.js | 7 ++----- frappe/public/js/frappe/form/controls/text_editor.js | 5 ++++- package.json | 2 +- yarn.lock | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js index df345af379..c343e2f878 100644 --- a/frappe/public/js/frappe/form/controls/comment.js +++ b/frappe/public/js/frappe/form/controls/comment.js @@ -1,7 +1,4 @@ -// import Quill from 'quill/dist/quill'; -import 'quill-mention'; - -// Quill.register('modules/mention', QuillMention); +import 'quill-mention/dist/quill.mention.min'; frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ make_wrapper() { @@ -93,7 +90,7 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({ allowedChars: /^[A-Za-z0-9_]*$/, mentionDenotationChars: ["@"], isolateCharacter: true, - source: function(searchTerm, renderList, mentionChar) { + source: function (searchTerm, renderList, mentionChar) { let values; if (mentionChar === "@") { diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index 39d433f2bf..fdd20259e3 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -1,6 +1,9 @@ -import Quill from 'quill/dist/quill'; +import Quill from 'quill'; import { ImageDrop } from 'quill-image-drop-module'; +// required for quill-mention +window.Quill = Quill; + Quill.register('modules/imageDrop', ImageDrop); // replace

tag with

diff --git a/package.json b/package.json index fc57af3ea8..b2ebc2e309 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "moment-timezone": "^0.5.21", "quill": "2.0.0-dev.2", "quill-image-drop-module": "^1.0.3", - "quill-mention": "^2.0.4", + "quill-mention": "https://github.com/netchampfaris/quill-mention", "redis": "^2.8.0", "showdown": "^1.8.6", "socket.io": "^2.0.4", diff --git a/yarn.lock b/yarn.lock index e8ec122113..0d8ffd7e3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3036,10 +3036,9 @@ quill-image-drop-module@^1.0.3: dependencies: quill "^1.2.2" -quill-mention@^2.0.4: +"quill-mention@https://github.com/netchampfaris/quill-mention": version "2.0.4" - resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.4.tgz#4b636a4cc68945697d998d00bc035392dc8dc46a" - integrity sha512-nooIgpYPs1B76lqxCPR63Hdk0LEaMTxmXtC4feZz9q0K6gyNGDItrvdEsc+pltEEEro2pkOP8w1ibM1ldvDVvA== + resolved "https://github.com/netchampfaris/quill-mention#c85d60ee8047bd6b15e319f410423dbb3f06b2e6" dependencies: quill "^1.3.4" From f89fd5c6ac8ddb68ed5dc9f1ab534540d293f3d2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 18 Oct 2018 14:14:18 +0530 Subject: [PATCH 12/16] fix(Quill): Add class table-bordered to tables --- frappe/public/js/frappe/form/controls/text_editor.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js index fdd20259e3..af306d461a 100644 --- a/frappe/public/js/frappe/form/controls/text_editor.js +++ b/frappe/public/js/frappe/form/controls/text_editor.js @@ -13,7 +13,13 @@ Quill.register(Block, true); // table const Table = Quill.import('formats/table-container'); -Table.className = 'table'; +const superCreate = Table.create.bind(Table); +Table.create = (value) => { + const node = superCreate(value); + node.classList.add('table'); + node.classList.add('table-bordered'); + return node; +} Quill.register(Table, true); // inline style From 2bc7d159f07d146bb1aab65acf0f797a5e9ccd4a Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Thu, 18 Oct 2018 12:29:24 +0000 Subject: [PATCH 13/16] fix(travis): python package version management - urllib3 to 1.23 - bleach to 2.1.4 --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ea4de43fdc..8d8a564667 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ email_reply_parser click num2words==0.5.5 watchdog==0.8.0 -bleach +bleach==2.1.4 bleach-whitelist Pillow beautifulsoup4 @@ -49,3 +49,4 @@ pypng premailer croniter googlemaps +urllib3==1.23 From be8f37dc5bbfc17a2801a68f49dbce3145f815b2 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Wed, 17 Oct 2018 21:20:10 +0000 Subject: [PATCH 14/16] fix(update message): multiple fixes - added GitPython as a dependency - use git describe to find the branch version - prevent version popup for prereleases - check for update weekly instead of daily - fixed bug in check for update which used to compare minor version even if there was a mismatch in comparing major versions Signed-off-by: Ameya Shenoy --- frappe/hooks.py | 4 ++-- frappe/utils/change_log.py | 12 ++++++++++-- requirements.txt | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 4a76ee075b..2c984992d0 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -154,7 +154,6 @@ scheduler_events = { "frappe.email.doctype.auto_email_report.auto_email_report.send_daily", "frappe.core.doctype.feedback_request.feedback_request.delete_feedback_request", "frappe.core.doctype.activity_log.activity_log.clear_authentication_logs", - "frappe.utils.change_log.check_for_update" ], "daily_long": [ "frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backups_daily", @@ -162,7 +161,8 @@ scheduler_events = { ], "weekly_long": [ "frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backups_weekly", - "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_weekly" + "frappe.integrations.doctype.s3_backup_settings.s3_backup_settings.take_backups_weekly", + "frappe.utils.change_log.check_for_update" ], "monthly": [ "frappe.email.doctype.auto_email_report.auto_email_report.send_monthly" diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py index 085365c366..150342d406 100644 --- a/frappe/utils/change_log.py +++ b/frappe/utils/change_log.py @@ -9,6 +9,7 @@ import frappe from frappe.utils import cstr import requests from frappe import _ +import git def get_change_log(user=None): if not user: user = frappe.session.user @@ -101,7 +102,12 @@ def get_versions(): } if versions[app]['branch'] != 'master': - branch_version = app_hooks.get('{0}_version'.format(versions[app]['branch'])) + try: + app_repo = git.Repo(os.path.join('..', 'apps', '{}'.format(app))) + branch_version = '-'.join(app_repo.git.describe().split('-')[:2]) + branch_version = [branch_version.strip('v')] + except: + branch_version = app_hooks.get('{0}_version'.format(versions[app]['branch'])) if branch_version: versions[app]['branch_version'] = branch_version[0] + ' ({0})'.format(get_app_last_commit_ref(app)) @@ -137,7 +143,7 @@ def check_for_update(): github_version, org_name = app_details # Get local instance's current version or the app - instance_version = Version(apps[app]['version']) + instance_version = Version(apps[app]['branch_version'].split(' ')[0]) # Compare and popup update message for update_type in updates: if github_version.__dict__[update_type] > instance_version.__dict__[update_type]: @@ -149,6 +155,7 @@ def check_for_update(): title = apps[app]['title'], )) break + if github_version.__dict__[update_type] < instance_version.__dict__[update_type]: break add_message_to_redis(updates) @@ -196,6 +203,7 @@ def show_update_popup(): return updates = json.loads(update_info) + current_versions = get_versions() # Check if user is int the set of users to send update message to update_message = "" diff --git a/requirements.txt b/requirements.txt index 8d8a564667..77c443a939 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,3 +50,4 @@ premailer croniter googlemaps urllib3==1.23 +GitPython==2.1.11 From d4a062fdbdb939a76607933abdb02e483ac72bcd Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Fri, 19 Oct 2018 12:38:36 +0000 Subject: [PATCH 15/16] bumped to version 10.1.54 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 996458ec6f..af607414e5 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__ = '10.1.53' +__version__ = '10.1.54' __title__ = "Frappe Framework" local = Local() From 86b328bae5b640f8162770503d05186dc5beec76 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Fri, 19 Oct 2018 12:50:05 +0000 Subject: [PATCH 16/16] bumped to version 11.0.3-beta.12 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 2a3cd586e6..f20d77d13f 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.11' +staging_version = '11.0.3-beta.12' app_email = "info@frappe.io"