diff --git a/app/policies/user/participation_policy.rb b/app/policies/user/participation_policy.rb index f9bcab5301ee4dc247ed4155fd115e7c02481dfa..59c80c7e9ee6b31ebdc3b3a781cf6d3b1fd0fc6d 100644 --- a/app/policies/user/participation_policy.rb +++ b/app/policies/user/participation_policy.rb @@ -11,7 +11,11 @@ class User::ParticipationPolicy < ApplicationPolicy elsif participation.user_id == page.owner_id and page.owner_type == 'User' false else - user.may_admin_page_without?(page, participation) + # FIXME: this is too restrictive, users should be able to remove + # themselves from pages if they are not page owners (which is + # tested above) + # user.may_admin_page_without?(page, participation) + true end end diff --git a/config/en.yml b/config/en.yml index c8f0077bd0df6b15fda7316716544c0a6e2ca998..5b027de692dd93b9a1bbcf7ac65e408429f6f63b 100644 --- a/config/en.yml +++ b/config/en.yml @@ -397,7 +397,8 @@ en: group_successfully_created: Group was successfully created. join_group_confirmation: Are you sure you want to join this %{group_type}? join_group_link: Join %{group_type} - leave_group_confirmation: Are you sure you want to leave this %{group_type}? + leave_group_confirmation: Are you sure you want to leave this %{group_type}? You will + loose access to all pages owned by this %{group_type}. leave_group_link: Leave %{group_type} link_name_description: This name is how you will refer to this group in links and URLs. It must only contain alphanumeric characters, no spaces allowed. diff --git a/config/locales/en/groups.yml b/config/locales/en/groups.yml index b18d80f1b7c9fed20c8cbaa2b825bfde21a4da22..ec38eb3f56891bfc1e154bb3640eb7a87f19b970 100644 --- a/config/locales/en/groups.yml +++ b/config/locales/en/groups.yml @@ -89,7 +89,7 @@ en: group_successfully_created: "Group was successfully created." join_group_confirmation: "Are you sure you want to join this %{group_type}?" join_group_link: "Join %{group_type}" - leave_group_confirmation: "Are you sure you want to leave this %{group_type}?" + leave_group_confirmation: "Are you sure you want to leave this %{group_type}? You will loose access to all pages owned by this %{group_type}." leave_group_link: "Leave %{group_type}" link_name_description: "This name is how you will refer to this group in links and URLs. It must only contain alphanumeric characters, no spaces allowed." network_initial_member: "Choose an organization to be an initial member of this network."