Merge branch 'master' into 4467-project-contents-select-all

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

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index 7443216c4b5622f477a1050e465a88962b9009fa..f6d571157d02459f8450478ba42aee71c572e3e5 100644 (file)
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -52,15 +52,15 @@ class UsersController < ApplicationController
                1.month.ago.beginning_of_month,
                Time.now.beginning_of_month]]
     @spans.each do |span, threshold_start, threshold_end|
-      @activity[:logins][span] = Log.
+      @activity[:logins][span] = Log.select(%w(uuid modified_by_user_uuid)).
         filter([[:event_type, '=', 'login'],
                 [:object_kind, '=', 'arvados#user'],
                 [:created_at, '>=', threshold_start],
                 [:created_at, '<', threshold_end]])
-      @activity[:jobs][span] = Job.
+      @activity[:jobs][span] = Job.select(%w(uuid modified_by_user_uuid)).
         filter([[:created_at, '>=', threshold_start],
                 [:created_at, '<', threshold_end]])
-      @activity[:pipeline_instances][span] = PipelineInstance.
+      @activity[:pipeline_instances][span] = PipelineInstance.select(%w(uuid modified_by_user_uuid)).
         filter([[:created_at, '>=', threshold_start],
                 [:created_at, '<', threshold_end]])
       @activity.each do |type, act|
@@ -241,11 +241,12 @@ class UsersController < ApplicationController
               ['link_class', '=', 'permission'],
              ])
 
+    owned_repositories = Repository.where(owner_uuid: current_user.uuid)
+
     @my_repositories = (Repository.where(uuid: repo_links.collect(&:head_uuid)) |
-                        Repository.where(owner_uuid: current_user.uuid)).
+                        owned_repositories).
                        uniq { |repo| repo.uuid }
 
-    owned_repositories = Repository.where(owner_uuid: current_user.uuid).collect(&:uuid)
 
     @repo_writable = {}
     repo_links.each do |link|
@@ -255,7 +256,7 @@ class UsersController < ApplicationController
     end
 
     owned_repositories.each do |repo|
-      @repo_writable[repo] = 'can_manage'
+      @repo_writable[repo.uuid] = 'can_manage'
     end
 
     # virtual machines the current user can login into