Sfoglia il codice sorgente

HUE-4116 [editor] Move out cron specific JS

Enrico Berti 9 anni fa
parent
commit
146c5ca704

+ 29 - 3
apps/oozie/src/oozie/templates/editor2/common_scheduler.inc.mako

@@ -430,7 +430,7 @@ from django.utils.translation import ugettext as _
 </%def>
 
 
-<%def name="import_js()">
+<%def name="import_js(coordinator_json)">
   <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-datepicker.min.css') }">
   <link rel="stylesheet" href="${ static('desktop/ext/css/bootstrap-timepicker.min.css') }">
   <link rel="stylesheet" href="${ static('desktop/css/bootstrap-spinedit.css') }">
@@ -446,11 +446,37 @@ from django.utils.translation import ugettext as _
   <script src="${ static('desktop/ext/js/moment-timezone-with-data.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/tzdetect.js') }" type="text/javascript" charset="utf-8"></script>
 
+  <script type="text/javascript">
+  function showChooseWorkflow() {
+  }
+  </script>
+</%def>
+
+<%def name="import_sla_cron(coordinator_json)">
   <script type="text/javascript">
   ${ utils.slaGlobal() }
   ${ utils.cron_js() }
 
-  function showChooseWorkflow() {
-  }
+  var coordCron =
+  $('#coord-frequency')
+    .jqCron({
+      texts: {
+        i18n: cron_i18n
+      },
+      enabled_minute: false,
+      multiple_dom: true,
+      multiple_month: true,
+      multiple_mins: true,
+      multiple_dow: true,
+      multiple_time_hours: true,
+      multiple_time_minutes: false,
+      default_period: 'day',
+      default_value: ${ coordinator_json | n,unicode }.properties.cron_frequency,
+      no_reset_button: true,
+      lang: 'i18n',
+      jquery_container: $('#jqCron-container'),
+      jquery_element: $('#jqCron-instance')
+    })
+    .jqCronGetInstance();
   </script>
 </%def>

+ 1 - 0
apps/oozie/src/oozie/templates/editor2/common_scheduler.mako

@@ -22,3 +22,4 @@ from django.utils.translation import ugettext as _
 
 ${ scheduler.import_layout(embedded=True) }
 ${ scheduler.import_js() }
+${ scheduler.import_sla_cron(coordinator_json) }

+ 1 - 25
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -141,33 +141,9 @@ ${ dashboard.import_bindings() }
 
 <script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
 
+${ scheduler.import_sla_cron(coordinator_json) }
 
 <script type="text/javascript">
-  ${ utils.slaGlobal() }
-
-  ${ utils.cron_js() }
-
-  var coordCron =
-    $('#coord-frequency')
-      .jqCron({
-        texts: {
-          i18n: cron_i18n
-        },
-        enabled_minute: false,
-        multiple_dom: true,
-        multiple_month: true,
-        multiple_mins: true,
-        multiple_dow: true,
-        multiple_time_hours: true,
-        multiple_time_minutes: false,
-        default_period: 'day',
-        default_value: ${ coordinator_json | n,unicode }.properties.cron_frequency,
-        no_reset_button: true,
-        lang: 'i18n',
-        jquery_container: $('#jqCron-container'),
-        jquery_element: $('#jqCron-instance')
-      })
-      .jqCronGetInstance();
 
   $('#jqCron-container').on('cron:change', function(e, cron){
     viewModel.coordinator.properties.cron_frequency(cron);

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

@@ -531,7 +531,7 @@ def edit_coordinator(request):
       'workflows': workflows,
       'doc_uuid': doc.uuid if doc else '',
       'can_edit': doc is None or doc.doc.get().is_editable(request.user),
-      'layout': django_mako.render_to_string('editor2/common_scheduler.mako', {})
+      'layout': django_mako.render_to_string('editor2/common_scheduler.mako', {'coordinator_json': coordinator.to_json_for_html()})
     })
   else:
     return render('editor2/coordinator_editor.mako', request, {