Skip to content
Snippets Groups Projects
Commit 0d3aa3f5 authored by azul's avatar azul
Browse files

fix: bring back parts of 17911b99

The more verbose messages still make sense.
Letting users remove themselves from pages owned by groups aswell.
parent e8392c58
Branches
No related tags found
1 merge request!293Rails 5.2 upgrade
...@@ -11,7 +11,11 @@ class User::ParticipationPolicy < ApplicationPolicy ...@@ -11,7 +11,11 @@ class User::ParticipationPolicy < ApplicationPolicy
elsif participation.user_id == page.owner_id and page.owner_type == 'User' elsif participation.user_id == page.owner_id and page.owner_type == 'User'
false false
else 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
end end
......
...@@ -397,7 +397,8 @@ en: ...@@ -397,7 +397,8 @@ en:
group_successfully_created: Group was successfully created. group_successfully_created: Group was successfully created.
join_group_confirmation: Are you sure you want to join this %{group_type}? join_group_confirmation: Are you sure you want to join this %{group_type}?
join_group_link: Join %{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} leave_group_link: Leave %{group_type}
link_name_description: This name is how you will refer to this group in links and 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. URLs. It must only contain alphanumeric characters, no spaces allowed.
......
...@@ -89,7 +89,7 @@ en: ...@@ -89,7 +89,7 @@ en:
group_successfully_created: "Group was successfully created." group_successfully_created: "Group was successfully created."
join_group_confirmation: "Are you sure you want to join this %{group_type}?" join_group_confirmation: "Are you sure you want to join this %{group_type}?"
join_group_link: "Join %{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}" 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." 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." network_initial_member: "Choose an organization to be an initial member of this network."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment