Merge remote branch 'upstream/master'

2014-06-02 16:19:05 -04:00
parent 230fd25b34 f115d60768
commit 022e2a8248
9 changed files with 92 additions and 80 deletions
--- a/workflow/engine/xmlform/tracker/tracker_Configuration.xml
+++ b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
@@ -64,9 +64,9 @@ var editStagesMap = function(sProcessUID) {
  oPanel.events = {
  	remove: function() { 
  	  delete(oPanel); 
-  	  if(menu_edit.maked === true){
+  	  if(typeof menu_edit != "undefined" && menu_edit.maked === true){
  	      menu_edit.remove();
-  	  } else if (menu_add.maked === true) {
+  	  } else if (typeof menu_add != "undefined" && menu_add.maked === true) {
  	      menu_add.remove();
  	  }
  	}.extend(this)