From 14171bdc72eb3ba96d45f159860a1446e180e1ef Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 21 Jul 2017 16:10:34 +0530 Subject: [PATCH 1/4] Setup filterable only once (#3753) --- frappe/public/js/frappe/list/list_renderer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index d1d07493f2..02940e1bec 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -23,6 +23,7 @@ frappe.views.ListRenderer = Class.extend({ this.page_title = __(this.doctype); this.set_wrapper(); + this.setup_filterable(); this.prepare_render_view(); // flag to enable/disable realtime updates in list_view @@ -270,7 +271,7 @@ frappe.views.ListRenderer = Class.extend({ setup_filterable: function () { var me = this; - this.wrapper.on('click', '.filterable', function (e) { + this.list_view.wrapper.on('click', '.result-list .filterable', function (e) { var filters = $(this).attr('data-filter').split('|'); var added = false; @@ -332,7 +333,6 @@ frappe.views.ListRenderer = Class.extend({ this.render_tags($item_container, value); }); - this.setup_filterable(); }, // returns html for a data item, From 50bfdb74f826326b187cf150d886721b15ed7ad2 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 25 Jul 2017 11:18:30 +0530 Subject: [PATCH 2/4] [hotfix] convert number format to basestring before importing. (#3767) * convert numbers to basestring for link field * Update importer.py --- frappe/core/page/data_import_tool/importer.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index 12d0fc9f44..bab8ab7abd 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -133,6 +133,9 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, elif fieldtype in ("Image", "Attach Image", "Attach"): # added file to attachments list attachments.append(d[fieldname]) + elif d[fieldname] == 'Link': + # as fields can be saved in the number format(long type) in data import template + d[fieldname] = cstr(d[fieldname]) except IndexError: pass From 68c09b9a753136cda2a44646277e783927a769d8 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Tue, 25 Jul 2017 14:20:48 +0530 Subject: [PATCH 3/4] [hot] fix in the data import (#3780) * convert numbers to basestring for link field * fix for link and dynamic link only --- frappe/core/page/data_import_tool/importer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/core/page/data_import_tool/importer.py b/frappe/core/page/data_import_tool/importer.py index bab8ab7abd..3514c1b877 100644 --- a/frappe/core/page/data_import_tool/importer.py +++ b/frappe/core/page/data_import_tool/importer.py @@ -133,9 +133,11 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, elif fieldtype in ("Image", "Attach Image", "Attach"): # added file to attachments list attachments.append(d[fieldname]) - elif d[fieldname] == 'Link': + + elif fieldtype in ("Link", "Dynamic Link") and d[fieldname]: # as fields can be saved in the number format(long type) in data import template d[fieldname] = cstr(d[fieldname]) + except IndexError: pass From 2b48e5206a04d079021a9d3b58e1369eeb429673 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 25 Jul 2017 16:28:28 +0600 Subject: [PATCH 4/4] bumped to version 8.5.8 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index ea4e241278..1a2c09e2cf 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__ = '8.5.7' +__version__ = '8.5.8' __title__ = "Frappe Framework" local = Local()