projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5989: API repo perms method always returns all repos.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
repositories_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/repositories_controller.rb
b/services/api/app/controllers/arvados/v1/repositories_controller.rb
index b5123d97e3017af8b9c5fbcbf4e8d98a81a91436..fd6ab582071cc65f27ad0c943ad2b2d75ff03f6b 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/repositories_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/repositories_controller.rb
@@
-4,14
+4,20
@@
class Arvados::V1::RepositoriesController < ApplicationController
before_filter :admin_required, :only => :get_all_permissions
def get_all_permissions
@users = {}
before_filter :admin_required, :only => :get_all_permissions
def get_all_permissions
@users = {}
- User.includes(:authorized_keys).
all.
each do |u|
+ User.includes(:authorized_keys).
find_
each do |u|
@users[u.uuid] = u
end
admins = @users.select { |k,v| v.is_admin }
@user_aks = {}
@repo_info = {}
@users[u.uuid] = u
end
admins = @users.select { |k,v| v.is_admin }
@user_aks = {}
@repo_info = {}
- @repos = Repository.includes(:permissions).all
- @repos.each do |repo|
+ Repository.includes(:permissions).find_each do |repo|
+ @repo_info[repo.uuid] = {
+ uuid: repo.uuid,
+ name: repo.name,
+ push_url: repo.push_url,
+ fetch_url: repo.fetch_url,
+ user_permissions: {},
+ }
gitolite_permissions = ''
perms = []
repo.permissions.each do |perm|
gitolite_permissions = ''
perms = []
repo.permissions.each do |perm|
@@
-45,13
+51,6
@@
class Arvados::V1::RepositoriesController < ApplicationController
}
end || []
if @user_aks[user_uuid].any?
}
end || []
if @user_aks[user_uuid].any?
- @repo_info[repo.uuid] ||= {
- uuid: repo.uuid,
- name: repo.name,
- push_url: repo.push_url,
- fetch_url: repo.fetch_url,
- user_permissions: {}
- }
ri = (@repo_info[repo.uuid][:user_permissions][user_uuid] ||= {})
ri[perm[:name]] = true
end
ri = (@repo_info[repo.uuid][:user_permissions][user_uuid] ||= {})
ri[perm[:name]] = true
end