Browse Source

HUE-1117 [jobsub] Various js bugs

check all checkbox checked even if no workflows
create new worklow 400 error
then listing workflow has js error
Args arg get FB button appended all the time (should not be added if already there, like in Oozie)
The legend "You can parameterize..." should not escape the <code>
Abraham Elmahrek 12 years ago
parent
commit
ae98d74e99

+ 2 - 1
apps/jobsub/src/jobsub/templates/designs.mako

@@ -104,7 +104,7 @@ ${ commonheader(_('Job Designer'), "jobsub", user, "60px") | n,unicode }
       <thead>
       <thead>
         <tr>
         <tr>
           <th width="1%">
           <th width="1%">
-            <div id="selectAll" data-bind="click: toggleSelectAll, css: {hueCheckbox: true, 'icon-ok': selectedDesignObjects().length == designs().length}"></div>
+            <div id="selectAll" data-bind="click: toggleSelectAll, css: {hueCheckbox: true, 'icon-ok': allSelected}"></div>
           </th>
           </th>
           <th>${_('Name')}</th>
           <th>${_('Name')}</th>
           <th>${_('Description')}</th>
           <th>${_('Description')}</th>
@@ -194,6 +194,7 @@ $(document).bind('initialize.designs', function() {
       null,
       null,
       null,
       null,
       null,
       null,
+      null,
       { "sSortDataType": "dom-sort-value", "sType": "numeric" }
       { "sSortDataType": "dom-sort-value", "sType": "numeric" }
     ],
     ],
     "aaSorting": [[ 5, "desc" ]],
     "aaSorting": [[ 5, "desc" ]],

+ 0 - 1
apps/jobsub/static/js/jobsub.js

@@ -155,7 +155,6 @@ function getFileBrowseButton(inputElement) {
       initialPath: inputElement.val(),
       initialPath: inputElement.val(),
       onFileChoose: function(filePath) {
       onFileChoose: function(filePath) {
         inputElement.val(filePath);
         inputElement.val(filePath);
-        inputElement.change();
         $("#chooseFile").modal("hide");
         $("#chooseFile").modal("hide");
       },
       },
       createFolder: false
       createFolder: false

+ 1 - 1
apps/jobsub/static/js/jobsub.ko.js

@@ -264,7 +264,7 @@ var Designs = (function($, ko, NodeModelChooser) {
       return selected;
       return selected;
     });
     });
     self.allSelected = ko.computed(function() {
     self.allSelected = ko.computed(function() {
-      return self.selectedDesignObjects().length == self.designs().length;
+      return self.selectedDesignObjects().length == self.designs().length && self.selectedDesignObjects().length > 0;
     });
     });
 
 
     self.initialize(options);
     self.initialize(options);

+ 1 - 1
apps/jobsub/static/templates/actions/distcp.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       {{#prepares}}
       {{#prepares}}

+ 2 - 2
apps/jobsub/static/templates/actions/email.html

@@ -31,8 +31,8 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
-        <p class="alert alert-info">{{ smtp_alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
+        <p class="alert alert-info">{{{ smtp_alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ to.name }}" data-content="{{ to.popover }}" data-bind="attr: {'class': ( errors.to().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ to.name }}" data-content="{{ to.popover }}" data-bind="attr: {'class': ( errors.to().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 1 - 1
apps/jobsub/static/templates/actions/fs.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       {{#deletes}}
       {{#deletes}}

+ 1 - 1
apps/jobsub/static/templates/actions/hive.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ script_path.name }}" data-content="{{ script_path.popover }}" data-bind="attr: {'class': ( errors.script_path().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ script_path.name }}" data-content="{{ script_path.popover }}" data-bind="attr: {'class': ( errors.script_path().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 1 - 1
apps/jobsub/static/templates/actions/java.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ jar_path.name }}" data-content="{{ jar_path.popover }}" data-bind="attr: {'class': ( errors.jar_path().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ jar_path.name }}" data-content="{{ jar_path.popover }}" data-bind="attr: {'class': ( errors.jar_path().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 1 - 1
apps/jobsub/static/templates/actions/mapreduce.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ jar_path.name }}" data-content="{{ jar_path.popover }}" data-bind="attr: {'class': ( errors.jar_path().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ jar_path.name }}" data-content="{{ jar_path.popover }}" data-bind="attr: {'class': ( errors.jar_path().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 1 - 1
apps/jobsub/static/templates/actions/pig.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ script_path.name }}" data-content="{{ script_path.popover }}" data-bind="attr: {'class': ( errors.script_path().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ script_path.name }}" data-content="{{ script_path.popover }}" data-bind="attr: {'class': ( errors.script_path().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 2 - 2
apps/jobsub/static/templates/actions/shell.html

@@ -31,8 +31,8 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
-        <p class="alert alert-info">{{ paths_alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
+        <p class="alert alert-info">{{{ paths_alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ command.name }}" data-content="{{ command.popover }}" data-bind="attr: {'class': ( errors.command().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ command.name }}" data-content="{{ command.popover }}" data-bind="attr: {'class': ( errors.command().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 1 - 1
apps/jobsub/static/templates/actions/sqoop.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ script_path.name }}" data-content="{{ script_path.popover }}" data-bind="attr: {'class': ( errors.script_path().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ script_path.name }}" data-content="{{ script_path.popover }}" data-bind="attr: {'class': ( errors.script_path().length > 0 ) ? 'control-group error' : 'control-group'}">

+ 5 - 5
apps/jobsub/static/templates/actions/ssh.html

@@ -31,8 +31,8 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
-        <p class="alert alert-warn">{{ ssh_alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
+        <p class="alert alert-warn">{{{ ssh_alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ user.name }}" data-content="{{ user.popover }}" data-bind="attr: {'class': ( errors.user().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ user.name }}" data-content="{{ user.popover }}" data-bind="attr: {'class': ( errors.user().length > 0 ) ? 'control-group error' : 'control-group'}">
@@ -65,9 +65,9 @@
         </div>
         </div>
       </div>
       </div>
 
 
-      {{#args}}
-        {{>args}}
-      {{/args}}
+      {{#params}}
+        {{>params}}
+      {{/params}}
     </fieldset>
     </fieldset>
     <div class="form-actions">
     <div class="form-actions">
       <button data-bind="click: {{ save.func }}" class="btn btn-primary">{{ save.name }}</button>
       <button data-bind="click: {{ save.func }}" class="btn btn-primary">{{ save.name }}</button>

+ 1 - 1
apps/jobsub/static/templates/actions/streaming.html

@@ -31,7 +31,7 @@
       <hr/>
       <hr/>
 
 
       <div class="control-group">
       <div class="control-group">
-        <p class="alert alert-info">{{ alert }}</p>
+        <p class="alert alert-info">{{{ alert }}}</p>
       </div>
       </div>
 
 
       <div class="control-group" rel="popover" data-original-title="{{ mapper.name }}" data-content="{{ mapper.popover }}" data-bind="attr: {'class': ( errors.mapper().length > 0 ) ? 'control-group error' : 'control-group'}">
       <div class="control-group" rel="popover" data-original-title="{{ mapper.name }}" data-content="{{ mapper.popover }}" data-bind="attr: {'class': ( errors.mapper().length > 0 ) ? 'control-group error' : 'control-group'}">