Browse Source

HUE-2008 [pig] Clicking on the stop button should stop on the frontend

Added $.post fail handler
Moved New script label
Enrico Berti 11 years ago
parent
commit
b43a601
2 changed files with 21 additions and 13 deletions
  1. 9 6
      apps/pig/src/pig/templates/app.mako
  2. 12 7
      apps/pig/static/js/pig.ko.js

+ 9 - 6
apps/pig/src/pig/templates/app.mako

@@ -123,6 +123,11 @@ ${ commonheader(None, "pig", user) | n,unicode }
                 <i class="fa fa-floppy-o"></i> ${ _('Save') }
               </a>
             </li>
+            <li data-bind="click: confirmNewScript">
+              <a href="#" title="${ _('New script') }" rel="tooltip" data-placement="right">
+                <i class="fa fa-plus-circle"></i> ${ _('New Script') }
+              </a>
+            </li>
             <li class="nav-header">${_('Run')}</li>
             <li data-bind="click: runOrShowSubmissionModal, visible: !currentScript().isRunning()">
               <a href="#" title="${ _('Run the script') }" rel="tooltip" data-placement="right">
@@ -139,7 +144,6 @@ ${ commonheader(None, "pig", user) | n,unicode }
                 <i class="fa fa-tasks"></i> ${ _('Logs') }
               </a>
             </li>
-            <li class="nav-header">${_('File')}</li>
             <li data-bind="visible: currentScript().id() != -1, click: copyScript">
               <a href="#" title="${ _('Copy the script') }" rel="tooltip" data-placement="right">
                 <i class="fa fa-files-o"></i> ${ _('Copy') }
@@ -150,11 +154,6 @@ ${ commonheader(None, "pig", user) | n,unicode }
                 <i class="fa fa-trash-o"></i> ${ _('Delete') }
               </a>
             </li>
-            <li data-bind="click: confirmNewScript">
-              <a href="#" title="${ _('New script') }" rel="tooltip" data-placement="right">
-                <i class="fa fa-plus-circle"></i> ${ _('Script') }
-              </a>
-            </li>
             <li>
             <a href="#" id="help">
               <i class="fa fa-question-circle"></i>
@@ -1128,6 +1127,10 @@ ${ commonheader(None, "pig", user) | n,unicode }
       forceLogsAtEnd = true;
     });
 
+    $(document).on("stopError", function () {
+      $.jHueNotify.error(LABELS.KILL_ERROR);
+    });
+
     var _resizeTimeout = -1;
     $(window).on("resize", function () {
       window.clearTimeout(_resizeTimeout);

+ 12 - 7
apps/pig/static/js/pig.ko.js

@@ -541,13 +541,18 @@ var PigViewModel = function (props) {
   function callStop(script) {
     $(document).trigger("stopping");
     $.post(self.STOP_URL, {
-        id: script.id()
-      },
-      function (data) {
-        $(document).trigger("stopped");
-        $("#stopModal").modal("hide");
-      }, "json"
-    );
+          id: script.id()
+        },
+        function (data) {
+          $(document).trigger("stopped");
+          $("#stopModal").modal("hide");
+        }, "json"
+    ).fail(function () {
+      self.currentScript().isRunning(false);
+      $(document).trigger("stopError");
+      $(document).trigger("stopped");
+      $("#stopModal").modal("hide");
+    });
   }
 
   function callCopy(script) {