From 13baefe6995e344640123170dae5d71c45ac0487 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 13 Jul 2012 16:46:39 +0530 Subject: [PATCH 1/2] functions for rendering bar graph and icons --- js/wn/views/doclistview.js | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/js/wn/views/doclistview.js b/js/wn/views/doclistview.js index 664695f943..117aadc8cb 100644 --- a/js/wn/views/doclistview.js +++ b/js/wn/views/doclistview.js @@ -374,7 +374,7 @@ wn.views.ListView = Class.extend({ // content if(typeof opts.content=='function') { - opts.content(parent, data); + opts.content(parent, data, me); } else if(opts.content=='name') { $(parent).append(repl('%(name)s', data)); @@ -399,16 +399,7 @@ wn.views.ListView = Class.extend({ $(parent).append(data.when); } else if(opts.type=='bar-graph') { - args = { - percent: data[opts.content], - fully_delivered: (data[opts.content] > 99 ? 'bar-complete' : ''), - label: opts.label - } - $(parent).append(repl('\ - \ - ', args)); + this.render_bar_graph(parent, data, opts.content, opts.label); } else if(opts.type=='link' && opts.doctype) { $(parent).append(repl('\ + \ + ', args)); + }, + render_icon: function(parent, icon_class, label) { + var icon_html = ""; + $(parent).append(repl(icon_html, {icon_class: icon_class, label: label})); } }); From 06593f397d8ea2dba28f57831a07a3b858015c86 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 16 Jul 2012 12:17:30 +0530 Subject: [PATCH 2/2] show assign to only after save --- js/legacy/wn/widgets/form/sidebar.js | 5 +---- js/wn/views/doclistview.js | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/js/legacy/wn/widgets/form/sidebar.js b/js/legacy/wn/widgets/form/sidebar.js index 70dc021fad..9333062ad1 100644 --- a/js/legacy/wn/widgets/form/sidebar.js +++ b/js/legacy/wn/widgets/form/sidebar.js @@ -103,10 +103,7 @@ wn.widgets.form.sidebar = { Sidebar: function(form) { render: function(wrapper) { me.form.assign_to = new wn.widgets.form.sidebar.AssignTo(wrapper, me, me.form.doctype, me.form.docname); }, - display: function() { - if(me.form.doc.__local) return false; - else return true; - } + display: function() { return !me.form.doc.__islocal } }, { diff --git a/js/wn/views/doclistview.js b/js/wn/views/doclistview.js index 117aadc8cb..aad2fa8b7f 100644 --- a/js/wn/views/doclistview.js +++ b/js/wn/views/doclistview.js @@ -508,7 +508,7 @@ wn.views.ListView = Class.extend({ }, render_icon: function(parent, icon_class, label) { var icon_html = ""; - $(parent).append(repl(icon_html, {icon_class: icon_class, label: label})); + $(parent).append(repl(icon_html, {icon_class: icon_class, label: label || ''})); } });