Răsfoiți Sursa

HUE-1175 [pig] No submission confirmation popup if parameters list is empty

Abraham Elmahrek 12 ani în urmă
părinte
comite
4c5d271
2 a modificat fișierele cu 16 adăugiri și 12 ștergeri
  1. 1 1
      apps/pig/src/pig/templates/app.mako
  2. 15 11
      apps/pig/static/js/pig.ko.js

+ 1 - 1
apps/pig/src/pig/templates/app.mako

@@ -123,7 +123,7 @@ ${ commonheader(_('Pig'), "pig", user, "100px") | n,unicode }
                 <i class="icon-save"></i> ${ _('Save') }
               </a>
             </li>
-            <li data-bind="click: showSubmissionModal, visible: !currentScript().isRunning()">
+            <li data-bind="click: runOrShowSubmissionModal, visible: !currentScript().isRunning()">
               <a href="#" title="${ _('Run the script') }" rel="tooltip" data-placement="right">
                 <i class="icon-play"></i> ${ _('Run') }
               </a>

+ 15 - 11
apps/pig/static/js/pig.ko.js

@@ -272,18 +272,22 @@ var PigViewModel = function (props) {
     }));
   }
 
-  self.showSubmissionModal = function showSubmissionModal() {
+  self.runOrShowSubmissionModal = function runOrShowSubmissionModal() {
     var script = self.currentScript();
-    self.submissionVariables.removeAll();
-    $.each(script.getParameters(), function (key, value) {
-      self.submissionVariables.push({'name': key, 'value': value});
-    });
-    $("#runScriptBtn").button("reset");
-    $("#runScriptBtn").attr("data-loading-text", $("#runScriptBtn").text() + " ...");
-    $("#submitModal").modal({
-      keyboard: true,
-      show: true
-    });
+    if (script.getParameters().length > 0) {
+      self.submissionVariables.removeAll();
+      $.each(script.getParameters(), function (key, value) {
+        self.submissionVariables.push({'name': key, 'value': value});
+      });
+      $("#runScriptBtn").button("reset");
+      $("#runScriptBtn").attr("data-loading-text", $("#runScriptBtn").text() + " ...");
+      $("#submitModal").modal({
+        keyboard: true,
+        show: true
+      });
+    } else {
+      self.runScript();
+    }
   };
 
   self.showStopModal = function showStopModal() {