From b1ec7f8493c2513da71e1e9225b41243c13a1fb8 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 4 Dec 2012 18:07:10 +0530 Subject: [PATCH 1/5] show enter button in link field if read permission --- public/js/legacy/widgets/form/fields.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js index bf512a25b1..f0c8dfbeb8 100644 --- a/public/js/legacy/widgets/form/fields.js +++ b/public/js/legacy/widgets/form/fields.js @@ -569,13 +569,13 @@ LinkField.prototype.make_input = function() { } me.onrefresh = function() { - $(me.btn2).toggle(in_list(wn.boot.profile.can_create, me.df.options)) - $(me.btn1).toggle(me.df.options=='[Select]'); + $(me.btn2).toggle(in_list(wn.boot.profile.can_create, me.df.options)); + $(me.btn1).toggle(in_list(wn.boot.profile.can_read, me.df.options)); } me.onrefresh(); - me.txt.field_object = this; + me.txt.field_object = this; // set onchange triggers me.input.set_input = function(val) { From 00ea2db5730af45eb65e2ad6660f3dfa097b62ff Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 5 Dec 2012 12:28:01 +0530 Subject: [PATCH 2/5] when validating doctype, do not get from cache --- core/doctype/doctype/doctype.py | 2 +- webnotes/model/doctype.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/doctype/doctype/doctype.py b/core/doctype/doctype/doctype.py index fce3f1124b..c6dbb1e0c4 100644 --- a/core/doctype/doctype/doctype.py +++ b/core/doctype/doctype/doctype.py @@ -177,7 +177,7 @@ class DocType: def validate_fields_for_doctype(doctype): from webnotes.model.doctype import get validate_fields(filter(lambda d: d.doctype=="DocField" and d.parent==doctype, - get(doctype))) + get(doctype, cached=False))) def validate_fields(fields): def check_illegal_characters(fieldname): diff --git a/webnotes/model/doctype.py b/webnotes/model/doctype.py index cbc8a36ad1..e8e034a122 100644 --- a/webnotes/model/doctype.py +++ b/webnotes/model/doctype.py @@ -42,11 +42,11 @@ import webnotes.model.doclist doctype_cache = {} docfield_types = None -def get(doctype, processed=False): +def get(doctype, processed=False, cached=True): """return doclist""" - - doclist = from_cache(doctype, processed) - if doclist: return DocTypeDocList(doclist) + if cached: + doclist = from_cache(doctype, processed) + if doclist: return DocTypeDocList(doclist) load_docfield_types() From 012ed679855003b9785a6dfc9204011bdee5dcff Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 5 Dec 2012 12:41:37 +0530 Subject: [PATCH 3/5] round float to 6 decimals on client side --- public/js/legacy/utils/datatype.js | 2 +- public/js/wn/form/formatters.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/js/legacy/utils/datatype.js b/public/js/legacy/utils/datatype.js index ac99e19e03..eaaed74fca 100644 --- a/public/js/legacy/utils/datatype.js +++ b/public/js/legacy/utils/datatype.js @@ -165,7 +165,7 @@ function flt(v,decimals) { if(isNaN(v)) v=0; if(decimals!=null) - return parseFloat(v.toFixed(decimals)); + return roundNumber(v, decimals); return v; } diff --git a/public/js/wn/form/formatters.js b/public/js/wn/form/formatters.js index 697ed5ab39..e5ff50eadf 100644 --- a/public/js/wn/form/formatters.js +++ b/public/js/wn/form/formatters.js @@ -6,7 +6,7 @@ wn.form.formatters = { return value==null ? "" : value }, Float: function(value) { - return flt(value).toFixed(6); + return flt(value, 6); }, Int: function(value) { return cint(value); From 33d91fbfde603412096428f02cd7386ba402c0ec Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 5 Dec 2012 12:44:43 +0530 Subject: [PATCH 4/5] fix in form header image rendering --- public/js/legacy/widgets/form/form_header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/legacy/widgets/form/form_header.js b/public/js/legacy/widgets/form/form_header.js index bd788749de..fb6ac66ef9 100644 --- a/public/js/legacy/widgets/form/form_header.js +++ b/public/js/legacy/widgets/form/form_header.js @@ -56,7 +56,7 @@ _f.FrmHeader = Class.extend({ $(repl('\ \ \ - ', { + ', { created_by: wn.user_info(doc.owner).fullname, avatar_created: wn.user_info(doc.owner).image, modified_by: wn.user_info(doc.modified_by).fullname, From 41f5c4b638c2c0bd6737047b73abace40b71f75d Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 5 Dec 2012 13:53:22 +0530 Subject: [PATCH 5/5] fixes in print format --- public/js/legacy/widgets/form/print_format.js | 2 +- public/js/wn/print/print_table.js | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/public/js/legacy/widgets/form/print_format.js b/public/js/legacy/widgets/form/print_format.js index 017a934db3..abfd9f7a98 100644 --- a/public/js/legacy/widgets/form/print_format.js +++ b/public/js/legacy/widgets/form/print_format.js @@ -347,7 +347,7 @@ $.extend(_p, { } var finished = header + stat - + container.innerHTML.replace(/
").html(label) + $("").html(label) .appendTo(headrow) .css(me.head_cell_style) .css({"width": me.widths[ci] + "%"}); @@ -170,7 +170,8 @@ wn.print.Table = Class.extend({ cell_style: { border: '1px solid #999', padding: '3px', - 'vertical-align': 'top' + 'vertical-align': 'top', + 'word-wrap': 'break-word', }, head_cell_style: { @@ -178,7 +179,8 @@ wn.print.Table = Class.extend({ padding: '3px', 'vertical-align': 'top', 'background-color': '#ddd', - 'font-weight': 'bold' + 'font-weight': 'bold', + 'word-wrap': 'break-word', }, table_style: {