浏览代码

[sentry] Select and highlight the correct component in the sub menu

Romain Rigaux 9 年之前
父节点
当前提交
75db840

+ 1 - 1
apps/security/src/security/templates/hive.mako

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="tree" file="common_tree.mako" />
 
 ${ commonheader(_('Hadoop Security'), "security", user) | n,unicode }
-${ layout.menubar(section='hive') }
+${ layout.menubar(section='hive1') }
 
 
 <script type="text/html" id="role">

+ 3 - 3
apps/security/src/security/templates/layout.mako

@@ -64,13 +64,13 @@ def is_selected(section, matcher):
                 </a>
               </li>
               % if HIVE_V1.get():
-              <li class="${is_selected(section, 'hive')}"><a href="${ url('security:hive') }">${_('Sentry Tables')}</a></li>
+              <li class="${is_selected(section, 'hive1')}"><a href="${ url('security:hive') }">${_('Sentry Tables')}</a></li>
               % endif
               % if HIVE_V2.get():
-              <li class="${is_selected(section, 'hive2')}"><a href="${ url('security:hive2') }">${_('Sentry Tables v2')}</a></li>
+              <li class="${is_selected(section, 'hive')}"><a href="${ url('security:hive2') }">${_('Sentry Tables v2')}</a></li>
               % endif
               % if SOLR_V2.get():
-              <li class="${is_selected(section, 'solr')}"><a href="${ url('security:hive') }">${_('Solr Collections')}</a></li>
+              <li class="${is_selected(section, 'solr')}"><a href="${ url('security:solr') }">${_('Solr Collections')}</a></li>
               % endif
               <li class="${is_selected(section, 'hdfs')}"><a href="${ url('security:hdfs') }">${_('File ACLs')}</a></li>
             </ul>

+ 1 - 1
apps/security/src/security/templates/sentry.mako

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
 <%namespace name="tree" file="common_tree.mako" />
 
 ${ commonheader(_('Hadoop Security'), "security", user) | n,unicode }
-${ layout.menubar(section='hive2') }
+${ layout.menubar(section=component) }
 
 
 <script type="text/html" id="role">

+ 1 - 0
apps/security/src/security/views.py

@@ -51,6 +51,7 @@ def _sentry(request, component):
           'is_sentry_admin': request.user.groups.filter(name__in=get_sentry_server_admin_groups()).exists()
       }),
       'has_impersonation_perm': _has_impersonation_perm(request.user),
+      'component': component
   })