Browse Source

HUE-8732 [jb] Fix rerun_coord_popup for normal JB mode and mini JB mode

Ivan Dzikovsky 6 years ago
parent
commit
b7d188a

+ 6 - 6
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -2722,7 +2722,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
       self.control = function (action) {
         if (action == 'rerun') {
-          $.get('/oozie/rerun_oozie_job/' + self.id() + '/?format=json', function(response) {
+          $.get('/oozie/rerun_oozie_job/' + self.id() + '/?format=json' + '${ "&is_mini=true" if is_mini else "" | n }', function(response) {
             $('#rerun-modal${ SUFFIX }').modal('show');
             self.rerunModalContent(response);
           });
@@ -3148,7 +3148,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
       self.control = function (action) {
         if (action === 'rerun') {
-          $.get('/oozie/rerun_oozie_coord/' + vm.job().id() + '/?format=json', function(response) {
+          $.get('/oozie/rerun_oozie_coord/' + vm.job().id() + '/?format=json' + '${ "&is_mini=true" if is_mini else "" | n }', function(response) {
             $('#rerun-modal${ SUFFIX }').modal('show');
             vm.job().rerunModalContent(response);
 
@@ -3160,8 +3160,8 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
               });
               option.appendTo($(frag));
             });
-            $('#id_actions').find('option').remove();
-            $(frag).appendTo('#id_actions');
+            $('#id_actions${ SUFFIX }').find('option').remove();
+            $(frag).appendTo('#id_actions${ SUFFIX }');
           });
         } else if (action === 'ignore') {
           $.post('/oozie/manage_oozie_jobs/' + vm.job().id() + '/ignore', {
@@ -3544,13 +3544,13 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 
       huePubSub.publish('cluster.config.get.config');
 
-      huePubSub.subscribe('submit.rerun.popup.return', function (data) {
+      huePubSub.subscribe('submit.rerun.popup.return${ SUFFIX }', function (data) {
         $.jHueNotify.info('${_("Rerun submitted.")}');
         $('#rerun-modal${ SUFFIX }').modal('hide');
 
         jobBrowserViewModel.job().apiStatus('RUNNING');
         jobBrowserViewModel.monitorJob(jobBrowserViewModel.job());
-      }, 'jobbrowser');
+      }, '${ "jobbrowser" if not is_mini else "" }');
 
       % if is_mini:
         huePubSub.subscribe('mini.jb.navigate', function (options) {

+ 11 - 7
apps/oozie/src/oozie/templates/dashboard/rerun_coord_popup.mako

@@ -19,10 +19,14 @@
   from django.utils.translation import ugettext as _
 %>
 
+<%
+  SUFFIX = is_mini and "-mini" or ""
+%>
+
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
-<form action="${ action }" method="POST" id="submit-rerun-form">
+<form action="${ action }" method="POST" id="submit-rerun-form${ SUFFIX }">
   ${ csrf_token(request) | n,unicode }
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
@@ -31,7 +35,7 @@
 
   <div class="modal-body">
     <fieldset>
-      <select name="actions" id="id_actions" class="hide" multiple></select>
+      <select name="actions" id="id_actions${ SUFFIX }" class="hide" multiple></select>
       <div id="config-container">
         <div class="fieldWrapper">
           <div class="row-fluid">
@@ -88,13 +92,13 @@
 
 <script charset="utf-8">
   % if return_json:
-    $('#submit-rerun-form').submit(function (e) {
+    $('#submit-rerun-form${ SUFFIX }').submit(function (e) {
       $.ajax({
         type: "POST",
         url: '${ action }',
-        data: $('#submit-rerun-form').serialize(),
+        data: $('#submit-rerun-form${ SUFFIX }').serialize(),
         success: function (data) {
-          huePubSub.publish('submit.rerun.popup.return', data);
+          huePubSub.publish('submit.rerun.popup.return${ SUFFIX }', data);
         }
       });
       e.preventDefault();
@@ -110,6 +114,6 @@
       option.appendTo($(frag));
     });
 
-    $(frag).appendTo('#id_actions');
+    $(frag).appendTo('#id_actions${ SUFFIX }');
   % endif
-</script>
+</script>

+ 8 - 4
apps/oozie/src/oozie/templates/dashboard/rerun_workflow_popup.mako

@@ -19,10 +19,14 @@
   from django.utils.translation import ugettext as _
 %>
 
+<%
+  SUFFIX = is_mini and "-mini" or ""
+%>
+
 <%namespace name="utils" file="../utils.inc.mako" />
 
 
-<form action="${ action }" method="POST" id="submit-rerun-form">
+<form action="${ action }" method="POST" id="submit-rerun-form${ SUFFIX }">
   ${ csrf_token(request) | n,unicode }
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-label="${ _('Close') }"><span aria-hidden="true">&times;</span></button>
@@ -98,13 +102,13 @@
       });
 
       % if return_json:
-        $('#submit-rerun-form').submit(function (e) {
+        $('#submit-rerun-form${ SUFFIX }').submit(function (e) {
           $.ajax({
             type: "POST",
             url: '${ action }',
-            data: $('#submit-rerun-form').serialize(),
+            data: $('#submit-rerun-form${ SUFFIX }').serialize(),
             success: function (data) {
-              huePubSub.publish('submit.rerun.popup.return', data);
+              huePubSub.publish('submit.rerun.popup.return${ SUFFIX }', data);
             }
           });
           e.preventDefault();

+ 3 - 1
apps/oozie/src/oozie/views/dashboard.py

@@ -794,7 +794,8 @@ def rerun_oozie_job(request, job_id, app_path=None):
                    'rerun_form': rerun_form,
                    'params_form': params_form,
                    'action': reverse('oozie:rerun_oozie_job', kwargs={'job_id': job_id, 'app_path': app_path}),
-                   'return_json': return_json
+                   'return_json': return_json,
+                   'is_mini': request.GET.get('is_mini', False),
                  }, force_template=True).content
 
   return JsonResponse(popup, safe=False)
@@ -858,6 +859,7 @@ def rerun_oozie_coordinator(request, job_id, app_path=None):
                    'params_form': params_form,
                    'action': reverse('oozie:rerun_oozie_coord', kwargs={'job_id': job_id, 'app_path': app_path}),
                    'return_json': return_json,
+                   'is_mini': request.GET.get('is_mini', False),
                  }, force_template=True).content
 
   return JsonResponse(popup, safe=False)