Explorar o código

HUE-6254 [jb] The mini jobbrowser doesn't respond or change the location hash anymore

Enrico Berti %!s(int64=8) %!d(string=hai) anos
pai
achega
1d37f98

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

@@ -1624,7 +1624,9 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
         interface = self.isValidInterface(interface);
         self.interface(interface);
         self.resetBreadcrumbs();
+        % if not is_mini:
         hueUtils.changeURL('#!' + interface);
+        % endif
         self.job(null);
         if (interface === 'slas'){
           % if not is_mini:
@@ -1733,6 +1735,10 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
         viewModel.job().apiStatus('RUNNING');
         viewModel.job().updateJob();
       }, 'jobbrowser');
+      % else:
+      huePubSub.subscribe('mini.jb.navigate', function(interface){
+        viewModel.selectInterface(interface);
+      });
       % endif
     });
   })();

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

@@ -386,9 +386,9 @@ from desktop.views import _ko
     <div class="jobs-panel" data-bind="visible: jobsPanelVisible" style="display: none;">
       <a class="pointer inactive-action pull-right" data-bind="click: function(){ jobsPanelVisible(false); }"><i class="fa fa-fw fa-times"></i></a>
       <ul class="inline">
-        <li><a href="#!jobs">${_('Jobs')}</a></li>
-        <li><a href="#!workflows">${_('Workflows')}</a></li>
-        <li><a href="#!schedules">${_('Schedules')}</a></li>
+        <li><a href="javascript:void(0)" data-bind="click: function(){ huePubSub.publish('mini.jb.navigate', 'jobs') }">${_('Jobs')}</a></li>
+        <li><a href="javascript:void(0)" data-bind="click: function(){ huePubSub.publish('mini.jb.navigate', 'workflows') }">${_('Workflows')}</a></li>
+        <li><a href="javascript:void(0)" data-bind="click: function(){ huePubSub.publish('mini.jb.navigate', 'schedules') }">${_('Schedules')}</a></li>
       </ul>
       <div id="mini_jobbrowser"></div>
     </div>