Эх сурвалжийг харах

HUE-7044 [oozie] Be consistent with the Schedule name in Hue 4

Enrico Berti 8 жил өмнө
parent
commit
98b0aeb

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

@@ -3187,7 +3187,7 @@ class Coordinator(Job):
       self._data = {
           'id': None,
           'uuid': None,
-          'name': 'My Coordinator',
+          'name': 'My Schedule',
           'variables': [], # Aka workflow parameters
           'properties': {
               'description': '',

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

@@ -375,7 +375,7 @@ LIMIT $limit"""))
     coord_data = {
           'id': None,
           'uuid': None,
-          'name': 'My Coordinator',
+          'name': 'My Schedule',
           'variables': [], # Aka workflow parameters
           'properties': {
               'description': '',

+ 1 - 1
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -95,7 +95,7 @@
                   </li>
                   <li class="${utils.is_selected(section, 'coordinators')}">
                     % if is_embeddable:
-                    <a href="/home/?type=oozie-coordinator2">${ _('Coordinators') }</a>
+                    <a href="/home/?type=oozie-coordinator2">${ _('Schedules') }</a>
                     % else:
                     <a href="${url('oozie:list_editor_coordinators')}">${ _('Coordinators') }</a>
                     % endif

+ 4 - 2
desktop/core/src/desktop/templates/common_header.mako

@@ -112,6 +112,10 @@ if USE_NEW_EDITOR.get():
     % endif
   </style>
 
+  <script type="text/javascript">
+    var IS_HUE_4 = false;
+  </script>
+
   ${ commonHeaderFooterComponents.header_i18n_redirection(user, is_s3_enabled, apps) }
 
   % if not conf.DJANGO_DEBUG_MODE.get():
@@ -180,8 +184,6 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/js/clusterConfig.js') }"></script>
 
   <script type="text/javascript">
-    var IS_HUE_4 = false;
-
     huePubSub.subscribe('get.current.app.name', function () {
       var appName = '';
       if ('${ 'metastore' in apps }' === 'True' && location.href.indexOf('${"metastore" in apps and apps["metastore"].display_name}') !== -1) {

+ 1 - 1
desktop/core/src/desktop/templates/common_header_footer_components.mako

@@ -84,7 +84,7 @@ from metadata.conf import has_optimizer, OPTIMIZER
       'link-workflow': '${_('Job Design')}',
       'notebook': '${_('Notebook')}',
       'oozie-bundle2': '${_('Oozie Bundle')}',
-      'oozie-coordinator2': '${_('Oozie Coordinator')}',
+      'oozie-coordinator2': (IS_HUE_4 ? '${_('Oozie Schedule')}' : '${_('Oozie Coordinator')}'),
       'oozie-workflow2': '${_('Oozie Workflow')}',
       'query-hive': '${_('Hive Query')}',
       'query-impala': '${_('Impala Query')}',

+ 2 - 2
desktop/core/src/desktop/templates/document_browser.mako

@@ -377,8 +377,8 @@ from desktop.views import _ko
                     </a>
                   </li>
                   <li>
-                    <a title="${_('Oozie Coordinator')}" data-bind="hueLink: addDirectoryParamToUrl('${ url('oozie:new_coordinator') }')">
-                      <img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon" alt="${ _('Oozie coordinator icon') }"/> ${_('Coordinator') if is_embeddable else _('Oozie Coordinator')}
+                    <a title="${_('Oozie Schedule')}" data-bind="hueLink: addDirectoryParamToUrl('${ url('oozie:new_coordinator') }')">
+                      <img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon" alt="${ _('Oozie coordinator icon') }"/> ${_('Schedule') if is_embeddable else _('Oozie Coordinator')}
                     </a>
                   </li>
                   <li>

+ 3 - 2
desktop/core/src/desktop/templates/hue.mako

@@ -54,11 +54,12 @@
   <link href="${ static('desktop/css/jquery-ui.css') }" rel="stylesheet">
   <link href="${ static('desktop/css/home.css') }" rel="stylesheet">
 
-  ${ commonHeaderFooterComponents.header_i18n_redirection(user, is_s3_enabled, apps) }
-
   <script type="text/javascript">
     var IS_HUE_4 = true;
   </script>
+
+  ${ commonHeaderFooterComponents.header_i18n_redirection(user, is_s3_enabled, apps) }
+
   % if not conf.DJANGO_DEBUG_MODE.get():
   <script src="${ static('desktop/js/hue.errorcatcher.js') }"></script>
   % endif