Browse Source

HUE-4421 [editor] New saved query should be schedulable

Romain Rigaux 9 years ago
parent
commit
4780ddd

+ 1 - 1
apps/oozie/src/oozie/urls.py

@@ -91,7 +91,7 @@ urlpatterns += patterns(
   url(r'^editor/coordinator/delete/$', 'delete_job', name='delete_editor_coordinator'),
   url(r'^editor/coordinator/copy/$', 'copy_coordinator', name='copy_coordinator'),
   url(r'^editor/coordinator/save/$', 'save_coordinator', name='save_coordinator'),
-  url(r'^editor/coordinator/submit/(?P<doc_id>\d+)$', 'submit_coordinator', name='editor_submit_coordinator'),
+  url(r'^editor/coordinator/submit/(?P<doc_id>[-\w]+)$', 'submit_coordinator', name='editor_submit_coordinator'),
   url(r'^editor/coordinator/gen_xml/$', 'gen_xml_coordinator', name='gen_xml_coordinator'),
   url(r'^editor/coordinator/open_v1/$', 'open_old_coordinator', name='open_old_coordinator'),
   url(r'^editor/coordinator/parameters/$', 'coordinator_parameters', name='coordinator_parameters'),

+ 5 - 1
apps/oozie/src/oozie/views/editor2.py

@@ -698,7 +698,11 @@ def coordinator_parameters(request):
 @check_editor_access_permission
 @check_document_access_permission()
 def submit_coordinator(request, doc_id):
-  coordinator = Coordinator(document=Document2.objects.get(id=doc_id))
+  if doc_id.isdigit():
+    coordinator = Coordinator(document=Document2.objects.get(id=doc_id))
+  else:
+    coordinator = Coordinator(document=Document2.objects.get_by_uuid(user=request.user, uuid=doc_id))
+
   ParametersFormSet = formset_factory(ParameterForm, extra=0)
 
   if request.method == 'POST':

+ 1 - 1
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -1755,7 +1755,7 @@
     };
 
     self.showSubmitPopup = function () {
-      $.get('/oozie/editor/coordinator/submit/' + self.dependentsCoordinator()[0].id(), {
+      $.get('/oozie/editor/coordinator/submit/' + self.coordinatorUuid(), {
         format: 'json'
       }, function (data) {
         $(document).trigger("showSubmitPopup", data);