Merge branch 'master' into 4523-full-text-search

[arvados.git] / apps / workbench / app / controllers / repositories_controller.rb

diff --git a/apps/workbench/app/controllers/repositories_controller.rb b/apps/workbench/app/controllers/repositories_controller.rb
index 5dd9288e121e6f355b4ef8dfbe97832ed25b9a8e..d32c92a1e71fde336c99b52b990b86f019662af8 100644 (file)
--- a/apps/workbench/app/controllers/repositories_controller.rb
+++ b/apps/workbench/app/controllers/repositories_controller.rb
@@ -7,9 +7,13 @@ class RepositoriesController < ApplicationController
 
   def show_pane_list
     if @user_is_manager
-      super | %w(Sharing)
+      panes = super | %w(Sharing)
+      panes.insert(panes.length-1, panes.delete_at(panes.index('Advanced'))) if panes.index('Advanced')
+      panes
     else
-      super
+      panes = super
     end
+    panes.delete('Attributes') if !current_user.is_admin
+    panes
   end
 end