Bläddra i källkod

[oozie] Present the non filled parameters of a workflow in coord submit popup

Romain Rigaux 10 år sedan
förälder
incheckning
bde837e

+ 7 - 15
apps/oozie/src/oozie/models2.py

@@ -1549,23 +1549,15 @@ class Coordinator(Job):
       for param in find_json_parameters(self.sla):
         params.add(param)
 
-# get missed params from wf
+    # Get missed params from workflow
+    for prop in self.workflow.find_parameters():
+      if not prop in params:
+        params.add(prop)
 
-#    for prop in self.workflow.get_parameters():
-#      if not prop['name'] in index:
-#        props.append(prop)
-#        index.append(prop['name'])
-#
-#    # Remove DataInputs and DataOutputs
-#    datainput_names = [_input.name for _input in self.datainput_set.all()]
-#    dataoutput_names = [_output.name for _output in self.dataoutput_set.all()]
-#    removable_names = datainput_names + dataoutput_names
-#    props = filter(lambda prop: prop['name'] not in removable_names, props)
-
-# get $params in wf properties
-# [{'name': parameter['workflow_variable'], 'value': parameter['dataset_variable']} for parameter in self.data['variables'] if parameter['dataset_type'] == 'parameter']
+    # Remove the ones filled up by coordinator
+    removable_names = [ds['workflow_variable'] for ds in self.data['variables']]
 
-    return dict([(param, '') for param in list(params)])
+    return dict([(param, '') for param in list(params) if param not in removable_names])
 
   @property
   def sla_enabled(self):

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -73,7 +73,7 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
                   <li class="nav-header">${ _('Datasets') }</li>
                 % for dataset in coordinator.datasets:
                   <li rel="tooltip" title="${ dataset.data['dataset_variable'] }" class="white">
-                    <i class="fa fa-eye"></i> <span class="dataset">${ dataset.data['dataset_variable'][:20] }</span>
+                    <i class="fa fa-eye"></i> <span class="dataset">${ dataset.data['workflow_variable'] }</span>
                   </li>
                 % endfor
                 % if not coordinator.datasets:

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
apps/oozie/static/js/coordinator-editor.ko.js


+ 2 - 0
apps/oozie/static/js/workflow-editor.ko.js

@@ -1049,6 +1049,7 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
   }
 
   self.save = function () {
+	$(".jHueNotify").hide();
     $.post("/oozie/editor/workflow/save/", {
       "layout": ko.mapping.toJSON(self.oozieColumns),
       "workflow": ko.mapping.toJSON(self.workflow)
@@ -1092,6 +1093,7 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
   };
 
   self.showSubmitPopup = function () {
+	$(".jHueNotify").hide();
     $.get("/oozie/editor/workflow/submit/" + self.workflow.id(), {
     }, function (data) {
       $(document).trigger("showSubmitPopup", data);

Vissa filer visades inte eftersom för många filer har ändrats