Browse Source

HUE-1964 [jb] Hide see expired job checkbox

The kill button is already hidden everywhere for MR2
Romain Rigaux 11 years ago
parent
commit
0a02a89

+ 2 - 0
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -38,6 +38,7 @@ ${ components.menubar() }
     </%def>
 
     <%def name="creation()">
+      % if not is_yarn:
       <label class="checkbox retired">
         <%
             checked = ""
@@ -46,6 +47,7 @@ ${ components.menubar() }
         %>
         <input id="showRetired" type="checkbox" ${checked}> ${_('Show retired jobs')}
       </label>
+      % endif
       <span class="btn-group">
         <a class="btn btn-status btn-success" data-value="completed">${ _('Succeeded') }</a>
         <a class="btn btn-status btn-warning" data-value="running">${ _('Running') }</a>

+ 3 - 1
apps/jobbrowser/src/jobbrowser/views.py

@@ -36,6 +36,7 @@ from desktop.lib.django_util import render_json, render, copy_query_dict, encode
 from desktop.lib.exceptions import MessageException
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.views import register_status_bar_view
+from hadoop import cluster
 from hadoop.api.jobtracker.ttypes import ThriftJobPriority, TaskTrackerNotFoundException, ThriftJobState
 from hadoop.yarn.clients import get_log_client
 
@@ -102,7 +103,8 @@ def jobs(request):
     'user_filter': user,
     'text_filter': text,
     'retired': retired,
-    'filtered': not (state == 'all' and user == '' and text == '')
+    'filtered': not (state == 'all' and user == '' and text == ''),
+    'is_yarn': cluster.is_yarn()
   })
 
 def massage_job_for_json(job, request):