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

HUE-5864 [oozie] Polishing on non secure cluster

Romain Rigaux 8 жил өмнө
parent
commit
cbc34ed

+ 0 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -77,7 +77,6 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
                 ${ _('Job Browser') }
               </a>
             </li>
-            <li data-bind="css: {'active': interface() === 'dashboard'}"><a class="pointer" data-bind="click: function(){ interface('apps') }">${ _('Dashboard') }</a></li>
             <li data-bind="css: {'active': interface() === 'apps'}"><a class="pointer" data-bind="click: function(){ interface('apps') }">${ _('Jobs') } <div id="jobBrowserCount" class="jobs-badge" style="display:none;">0</div></a></li>
             <li data-bind="css: {'active': interface() === 'workflows'}"><a class="pointer" data-bind="click: function(){ interface('workflows') }">${ _('Workflows') }</a></li>
             <li data-bind="css: {'active': interface() === 'schedules'}"><a class="pointer" data-bind="click: function(){ interface('schedules') }">${ _('Schedules') }</a></li>

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

@@ -939,7 +939,7 @@ class Node():
     node_type = self.data['type']
     if self.data['type'] == JavaDocumentAction.TYPE:
       node_type = JavaAction.TYPE
-    elif self.data['type'] == ImpalaAction.TYPE:
+    elif self.data['type'] == ImpalaAction.TYPE or self.data['type'] == ImpalaDocumentAction.TYPE:
       node_type = ShellAction.TYPE
 
     return 'editor2/gen/workflow-%s.xml.mako' % node_type
@@ -2455,7 +2455,7 @@ class PigDocumentAction(Action):
   FIELDS = {
     'uuid': {
         'name': 'uuid',
-        'label': _('Spark program'),
+        'label': _('Pig script'),
         'value': '',
         'help_text': _('Select a saved Spark program you want to schedule.'),
         'type': 'pig'
@@ -2522,7 +2522,7 @@ class SqoopDocumentAction(Action):
   FIELDS = {
     'uuid': {
         'name': 'uuid',
-        'label': _('Sqoop program'),
+        'label': _('Sqoop command'),
         'value': '',
         'help_text': _('Select a saved Sqoop program you want to schedule.'),
         'type': 'sqoop'

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/common_workflow.mako

@@ -177,7 +177,7 @@
       <!-- /ko -->
 
       <!-- ko if: widgetType() == 'impala-widget' || widgetType() == 'impala-document-widget' -->
-      <img src="${ static('oozie/art/icon_impala_48.png') }" class="widget-icon"><sup style="color: #338bb8; margin-left: -4px">2</sup>
+      <img src="${ static('oozie/art/icon_impala_48.png') }" class="widget-icon">
       <!-- /ko -->
 
       <!-- ko if: widgetType() == 'pig-widget' || widgetType() == 'pig-document-widget'  -->

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -4997,7 +4997,7 @@
         'distcp-doc': 'query-distcp',
         'mapreduce-doc': 'query-mapreduce',
       }
-      var type = 'query-hive';
+      var type = 'query-impala'; // tmp
       if (options.type) {
         type = TYPE_MAP[options.type()] ? TYPE_MAP[options.type()] : options.type();
       }

+ 1 - 1
desktop/libs/liboozie/src/liboozie/submission2.py

@@ -232,7 +232,7 @@ export PYTHON_EGG_CACHE=./myeggs
 
 impala-shell %(kerberos_option)s %(ssl_option)s -i %(impalad_host)s -f %(query_file)s""" % {
   'impalad_host': action.data['properties'].get('impalad_host') or _get_impala_url(),
-  'kerberos_option': '' if self.api.security_enabled else '-k',
+  'kerberos_option': '-k' if self.api.security_enabled else '',
   'ssl_option': '--ssl' if get_ssl_server_certificate() else '',
   'query_file': script_name,
   'kinit': kinit

+ 1 - 0
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -268,6 +268,7 @@ var EditorViewModel = (function() {
 
     self.isBatchable = ko.computed(function() {
       return self.type() == 'hive'
+          || self.type() == 'impala'
           || $.grep(vm.availableLanguages, function(language) { return language.type == self.type() && language.interface == 'oozie'; }).length > 0;
     });