瀏覽代碼

HUE-6333 [core] Fix default app logic to properly loads non editors

Romain Rigaux 8 年之前
父節點
當前提交
c2a4d95913

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

@@ -32,7 +32,7 @@
           <div class="nav-collapse">
             <ul class="nav">
               <li class="app-header">
-                <%def name="getApp(section)"><%
+                <%def name="getInterpreter(section)"><%
                   if section == 'coordinators':
                     return 'oozie-coordinator'
                   elif section == 'bundles':
@@ -74,7 +74,7 @@
                 % else:
                 <a title="${ _('Switch to the dashboard') }" href="${ is_embeddable and '/hue/jobbrowser/#!workflows' or getURL(section, dashboard, ENABLE_V2.get())}">
                   <svg class="svg-app-icon"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#hi-oozie"></use></svg> ${ _('Oozie Editor') }
-                  <!-- ko component: { name: 'hue-favorite-app', params: { hue4: IS_HUE_4, app: '${ getApp(section) }' }} --><!-- /ko -->
+                  <!-- ko component: { name: 'hue-favorite-app', params: { hue4: IS_HUE_4, app: 'scheduler', interpreter: '${ getInterpreter(section) }' }} --><!-- /ko -->
                 </a>
                 % endif
                </li>

+ 1 - 0
desktop/core/src/desktop/models.py

@@ -1549,6 +1549,7 @@ class ClusterConfig():
       user_default_app = json.loads(UserPreferences.objects.get(user=self.user, key='default_app').value)
       if apps.get(user_default_app['app']):
         default_app = self.get_apps()[user_default_app['app']]
+        default_interpreter = []
         if default_app.get('interpreters'):
           interpreters = [interpreter for interpreter in default_app['interpreters'] if interpreter['type'] == user_default_app['interpreter']]
           if interpreters:

+ 4 - 3
desktop/core/src/desktop/templates/ko_components.mako

@@ -17,6 +17,7 @@
 <%!
 from desktop import conf
 from desktop.lib.i18n import smart_unicode
+
 from django.utils.translation import ugettext as _
 from desktop.views import _ko
 %>
@@ -473,8 +474,8 @@ from desktop.views import _ko
 
   <script type="text/html" id="hue-favorite-app-template">
     <!-- ko if: isHue4 -->
-    <div title="${ _('Toggle as the default app') }" class="inline pointer favorite-app" data-bind="click: setAsFavoriteApp">
-      <i class="fa inactive-action" data-bind="css: {'fa-star-o': !isFavorite(), 'fa-star': isFavorite }"></i>
+    <div class="inline pointer favorite-app" data-bind="click: setAsFavoriteApp, attr: { title: isFavorite() ? '${ _ko("Unset from default application") }' : '${ _ko("Set as default application") }' }">
+      <i class="fa inactive-action" data-bind="css: { 'fa-star-o': !isFavorite(), 'fa-star': isFavorite }"></i>
     </div>
     <!-- /ko -->
   </script>
@@ -508,7 +509,7 @@ from desktop.views import _ko
           var postParams = {
             app: self.app
           }
-          if (self.app === 'editor' && self.interpreter !== '') {
+          if (self.interpreter !== '') {
             postParams['interpreter'] = self.interpreter;
           }
           var post = {};