From 2002d097c893551b4d3117ad5cc4bac152659fae Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 27 Oct 2016 12:49:00 +0530 Subject: [PATCH 1/3] [fix] datepicker z-index --- frappe/public/css/desk.css | 3 +++ frappe/public/css/website.css | 3 +++ frappe/public/less/desk.less | 3 +++ 3 files changed, 9 insertions(+) diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css index ba87834304..494a91d906 100644 --- a/frappe/public/css/desk.css +++ b/frappe/public/css/desk.css @@ -354,6 +354,9 @@ fieldset[disabled] .form-control { border-bottom: 1px solid #EBEFF2; } /* jquery ui */ +.ui-datepicker { + z-index: 100 !important; +} .ui-datepicker .ui-datepicker-header { border-radius: 0px !important; } diff --git a/frappe/public/css/website.css b/frappe/public/css/website.css index b79a8795a1..10124bb4df 100644 --- a/frappe/public/css/website.css +++ b/frappe/public/css/website.css @@ -67,6 +67,9 @@ a.text-muted, a.text-extra-muted { text-decoration: none; } +.underline { + text-decoration: underline; +} /* the element that this class is applied to, should have a max width for this to work*/ .text-ellipsis, .ellipsis { diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 91a2d51b86..c170b2abdf 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -144,6 +144,9 @@ textarea.form-control { /* jquery ui */ +.ui-datepicker { + z-index: 100 !important; +} .ui-datepicker .ui-datepicker-header { border-radius: 0px !important; From a940923e7574dc72efc38e03ed76c5ed09c69719 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 27 Oct 2016 15:21:47 +0530 Subject: [PATCH 2/3] [fix] add get_query via individual _tree --- frappe/public/js/frappe/views/treeview.js | 28 ++++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js index ec4020bad2..f699e6cf60 100644 --- a/frappe/public/js/frappe/views/treeview.js +++ b/frappe/public/js/frappe/views/treeview.js @@ -68,6 +68,7 @@ frappe.views.TreeView = Class.extend({ }, make_filters: function(){ var me = this; + frappe.treeview_settings.filters = [] $.each(this.opts.filters || [], function(i, filter){ if(frappe.route_options && frappe.route_options[filter.fieldname]) { filter.default = frappe.route_options[filter.fieldname] @@ -76,6 +77,7 @@ frappe.views.TreeView = Class.extend({ me.page.add_field(filter).$input .change(function() { me.args[$(this).attr("data-fieldname")] = $(this).val(); + frappe.treeview_settings.filters = me.args; me.make_tree(); }) @@ -179,25 +181,11 @@ frappe.views.TreeView = Class.extend({ fields: me.fields }) - me.args["parent_"+me.doctype.toLowerCase()] = me.args["parent"]; + me.args["parent_"+me.doctype.toLowerCase().replace(/ /g,'_')] = me.args["parent"]; + d.set_value("is_group", 0); d.set_values(me.args); - // set query to all link fields if company field exists - if (me.args["company"]) { - $.each(me.fields, function(i, field){ - if(field.fieldtype == "Link") { - d.fields_dict[field.fieldname].get_query = function() { - return { - filters:{ - "company": me.args["company"] - } - } - }; - } - }) - } - // create d.set_primary_action(__("Create New"), function() { var btn = this; @@ -246,15 +234,17 @@ frappe.views.TreeView = Class.extend({ this.fields = this.opts.fields; } - var mandatory_fields = $.map(me.opts.meta.fields, - function(d) { return (d.reqd || d.bold && !d.read_only) ? d : null }); + this.ignore_fields = this.opts.ignore_fields || []; + + var mandatory_fields = $.map(me.opts.meta.fields, function(d) { + return (d.reqd || d.bold && !d.read_only) ? d : null }); var opts_field_names = this.fields.map(function(d) { return d.fieldname }) mandatory_fields.map(function(d) { - if($.inArray(d.fieldname, opts_field_names) === -1) { + if($.inArray(d.fieldname, me.ignore_fields) === -1 && $.inArray(d.fieldname, opts_field_names) === -1) { me.fields.push(d) } }) From c7ebe7933047cf656174333fd299886ca39495de Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 27 Oct 2016 19:37:25 +0600 Subject: [PATCH 3/3] bumped to version 7.1.2 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 2e122d62a6..4b6d130b52 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__ = '7.1.1' +__version__ = '7.1.2' __title__ = "Frappe Framework" local = Local()