From 6e6c48e01b3827a55fd742c881dc55bbe9c7aac0 Mon Sep 17 00:00:00 2001 From: nick9822 Date: Mon, 5 Feb 2018 11:59:45 +0530 Subject: [PATCH 1/5] Set Is Private as per file attribute (#4964) --- frappe/public/js/frappe/form/footer/attachments.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/footer/attachments.js b/frappe/public/js/frappe/form/footer/attachments.js index 28bb51c198..df37f2898d 100644 --- a/frappe/public/js/frappe/form/footer/attachments.js +++ b/frappe/public/js/frappe/form/footer/attachments.js @@ -237,6 +237,7 @@ frappe.ui.get_upload_dialog = function(opts){ dialog.$wrapper.find('[name="file_url"]').val(r.message.file_url); dialog.$wrapper.find('.private-file input').prop('checked', r.message.is_private); opts.args.filename = r.message.file_name; + opts.args.is_private = r.message.is_private; } }); } From 5f6477ae7aa2e6c9e5f9e01961a1af0dd1ac073a Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Tue, 6 Feb 2018 10:41:50 +0530 Subject: [PATCH 2/5] [Fix] Visibility of close icon (#4969) * fix visibility of close button * add margin to close icon --- frappe/public/css/form.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/css/form.css b/frappe/public/css/form.css index 57cbfb50b3..4c8ffb3eac 100644 --- a/frappe/public/css/form.css +++ b/frappe/public/css/form.css @@ -723,6 +723,7 @@ body[data-route^="Form/Communication"] textarea[data-fieldname="subject"] { margin-top: 5px; } .frappe-control[data-fieldtype="Attach"] .attached-file .close { + margin-right: -7px; position: absolute; top: 0; right: 0; From 2625cefe895fb2360758ddffd740899e091c89a4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 6 Feb 2018 15:25:53 +0530 Subject: [PATCH 3/5] [Fix] Link formatter, Indicator not showing in the item link field for stock entry (#4966) * [Fix] Link formatter, Indicator not showing in the item link field for stock entry * Handle empty df --- frappe/public/js/frappe/form/grid.js | 8 ++++++++ frappe/public/js/legacy/client_script_helpers.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index e6be892c0d..9b67442d9a 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -508,6 +508,14 @@ frappe.ui.form.Grid = Class.extend({ } df.colsize = colsize; } + + // attach formatter on refresh + if (df.fieldtype == 'Link' && !df.formatter) { + const docfield = frappe.meta.docfield_map[df.parent][df.fieldname]; + if (docfield && docfield.formatter) { + df.formatter = docfield.formatter; + } + } total_colsize += df.colsize; if(total_colsize > 11) diff --git a/frappe/public/js/legacy/client_script_helpers.js b/frappe/public/js/legacy/client_script_helpers.js index 995c0c20e2..aafac39ca8 100644 --- a/frappe/public/js/legacy/client_script_helpers.js +++ b/frappe/public/js/legacy/client_script_helpers.js @@ -433,7 +433,7 @@ _f.Frm.prototype.set_indicator_formatter = function(fieldname, get_color, get_te }) } - frappe.meta.get_docfield(doctype, fieldname, this.doc.name).formatter = + frappe.meta.docfield_map[doctype][fieldname].formatter = function(value, df, options, doc) { if(value) { return repl('%(label)s', { From 1c24dae0995ca7ba0cf4288b86f0f77ddcf8c0f6 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Wed, 7 Feb 2018 12:29:10 +0530 Subject: [PATCH 4/5] [hotfix] Docname as int (#4976) * [hotfix] Docname passed as number * typo --- frappe/database.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/database.py b/frappe/database.py index 87623a93e1..990ddf37be 100644 --- a/frappe/database.py +++ b/frappe/database.py @@ -396,6 +396,10 @@ class Database: conditions.append(condition) + if isinstance(filters, int): + # docname is a number, convert to string + filters = str(filters) + if isinstance(filters, string_types): filters = { "name": filters } @@ -611,7 +615,7 @@ class Database: order_by = ("order by " + order_by) if order_by else "" r = self.sql("select {0} from `tab{1}` {2} {3} {4}" - .format(fl, doctype, "where" if conditions else "", conditions, order_by), values, + .format(fl, doctype, "where" if conditions else "", conditions, order_by), values, as_dict=as_dict, debug=debug, update=update) return r From b2a7b3f614ebb20a1e016a94aa9c37e391e70e92 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 7 Feb 2018 16:33:28 +0600 Subject: [PATCH 5/5] bumped to version 10.0.21 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index b69991baba..00a86b8b12 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.0.20' +__version__ = '10.0.21' __title__ = "Frappe Framework" local = Local()