Selaa lähdekoodia

[search] Show other collection caret only if more than one collection

Fix some permission tests
Romain Rigaux 12 vuotta sitten
vanhempi
commit
dd6ed74a05

+ 1 - 1
apps/search/src/search/templates/admin_collections.mako

@@ -210,7 +210,7 @@ ${ commonheader(_('Search'), "search", user, "29px") | n,unicode }
       $("#importModal").modal("hide");
       $("#importModalBtn").button("reset");
       if (data.status == 0){
-        $(document).trigger("info", data.message + "<br/>${_('Imported:')}" +  + data.imported.join(", "));
+        $(document).trigger("info", data.message + "<br/>${_('Imported:')}" + data.imported.join(", "));
       }
       else if (data.status == 1){
         $(document).trigger("info", data.message + "<br/>${_('Imported:')}" + data.imported.join(", ") + "<br/>${_('Not imported:')}" + data.notImported.join(", "));

+ 4 - 0
apps/search/src/search/templates/search.mako

@@ -59,7 +59,9 @@ ${ commonheader(_('Search'), "search", user, "90px") | n,unicode }
     <strong>${_("Search")}</strong>
     <div class="input-append">
       <div class="selectMask">
+        % if len(hue_collections) > 1:
         <i class="fa fa-caret-down" style="float:right;margin-top: 8px; margin-left: 5px"></i>
+        % endif
         <span class="current-collection"></span>
         <div id="collectionPopover" class="hide">
         <ul class="unstyled">
@@ -426,11 +428,13 @@ ${ commonheader(_('Search'), "search", user, "90px") | n,unicode }
       return _html;
     }
 
+    % if len(hue_collections) > 1:
     $(".selectMask").popover({
       html: true,
       content: getCollectionPopoverContent(),
       placement: "bottom"
     });
+    % endif
 
     $("#recordsPerPage").change(function () {
       $("input[name='rows']").val($(this).val());

+ 8 - 8
desktop/core/src/desktop/tests.py

@@ -198,7 +198,7 @@ def test_dump_config():
   grant_access("not_me", "test", "desktop")
 
   response = client_not_me.get('/dump_config')
-  assert_equal("You must be a superuser.", response.content)
+  assert_true("You do not have permission" in response.content, response.content)
 
   os.environ["HUE_CONF_DIR"] = "/tmp/test_hue_conf_dir"
   resp = c.get('/dump_config')
@@ -385,32 +385,32 @@ def test_app_permissions():
   # Access to nothing
   assert_equal(401, c.get('/beeswax', follow=True).status_code)
   assert_equal(401, c.get('/impala', follow=True).status_code)
-  assert_equal(401, c.get('/filebrowser', follow=True).status_code)
+  assert_equal(401, c.get('/hbase', follow=True).status_code)
 
   # Add access to beeswax
   grant_access(USERNAME, GROUPNAME, "beeswax")
   assert_equal(200, c.get('/beeswax', follow=True).status_code)
   assert_equal(401, c.get('/impala', follow=True).status_code)
-  assert_equal(401, c.get('/filebrowser', follow=True).status_code)
+  assert_equal(401, c.get('/hbase', follow=True).status_code)
 
-  # Add access to filebrowser
-  grant_access(USERNAME, GROUPNAME, "filebrowser")
+  # Add access to hbase
+  grant_access(USERNAME, GROUPNAME, "hbase")
   assert_equal(200, c.get('/beeswax', follow=True).status_code)
   assert_equal(401, c.get('/impala', follow=True).status_code)
-  assert_equal(200, c.get('/filebrowser', follow=True).status_code)
+  assert_equal(200, c.get('/hbase', follow=True).status_code)
 
   # Reset all perms
   GroupPermission.objects.filter(group__name=GROUPNAME).delete()
 
   assert_equal(401, c.get('/beeswax', follow=True).status_code)
   assert_equal(401, c.get('/impala', follow=True).status_code)
-  assert_equal(401, c.get('/filebrowser', follow=True).status_code)
+  assert_equal(401, c.get('/hbase', follow=True).status_code)
 
   # Test only impala perm
   grant_access(USERNAME, GROUPNAME, "impala")
   assert_equal(401, c.get('/beeswax', follow=True).status_code)
   assert_equal(200, c.get('/impala', follow=True).status_code)
-  assert_equal(401, c.get('/filebrowser', follow=True).status_code)
+  assert_equal(401, c.get('/hbase', follow=True).status_code)
 
 
 def test_error_handling_failure():