瀏覽代碼

HUE-3797 [oozie] Update to use common scheduler submission template

Romain 6 年之前
父節點
當前提交
8787dd6d0c
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 2 2
      apps/oozie/src/oozie/views/dashboard.py
  2. 3 3
      apps/oozie/src/oozie/views/editor2.py

+ 2 - 2
apps/oozie/src/oozie/views/dashboard.py

@@ -746,7 +746,7 @@ def sync_coord_workflow(request, job_id):
     initial_params = ParameterForm.get_initial_params(new_params)
     params_form = ParametersFormSet(initial=initial_params)
 
-  popup = render('editor2/submit_job_popup.mako', request, {
+  popup = render('/scheduler/submit_job_popup.mako', request, {
              'params_form': params_form,
              'name': _('Job'),
              'header': _('Sync Workflow definition?'),
@@ -797,7 +797,7 @@ def rerun_oozie_job(request, job_id, app_path=None):
     return render('dashboard/rerun_workflow_popup.mako', request, {
                    'rerun_form': rerun_form,
                    'params_form': params_form,
-                   'action': reverse('oozie:rerun_oozie_job', kwargs={'job_id': job_id, 'app_path': urllib.quote(app_path.encode('utf-8'), safe=SAFE_CHARACTERS_URI_COMPONENTS) }), 
+                   'action': reverse('oozie:rerun_oozie_job', kwargs={'job_id': job_id, 'app_path': urllib.quote(app_path.encode('utf-8'), safe=SAFE_CHARACTERS_URI_COMPONENTS) }),
                    'return_json': return_json,
                    'is_mini': request.GET.get('is_mini', False),
                  }, force_template=True)

+ 3 - 3
apps/oozie/src/oozie/views/editor2.py

@@ -427,7 +427,7 @@ def _submit_workflow_helper(request, workflow, submit_action):
     params_form = ParametersFormSet(initial=initial_params)
 
 
-    return render('editor2/submit_job_popup.mako', request, {
+    return render('/scheduler/submit_job_popup.mako', request, {
                      'params_form': params_form,
                      'name': workflow.name,
                      'action': submit_action,
@@ -708,7 +708,7 @@ def submit_coordinator(request, doc_id):
     initial_params = ParameterForm.get_initial_params(dict([(param['name'], param['value']) for param in parameters]))
     params_form = ParametersFormSet(initial=initial_params)
 
-    return render('editor2/submit_job_popup.mako', request, {
+    return render('/scheduler/submit_job_popup.mako', request, {
                  'params_form': params_form,
                  'name': coordinator.name,
                  'action': reverse('oozie:editor_submit_coordinator',  kwargs={'doc_id': coordinator.id}),
@@ -937,7 +937,7 @@ def submit_bundle(request, doc_id):
     initial_params = ParameterForm.get_initial_params(dict([(param['name'], param['value']) for param in parameters]))
     params_form = ParametersFormSet(initial=initial_params)
 
-    return render('editor2/submit_job_popup.mako', request, {
+    return render('/scheduler/submit_job_popup.mako', request, {
                  'params_form': params_form,
                  'name': bundle.name,
                  'action': reverse('oozie:editor_submit_bundle',  kwargs={'doc_id': bundle.id}),