浏览代码

HUE-933 [oozie] Ribbon and confirmation popup are triggered when new action creation is cancelled

abec 13 年之前
父节点
当前提交
6bb12873bc
共有 2 个文件被更改,包括 11 次插入13 次删除
  1. 5 7
      apps/oozie/src/oozie/templates/editor/edit_workflow.mako
  2. 6 6
      apps/oozie/static/js/workflow.js

+ 5 - 7
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -509,7 +509,7 @@ $.extend(Workflow.prototype, {
       data: { workflow: JSON.stringify(data) },
       data: { workflow: JSON.stringify(data) },
       success: function() {
       success: function() {
         $.jHueNotify.info("${ _('Workflow saved') }");
         $.jHueNotify.info("${ _('Workflow saved') }");
-        workflow.model.is_dirty = false;
+        workflow.is_dirty = false;
       },
       },
       error: function() {
       error: function() {
         $.jHueNotify.error("${ _('Could not save workflow') }");
         $.jHueNotify.error("${ _('Could not save workflow') }");
@@ -575,7 +575,7 @@ $('#workflow').on('click', '.edit-node-link', function(e) {
 
 
   var try_save = function(e) {
   var try_save = function(e) {
     if (node.validate()) {
     if (node.validate()) {
-      workflow.model.is_dirty = true;
+      workflow.is_dirty = true;
       modal.hide();
       modal.hide();
     }
     }
   };
   };
@@ -611,7 +611,7 @@ $('#workflow').on('click', '.new-node-link', function(e) {
 
 
   var try_save = function(e) {
   var try_save = function(e) {
     if (node.validate()) {
     if (node.validate()) {
-      workflow.model.is_dirty = true;
+      workflow.is_dirty = true;
       modal.hide();
       modal.hide();
       // save, add node to workflow.
       // save, add node to workflow.
       workflow.nodes()[workflow.nodes().length - 2].append(node);
       workflow.nodes()[workflow.nodes().length - 2].append(node);
@@ -623,8 +623,6 @@ $('#workflow').on('click', '.new-node-link', function(e) {
   modal.el.on('click', '.close', cancel_edit);
   modal.el.on('click', '.close', cancel_edit);
   modal.el.on('click', '.cancelButton', cancel_edit);
   modal.el.on('click', '.cancelButton', cancel_edit);
   modal.el.on('click', '.doneButton', try_save);
   modal.el.on('click', '.doneButton', try_save);
-
-  workflow.model.is_dirty = true;
 });
 });
 
 
 ko.bindingHandlers.fileChooser = {
 ko.bindingHandlers.fileChooser = {
@@ -650,7 +648,7 @@ var addAutoComplete = function(i, elem) {
 };
 };
 
 
 window.onbeforeunload = function (e) {
 window.onbeforeunload = function (e) {
-  if (workflow.model.is_dirty) {
+  if (workflow.is_dirty) {
     var message = "${ _('You have unsaved changes in this workflow.') }";
     var message = "${ _('You have unsaved changes in this workflow.') }";
 
 
     if (!e) e = window.event;
     if (!e) e = window.event;
@@ -676,7 +674,7 @@ $(document).ready(function () {
 });
 });
 
 
 function checkModelDirtiness() {
 function checkModelDirtiness() {
-  if (workflow.model.is_dirty) {
+  if (workflow.is_dirty) {
     $(".ribbon-wrapper").fadeIn();
     $(".ribbon-wrapper").fadeIn();
   }
   }
   else {
   else {

+ 6 - 6
apps/oozie/static/js/workflow.js

@@ -1481,7 +1481,7 @@ var WorkflowModule = function($, NodeModelChooser, Node, ForkNode, DecisionNode,
     $.each(mapping['__ko_mapping__'].mappedProperties, function(key, value) {
     $.each(mapping['__ko_mapping__'].mappedProperties, function(key, value) {
       var key = key;
       var key = key;
       self[key].subscribe(function(value) {
       self[key].subscribe(function(value) {
-        workflow.model.is_dirty = true;
+        workflow.is_dirty = true;
         self.model[key] = ko.mapping.toJS(value);
         self.model[key] = ko.mapping.toJS(value);
       });
       });
     });
     });
@@ -1584,7 +1584,7 @@ var WorkflowModule = function($, NodeModelChooser, Node, ForkNode, DecisionNode,
             }
             }
           }
           }
         });
         });
-        workflow.model.is_dirty = false;
+        workflow.is_dirty = false;
       }
       }
     },
     },
 
 
@@ -1626,7 +1626,7 @@ var WorkflowModule = function($, NodeModelChooser, Node, ForkNode, DecisionNode,
 
 
       // $(".propKey").each(addAutoComplete);
       // $(".propKey").each(addAutoComplete);
 
 
-      workflow.model.is_dirty = true;
+      workflow.is_dirty = true;
     },
     },
 
 
     removeNode: function(node, event) {
     removeNode: function(node, event) {
@@ -1637,7 +1637,7 @@ var WorkflowModule = function($, NodeModelChooser, Node, ForkNode, DecisionNode,
 
 
       self.rebuild();
       self.rebuild();
 
 
-      workflow.model.is_dirty = true;
+      workflow.is_dirty = true;
     },
     },
 
 
     save: function( options ) {},
     save: function( options ) {},
@@ -1910,7 +1910,7 @@ var WorkflowModule = function($, NodeModelChooser, Node, ForkNode, DecisionNode,
               // End of decision tree is being dragged to the bottom of a branch
               // End of decision tree is being dragged to the bottom of a branch
               draggable.detach();
               draggable.detach();
               newParent.append(draggable);
               newParent.append(draggable);
-              workflow.model.is_dirty = true;
+              workflow.is_dirty = true;
               self.rebuild();
               self.rebuild();
             }
             }
           } else {
           } else {
@@ -1944,7 +1944,7 @@ var WorkflowModule = function($, NodeModelChooser, Node, ForkNode, DecisionNode,
               newParent.append(draggable);
               newParent.append(draggable);
             break;
             break;
             }
             }
-            workflow.model.is_dirty = true;
+            workflow.is_dirty = true;
             self.rebuild();
             self.rebuild();
           }
           }
         }
         }