From 7250481f382d7686355c68b7f390e99337c7c477 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 29 Nov 2017 16:10:38 +0530 Subject: [PATCH 1/4] [minor] make go premium button less annyoing --- frappe/public/js/frappe/list/list_sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js index ed9d767dd1..8d72b24dd4 100644 --- a/frappe/public/js/frappe/list/list_sidebar.js +++ b/frappe/public/js/frappe/list/list_sidebar.js @@ -323,7 +323,7 @@ frappe.views.ListSidebar = Class.extend({
Go Premium

Upgrade to a premium plan with more users, storage and priority support.

- + `).appendTo(upgrade_list); upgrade_box.find('.btn-primary').on('click', () => { From 3ed3b7badc13a26bf5a350432416e4f9e4efacbf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 29 Nov 2017 16:34:28 +0530 Subject: [PATCH 2/4] [fix] tag error for hidden forms --- frappe/public/js/frappe/ui/tags.js | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/ui/tags.js b/frappe/public/js/frappe/ui/tags.js index 4fef3135cf..f99da28ff7 100644 --- a/frappe/public/js/frappe/ui/tags.js +++ b/frappe/public/js/frappe/ui/tags.js @@ -12,8 +12,24 @@ frappe.ui.TagEditor = Class.extend({ - docname */ $.extend(this, opts); + + this.setup_taggle(); + + if (!this.user_tags) { + this.user_tags = ""; + } + this.initialized = true; + this.refresh(this.user_tags); + }, + setup_taggle: function() { var me = this; - this.wrapper = $('
').appendTo(this.parent) + + // hidden form, does not have parent + if (!this.parent) { + return; + } + + this.wrapper = $('
').appendTo(this.parent); if(!this.wrapper.length) return; var id = frappe.dom.set_unique_id(this.wrapper); this.taggle = new Taggle(id, { @@ -48,12 +64,8 @@ frappe.ui.TagEditor = Class.extend({ } } }); - if (!this.user_tags) { - this.user_tags = ""; - } - this.initialized = true; - this.refresh(this.user_tags); this.setup_awesomplete(); + this.setup_complete = true; }, setup_awesomplete: function() { var me = this; @@ -100,8 +112,7 @@ frappe.ui.TagEditor = Class.extend({ }, refresh: function(user_tags) { var me = this; - if(!me.initialized || me.refreshing) - return; + if (!this.initialized || !this.setup_complete || this.refreshing) return; me.refreshing = true; try { From 74883d4f36dcf497d76580aad3268cd7f5894413 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 30 Nov 2017 14:28:12 +0530 Subject: [PATCH 3/4] Set owner in Deleted Document (#4556) --- frappe/model/delete_doc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index 703796738d..6ff425657c 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -116,7 +116,8 @@ def add_to_deleted_document(doc): doctype='Deleted Document', deleted_doctype=doc.doctype, deleted_name=doc.name, - data=doc.as_json() + data=doc.as_json(), + owner=frappe.session.user )).db_insert() def update_naming_series(doc): From a9801ba8e38f05e3b8381733b5221d5f41739b46 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 30 Nov 2017 17:10:44 +0600 Subject: [PATCH 4/4] bumped to version 9.2.19 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 11e7cfd35c..7894d3a24b 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__ = '9.2.18' +__version__ = '9.2.19' __title__ = "Frappe Framework" local = Local()