소스 검색

HUE-6248 [sentry] Fix series of links to open correctly in either Hue 3 or Hue 4

Fix main link.
Fix series of links to open correctly in either Hue 3 or Hue 4.
Romain Rigaux 8 년 전
부모
커밋
7abd93bf97
2개의 변경된 파일10개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      apps/security/src/security/templates/hdfs.mako
  2. 7 1
      desktop/core/src/desktop/templates/hue.mako

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

@@ -99,7 +99,7 @@ ${ layout.menubar(section='hdfs') }
               <div class="path-container">
                 <div class="input-append span12">
                   <input id="path" class="path" type="text" data-bind="value: $root.assist.path" autocomplete="off" />
-                  <a data-bind="attr: { href: '/filebrowser/view=' + $root.assist.path() }" target="_blank" title="${ _('Open in File Browser') }" class="btn btn-inverse">
+                  <a data-bind="hueLink: '/filebrowser/view=' + $root.assist.path(), attr: {target: IS_HUE_4 ? 'self' : 'blank'}" title="${ _('Open in File Browser') }" class="btn btn-inverse">
                     <i class="fa fa-external-link"></i>
                   </a>
                 </div>
@@ -160,7 +160,7 @@ ${ layout.menubar(section='hdfs') }
 
                     <span data-bind="visible: ! $root.assist.showAclsAsText()">
                       <h4>${ _('Path') }</h4>
-                      <a class="force-word-break" data-bind="attr: { href: '/filebrowser/view=' + $root.assist.path() }, text: $root.assist.path()" target="_blank" title="${ _('Open in File Browser') }" rel="tooltip"></a>
+                      <a class="force-word-break" data-bind="hueLink: '/filebrowser/view=' + $root.assist.path(), text: $root.assist.path(), attr: {target: IS_HUE_4 ? 'self' : 'blank'}" title="${ _('Open in File Browser') }" rel="tooltip"></a>
 
                       <h4>${ _('User/Group') }</h4>
                       <i class="fa fa-user" style="color: #999999" title="${_('User')}"></i> <span title="${_('User')}" data-bind="text: $root.assist.owner"></span>&nbsp;
@@ -233,7 +233,7 @@ ${ layout.menubar(section='hdfs') }
       <div class="span4">
         <h4>${ _('to apply to the selection') }</h4>
         <ul class="unstyled modal-panel" data-bind="foreach: $root.assist.checkedItems">
-          <li><a class="force-word-break" data-bind="attr: { href: '/filebrowser/view=' + path }, text: path" target="_blank" title="${ _('Open in File Browser') }" rel="tooltip"></a></li>
+          <li><a class="force-word-break" data-bind="hueLink: '/filebrowser/view=' + path, text: path, attr: {target: IS_HUE_4 ? 'self' : 'blank'}" title="${ _('Open in File Browser') }" rel="tooltip"></a></li>
         </ul>
       </div>
     </div>

+ 7 - 1
desktop/core/src/desktop/templates/hue.mako

@@ -499,7 +499,12 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
         sqoop: '/sqoop',
       };
 
-      var SKIP_CACHE = ['home', 'oozie_workflow', 'oozie_coordinator', 'oozie_bundle', 'dashboard', 'filebrowser', 'useradmin_users', 'useradmin_groups', 'useradmin_newgroup', 'useradmin_editgroup', 'useradmin_permissions', 'useradmin_editpermission', 'useradmin_configurations', 'useradmin_newuser', 'useradmin_addldap', 'useradmin_edituser'];
+      var SKIP_CACHE = [
+          'home', 'oozie_workflow', 'oozie_coordinator', 'oozie_bundle', 'dashboard',
+          'filebrowser', 'useradmin_users', 'useradmin_groups', 'useradmin_newgroup', 'useradmin_editgroup',
+          'useradmin_permissions', 'useradmin_editpermission', 'useradmin_configurations', 'useradmin_newuser',
+          'useradmin_addldap', 'useradmin_edituser'
+      ];
 
       var OnePageViewModel = function () {
         var self = this;
@@ -815,6 +820,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
           { url: '/security/hive', app: 'security_hive' },
           { url: '/security/hive2', app: 'security_hive2' },
           { url: '/security/solr', app: 'security_solr' },
+          { url: '/security', app: 'security_hive' },
           { url: '/sqoop', app: 'sqoop' },
           { url: '/useradmin/configurations/', app: 'useradmin_configurations' },
           { url: '/useradmin/groups/', app: 'useradmin_groups' },