From 56e0504cd0ae6f202ecdab6b627eb3ebad6634a6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 30 Mar 2013 11:56:13 +0530 Subject: [PATCH 1/2] [data-import] [fix] changed template to remove -- separators that get removed for some reason --- core/page/data_import_tool/data_import_tool.py | 6 +++--- public/js/wn/views/listview.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/page/data_import_tool/data_import_tool.py b/core/page/data_import_tool/data_import_tool.py index 4ff16ce407..f18a61a254 100644 --- a/core/page/data_import_tool/data_import_tool.py +++ b/core/page/data_import_tool/data_import_tool.py @@ -8,7 +8,7 @@ from webnotes.utils import cstr, cint, flt from webnotes.utils.datautils import UnicodeWriter data_keys = webnotes._dict({ - "data_separator": '----Start entering data below this line----', + "data_separator": '::: Start entering data below this line :::', "main_table": "Table:", "parent_table": "Parent Table:", "columns": "Column Name:" @@ -68,7 +68,7 @@ def get_template(): else: w.writerow(['']) - w.writerow(['----']) + w.writerow([':::']) w.writerow(['Notes:']) w.writerow(['Please do not change the template headings.']) w.writerow(['First data column must be blank.']) @@ -80,7 +80,7 @@ def get_template(): if key == "parent": w.writerow(['"Parent" signifies the parent table in which this row must be added']) w.writerow(['If you are updating, please select "Overwrite" else existing rows will not be deleted.']) - w.writerow(['----']) + w.writerow([':::']) labelrow = ["Column Labels", "ID"] fieldrow = [data_keys.columns, key] mandatoryrow = ['Mandatory:', 'Yes'] diff --git a/public/js/wn/views/listview.js b/public/js/wn/views/listview.js index af4b9c3b12..7d4add01d3 100644 --- a/public/js/wn/views/listview.js +++ b/public/js/wn/views/listview.js @@ -123,7 +123,7 @@ wn.views.ListView = Class.extend({ // make table $.each(this.columns, function(i, v) { if(v.content && v.content.substr && v.content.substr(0,6)=="avatar") { - rowhtml += repl(''); + rowhtml += repl(''); } else { rowhtml += repl('', v); } From d8d27d3d8a8fe9976103cc6980a801a3bd210fa9 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Sat, 30 Mar 2013 22:10:03 +0530 Subject: [PATCH 2/2] [sessions] [fix] minor fix to eval session data --- webnotes/sessions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webnotes/sessions.py b/webnotes/sessions.py index aa122b25f0..5bcc7204bd 100644 --- a/webnotes/sessions.py +++ b/webnotes/sessions.py @@ -195,7 +195,7 @@ class Session: TIMEDIFF(NOW(), lastupdate) < TIME(%s)""", (self.sid, self.get_expiry_period())) if rec: - data = webnotes._dict(eval(rec and rec[0][1] or {})) + data = webnotes._dict(eval(rec and rec[0][1] or '{}')) data.user = rec[0][0] else: self.delete_session()