Merge remote-tracking branch 'erasche/what-i-have' into remove_sample…

…s_000
galaxyproject · Sep 29, 2017 · 81f111c · 81f111c
2 parents 73bb4ba + 1494207
commit 81f111c
Show file tree

Hide file tree

Showing 53 changed files with 44 additions and 5,986 deletions.
diff --git a/client/galaxy/scripts/apps/panels/admin-panel.js b/client/galaxy/scripts/apps/panels/admin-panel.js
@@ -26,7 +26,41 @@ var AdminPanel = Backbone.View.extend({
             },{
                 title   : 'Manage jobs',
                 url     : 'admin/jobs'
+            },{
+                title   : 'Local data',
+                url     : 'data_manager'
             } ]
+        },{
+            title : 'User Management',
+            items : [ {
+                title   : 'Users',
+                url     : 'admin/users',
+                target  : '__use_router__'
+            },{
+                title   : 'Quotas',
+                url     : 'admin/quotas',
+                target  : '__use_router__',
+                enabled : self.config.enable_quotas
+            },{
+                title   : 'Groups',
+                url     : 'admin/groups',
+                target  : '__use_router__'
+            },{
+                title   : 'Roles',
+                url     : 'admin/roles',
+                target  : '__use_router__'
+            },{
+                title   : 'Forms',
+                url     : 'admin/forms',
+                target  : '__use_router__'
+            },{
+                title   : 'API keys',
+                url     : 'userskeys/all_users'
+            },{
+                title   : 'Impersonate a user',
+                url     : 'admin/impersonate',
+                enabled : self.config.allow_user_impersonation
+            }]
         },{
             title : 'Tools and Tool Shed',
             items : [ {
@@ -72,68 +106,6 @@ var AdminPanel = Backbone.View.extend({
                 title   : 'Manage Tool Dependencies',
                 url     : 'admin/manage_tool_dependencies'
             } ]
-        },{
-            title : 'User Management',
-            items : [ {
-                title   : 'Users',
-                url     : 'admin/users',
-                target  : '__use_router__'
-            },{
-                title   : 'Groups',
-                url     : 'admin/groups',
-                target  : '__use_router__'
-            },{
-                title   : 'Roles',
-                url     : 'admin/roles',
-                target  : '__use_router__'
-            },{
-                title   : 'API keys',
-                url     : 'userskeys/all_users'
-            },{
-                title   : 'Impersonate a user',
-                url     : 'admin/impersonate',
-                enabled : self.config.allow_user_impersonation
-            } ]
-        },{
-            title : 'Data',
-            items : [ {
-                title   : 'Quotas',
-                url     : 'admin/quotas',
-                target  : '__use_router__',
-                enabled : self.config.enable_quotas
-            },{
-                title   : 'Data libraries',
-                url     : 'library_admin/browse_libraries'
-            },{
-                title   : 'Roles',
-                url     : 'admin/roles',
-                target  : '__use_router__'
-            },{
-                title   : 'Local data',
-                url     : 'data_manager'
-            } ]
-        },{
-            title : 'Form Definitions',
-            items : [ {
-                title   : 'Form definitions',
-                url     : 'admin/forms',
-                target  : '__use_router__'
-            } ]
-        },{
-            title : 'Sample Tracking',
-            items : [ {
-                title   : 'Sequencers and external services',
-                url     : 'external_service/browse_external_services'
-            },{
-                title   : 'Request types',
-                url     : 'request_type/browse_request_types'
-            },{
-                title   : 'Sequencing requests',
-                url     : 'requests_admin/browse_requests'
-            },{
-                title   : 'Find samples',
-                url     : 'requests_common/find_samples?cntrller=requests_admin'
-            } ]
         }]);
         this.setElement( this._template() );
     },

diff --git a/client/galaxy/scripts/layout/menu.js b/client/galaxy/scripts/layout/menu.js
@@ -65,24 +65,6 @@ var Collection = Backbone.Collection.extend({
             }]
         });
 
-        //
-        // Lab menu.
-        //
-        options.user_requests && this.add({
-            id              : 'lab',
-            title           : 'Lab',
-            menu            : [{
-                    title   : 'Sequencing Requests',
-                    url     : 'requests/index'
-                },{
-                    title   : 'Find Samples',
-                    url     : 'requests/find_samples_index'
-                },{
-                    title   : 'Help',
-                    url     : options.lims_doc_url
-            }]
-        });
-
         //
         // Visualization tab.
         //

diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py
@@ -233,14 +233,6 @@ def tags_used(self, user, tag_models=None):
         tags = [((name + ':' + val) if val else name) for name, val in tags]
         return sorted(tags)
 
-    def has_requests(self, user, trans):
-        """
-        """
-        if self.is_anonymous(user):
-            return False
-        request_types = self.app.security_agent.get_accessible_request_types(trans, user)
-        return bool(user.requests or request_types)
-
 
 class UserSerializer(base.ModelSerializer, deletable.PurgableSerializerMixin):
     model_manager_class = UserManager
@@ -292,7 +284,6 @@ def add_serializers(self):
             'quota'         : lambda i, k, **c: self.user_manager.quota(i, total=True),
 
             'tags_used'     : lambda i, k, **c: self.user_manager.tags_used(i),
-            'has_requests'  : lambda i, k, trans=None, **c: self.user_manager.has_requests(i, trans)
         })