[ARVADOS] updated: 71ed41b87ab6b1b2db92752c59fdf7cf59c2b2cd

[git at public.curoverse.com]

Summary of changes:
 .../api/app/controllers/arvados/v1/repositories_controller.rb  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

       via  71ed41b87ab6b1b2db92752c59fdf7cf59c2b2cd (commit)
      from  b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 71ed41b87ab6b1b2db92752c59fdf7cf59c2b2cd
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 12 14:57:10 2014 -0400

    Fix repositories.get_all_permissions to report manage, write, and read. refs #3525

diff --git a/services/api/app/controllers/arvados/v1/repositories_controller.rb b/services/api/app/controllers/arvados/v1/repositories_controller.rb
index 94c172d..0452c52 100644
--- a/services/api/app/controllers/arvados/v1/repositories_controller.rb
+++ b/services/api/app/controllers/arvados/v1/repositories_controller.rb
@@ -18,7 +18,9 @@ class Arvados::V1::RepositoriesController < ApplicationController
         if ArvadosModel::resource_class_for_uuid(perm.tail_uuid) == Group
           @users.each do |user_uuid, user|
             user.group_permissions.each do |group_uuid, perm_mask|
-              if perm_mask[:write]
+              if perm_mask[:manage]
+                perms << {name: 'can_manage', user_uuid: user_uuid}
+              elsif perm_mask[:write]
                 perms << {name: 'can_write', user_uuid: user_uuid}
               elsif perm_mask[:read]
                 perms << {name: 'can_read', user_uuid: user_uuid}
@@ -57,7 +59,11 @@ class Arvados::V1::RepositoriesController < ApplicationController
     end
     @repo_info.values.each do |repo_users|
       repo_users[:user_permissions].each do |user_uuid,perms|
-        if perms['can_write']
+        if perms['can_manage']
+          perms[:gitolite_permissions] = 'RW'
+          perms['can_write'] = true
+          perms['can_read'] = true
+        elsif perms['can_write']
           perms[:gitolite_permissions] = 'RW'
           perms['can_read'] = true
         elsif perms['can_read']

-----------------------------------------------------------------------


hooks/post-receive
--