Browse Source

HUE-1103 [josub] Support files

Browse buttons hurt by change event.
Change event needed by KO.
Abraham Elmahrek 12 years ago
parent
commit
2041367b85

+ 9 - 9
apps/jobsub/src/jobsub/views.py

@@ -71,15 +71,15 @@ def list_designs(request):
   designs = []
   for design in data:
       ko_design = {
-          'id': design.id,
-          'owner': design.owner.username,
-          # Design name is validated by workflow and node forms.
-          'name': design.name,
-          'description': design.description,
-          'node_type': design.start.get_child('to').node_type,
-          'last_modified': py_time.mktime(design.last_modified.timetuple()),
-          'editable': design.owner.id == request.user.id,
-          'is_shared': design.is_shared
+        'id': design.id,
+        'owner': design.owner.username,
+        # Design name is validated by workflow and node forms.
+        'name': design.name,
+        'description': design.description,
+        'node_type': design.start.get_child('to').node_type,
+        'last_modified': py_time.mktime(design.last_modified.timetuple()),
+        'editable': design.owner.id == request.user.id,
+        'is_shared': design.is_shared
       }
       designs.append(ko_design)
 

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

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

+ 1 - 1
apps/oozie/src/oozie/templates/editor/gen/workflow-common.xml.mako

@@ -55,7 +55,7 @@
 <%def name="distributed_cache(files, archives)">
     % for f in files:
         % if f:
-            <file>${ filelink(f) }</file>
+            <file>${ filelink(f['name']) }</file>
         % endif
     % endfor
     % for a in archives:

+ 1 - 1
apps/oozie/static/js/workflow.node-fields.js

@@ -33,7 +33,7 @@ var NodeFields = {
       self.files.valueHasMutated();
     });
     self.files.push(prop);
-    $(document).trigger('add.file.design', [data]);
+    $(document).trigger('add.file.workflow', [data]);
   },
   removeArchive: function(data, event) {
     var self = this;