From 1ef1f2763eca754cb02f720ba384ad84ddecd7bb Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Wed, 13 Nov 2013 19:04:46 +0530 Subject: [PATCH 1/2] [fix] [minor] workflow icon fix --- public/js/wn/form/workflow.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/public/js/wn/form/workflow.js b/public/js/wn/form/workflow.js index 785e613c3c..db71004c95 100644 --- a/public/js/wn/form/workflow.js +++ b/public/js/wn/form/workflow.js @@ -83,19 +83,21 @@ wn.ui.form.States = Class.extend({ var state_doc = wn.model.get("Workflow State", {name:state})[0]; // set the icon - this.workflow_button.find('i').removeClass() + if (state_doc) { + this.workflow_button.find('i').removeClass() .addClass("icon-white") .addClass("icon-" + state_doc.icon); - // set the style - this.workflow_button.removeClass().addClass("btn btn-default dropdown-toggle") + // set the style + this.workflow_button.removeClass().addClass("btn btn-default dropdown-toggle") + + if(state_doc && state_doc.style) + this.workflow_button.addClass("btn-" + state_doc.style.toLowerCase()); + } - if(state_doc && state_doc.style) - this.workflow_button.addClass("btn-" + state_doc.style.toLowerCase()); - // show actions from that state this.show_actions(state); - + if(this.frm.doc.__islocal) { this.workflow_button.prop('disabled', true); } From 9e1c27a11e6c5c397b159b683ee2cf41ec850e1c Mon Sep 17 00:00:00 2001 From: Akhilesh Darjee Date: Wed, 13 Nov 2013 19:07:03 +0530 Subject: [PATCH 2/2] [fix] [minor] workflow icon fix --- public/js/wn/form/workflow.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/wn/form/workflow.js b/public/js/wn/form/workflow.js index db71004c95..ebe2f1363f 100644 --- a/public/js/wn/form/workflow.js +++ b/public/js/wn/form/workflow.js @@ -82,11 +82,11 @@ wn.ui.form.States = Class.extend({ var state_doc = wn.model.get("Workflow State", {name:state})[0]; - // set the icon if (state_doc) { + // set the icon this.workflow_button.find('i').removeClass() - .addClass("icon-white") - .addClass("icon-" + state_doc.icon); + .addClass("icon-white") + .addClass("icon-" + state_doc.icon); // set the style this.workflow_button.removeClass().addClass("btn btn-default dropdown-toggle")