Przeglądaj źródła

HUE-6077 [core] Update the top menu link to Job Browser

Romain Rigaux 8 lat temu
rodzic
commit
c2a589a451

+ 1 - 1
apps/filebrowser/src/filebrowser/templates/listdir_components.mako

@@ -1109,7 +1109,7 @@ from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE
       });
 
       self.openFileInEditor = function() {
-        huePubSub.publish('open.editor.query.external', {'statementType': 'file', 'statementPath': self.selectedFile().path});
+        huePubSub.publish('open.editor.new.query', {'statementType': 'file', 'statementPath': self.selectedFile().path});
       };
 
       self.currentPath = ko.observable(currentDirPath);

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

@@ -808,9 +808,9 @@ ${ assist.assistPanel() }
               });
             })
           }},
-          { url: '/jobbrowser/apps', app: 'jobbrowser' },
+          { url: '/jobbrowser/', app: 'jobbrowser' },
           { url: '/jobbrowser/jobs/job_*', app: function (ctx) {
-            page.redirect('/jobbrowser/jobs/#!job_' + _.trimRight(ctx.params[0], '/'));
+            page.redirect('/jobbrowser/jobs/#!application_' + _.trimRight(ctx.params[0], '/'));
           }},
           { url: '/jobbrowser/jobs', app: 'jobbrowser' },
           { url: '/logs', app: 'logs' },

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

@@ -367,8 +367,10 @@ from desktop.views import _ko
 
   <script type="text/html" id="hue-job-browser-panel-template">
     <div class="compose-action btn-group pull-right">
-      <button class="btn" title="${_('Running jobs')}" data-bind="click: function(){ onePageViewModel.currentApp('jobbrowser') }">${ _('Jobs') } <div id="jobBrowserCount" class="jobs-badge" data-bind="visible: jobCount() > 0, text: jobCount">0</div></button>
-      <button class="btn dropdown-toggle" data-bind="toggle: jobsPanelVisible">
+      <button class="btn" title="${_('Job browser')}" data-bind="click: function(){ page('/jobbrowser/') }">${ _('Jobs') }
+        <div id="jobBrowserCount" class="jobs-badge" title="${_('Running jobs')}" data-bind="visible: jobCount() > 0, text: jobCount">0</div>
+      </button>
+      <button class="btn dropdown-toggle" data-bind="toggle: jobsPanelVisible" title="${_('Inline browser')}">
         <span class="caret"></span>
       </button>
     </div>