[ARVADOS] created: 1.3.0-1393-g431f22982

Git user git at public.curoverse.com
Fri Jul 26 13:26:49 UTC 2019


        at  431f22982dfee8f4d1c9590b3bce8d36709d5dd9 (commit)


commit 431f22982dfee8f4d1c9590b3bce8d36709d5dd9
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Fri Jul 26 10:25:10 2019 -0300

    15496: Sets default attribute to 'x' instead of nil on check_box_tag.
    
    It seems that the tag helper on rails 5.0 ignores all attributes with
    falsy values.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/views/users/_show_admin.html.erb b/apps/workbench/app/views/users/_show_admin.html.erb
index 89156aaf8..ddff79be0 100644
--- a/apps/workbench/app/views/users/_show_admin.html.erb
+++ b/apps/workbench/app/views/users/_show_admin.html.erb
@@ -76,7 +76,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
                     disabled: (group.owner_uuid == @object.uuid),
                     data: {
                       permission_head: group.uuid,
-                      permission_uuid: permitted_group_perms[group.uuid]}) %>
+                      permission_uuid: permitted_group_perms[group.uuid] || 'x'}) %>
                 <small>user→group</small>
               </label>
               <label class="checkbox-inline" data-toggle-permission="true" data-permission-head="<%= @object.uuid %>" data-permission-name="can_read">
@@ -87,7 +87,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
                     disabled: (group.owner_uuid == @object.uuid),
                     data: {
                       permission_tail: group.uuid,
-                      permission_uuid: member_group_perms[group.uuid]}) %>
+                      permission_uuid: member_group_perms[group.uuid] || 'x'}) %>
                 <small>group→user</small>
               </label>
               <label class="checkbox-inline">

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list