Selaa lähdekoodia

HUE-6395 [oozie] Coordinator submittion should not redirect to Hue 3

Romain Rigaux 8 vuotta sitten
vanhempi
commit
e94d17ee58

+ 1 - 0
apps/oozie/src/oozie/static/oozie/js/coordinator-editor.ko.js

@@ -282,6 +282,7 @@ var CoordinatorEditorViewModel = (function () {
       if (!self.coordinator.isDirty()) {
         hueAnalytics.log('oozie/editor/coordinator', 'submit');
         $.get("/oozie/editor/coordinator/submit/" + self.coordinator.id(), {
+          format: IS_HUE_4 ? 'json' : 'html'
         }, function (data) {
           $(document).trigger("showSubmitPopup", data);
         }).fail(function (xhr, textStatus, errorThrown) {

+ 7 - 0
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -176,11 +176,18 @@ ${ scheduler.import_sla_cron(coordinator_json) }
     $("#chooseWorkflowDemiModal").modal({
       show: false
     });
+
     $(window).bind("keydown", "esc", function () {
       if ($(".demi-modal.fade.in").length > 0) {
         $(".demi-modal.fade.in .demi-modal-chevron").click();
       }
     });
+
+    huePubSub.subscribe('submit.popup.return', function (data) {
+      $.jHueNotify.info('${_('Schedule submitted.')}');
+      huePubSub.publish('open.link', '/jobbrowser/#!id=' + data.job_id);
+      $('.submit-modal').modal('hide');
+    }, 'oozie');
   });
 </script>