From efa0ce679c3aafe44a67057c95438e0acae1a910 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 11 Apr 2017 11:00:20 +0530 Subject: [PATCH 1/6] [fix] minor unfreeze all together --- frappe/public/js/frappe/dom.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/dom.js b/frappe/public/js/frappe/dom.js index 1fb55c3fec..e3d48e5c5b 100644 --- a/frappe/public/js/frappe/dom.js +++ b/frappe/public/js/frappe/dom.js @@ -37,7 +37,7 @@ frappe.dom = { elements[i].parentNode.removeChild(elements[i]); } }); - + // remove links with rel="stylesheet" var elements = div.getElementsByTagName('link'); var i = elements.length; @@ -141,10 +141,7 @@ frappe.dom = { if(!frappe.dom.freeze_count) return; // anything open? frappe.dom.freeze_count--; if(!frappe.dom.freeze_count) { - var freeze = $('#freeze').removeClass("in"); - setTimeout(function() { - if(!frappe.dom.freeze_count) { freeze.remove(); } - }, 150); + var freeze = $('#freeze').removeClass("in").remove(); } }, save_selection: function() { From 25c35515145e9bc7c192d0e0dd8443d370675cde Mon Sep 17 00:00:00 2001 From: Prateeksha Singh Date: Tue, 11 Apr 2017 11:25:11 +0530 Subject: [PATCH 2/6] Awesomplete z-index fixes (#3040) --- frappe/public/css/list.css | 1 + frappe/public/js/frappe/form/control.js | 3 ++- frappe/public/less/list.less | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/css/list.css b/frappe/public/css/list.css index e63080dfb1..20739070de 100644 --- a/frappe/public/css/list.css +++ b/frappe/public/css/list.css @@ -246,6 +246,7 @@ } .taggle_list li .awesomplete > ul { top: 15px; + z-index: 100; } .taggle_list .close { right: 5px; diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 2a62948345..e1b03d0856 100755 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -1418,7 +1418,8 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ }); this.$input.on("awesomplete-open", function(e) { - me.$wrapper.css({"z-index": 101}); + me.$wrapper.css({"z-index": 100}); + me.$wrapper.find('ul').css({"z-index": 100}); me.autocomplete_open = true; }); diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less index cd932b439d..0f2eda8494 100644 --- a/frappe/public/less/list.less +++ b/frappe/public/less/list.less @@ -308,6 +308,7 @@ .awesomplete > ul { top: 15px; + z-index: 100; } } From 41fc67efdd501287fdb9cf45287bab01bd50521a Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 11 Apr 2017 10:56:43 +0530 Subject: [PATCH 3/6] [fix] Date recursion in General Ledger - frappe/erpnext#8369 --- frappe/public/js/frappe/form/control.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index e1b03d0856..ec3e0e678a 100755 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -621,7 +621,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({ if(value && ((this.last_value && this.last_value !== this.value) || (!this.datepicker.selectedDates.length))) { - this.datepicker.selectDate(new Date(value)); + this.datepicker.selectDate(frappe.datetime.str_to_obj(value)); } }, set_date_options: function() { From 709ffadcfee5743a0af1d08dc55f230499c185f2 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 11 Apr 2017 11:00:50 +0530 Subject: [PATCH 4/6] [minor] Fix checkbox margin --- frappe/public/css/page.css | 3 --- frappe/public/less/page.less | 4 ---- 2 files changed, 7 deletions(-) diff --git a/frappe/public/css/page.css b/frappe/public/css/page.css index c8c0b02483..61dc93635e 100644 --- a/frappe/public/css/page.css +++ b/frappe/public/css/page.css @@ -106,9 +106,6 @@ .page-form .checkbox { margin-top: 2px; } -.page-form .checkbox input { - margin-top: -3px; -} select.input-sm { line-height: 1.2em !important; } diff --git a/frappe/public/less/page.less b/frappe/public/less/page.less index 32774dec5e..9c3d40179a 100644 --- a/frappe/public/less/page.less +++ b/frappe/public/less/page.less @@ -130,10 +130,6 @@ margin-top: 2px; } -.page-form .checkbox input { - margin-top: -3px; -} - select.input-sm { line-height: 1.2em !important; } From 8d987d9545a48727cdbf31f38e686f041c5e7382 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 11 Apr 2017 11:13:19 +0530 Subject: [PATCH 5/6] [fix] 'Open Calendar' route in awesome bar --- frappe/public/js/frappe/ui/toolbar/search_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/toolbar/search_utils.js b/frappe/public/js/frappe/ui/toolbar/search_utils.js index 5e227944ca..e12e38dee3 100644 --- a/frappe/public/js/frappe/ui/toolbar/search_utils.js +++ b/frappe/public/js/frappe/ui/toolbar/search_utils.js @@ -233,7 +233,7 @@ frappe.search.utils = { value: __("Open {0}", [__(target)]), index: me.fuzzy_search(keywords, 'Calendar'), match: target, - route: [target, 'Event'], + route: ['List', 'Event', target], }); } return out; From 47a76479034ec92f4299bd509f0c6f950026fdf0 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 11 Apr 2017 12:31:30 +0600 Subject: [PATCH 6/6] bumped to version 8.0.10 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 1b4a60f8c4..caa01ba8a9 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.9' +__version__ = '8.0.10' __title__ = "Frappe Framework" local = Local()