Browse Source

Better fix

Maarten van den Berg 7 years ago
parent
commit
129abe9942

+ 0 - 1
app/helpers/activities_helper.rb

1
 module ActivitiesHelper
1
 module ActivitiesHelper
2
   def require_organizer!
2
   def require_organizer!
3
-    require_login!
4
     if !@activity.may_change?(current_person)
3
     if !@activity.may_change?(current_person)
5
       flash_message(:danger, I18n.t('authentication.organizer_required'))
4
       flash_message(:danger, I18n.t('authentication.organizer_required'))
6
       redirect_to group_activity_path(@group, @activity)
5
       redirect_to group_activity_path(@group, @activity)

+ 2 - 0
app/helpers/authentication_helper.rb

121
     if !is_logged_in?
121
     if !is_logged_in?
122
       flash_message(:warning, I18n.t('authentication.login_required'))
122
       flash_message(:warning, I18n.t('authentication.login_required'))
123
       redirect_to controller: 'authentication', action: 'login_form'
123
       redirect_to controller: 'authentication', action: 'login_form'
124
+      return false
124
     end
125
     end
126
+    return true
125
   end
127
   end
126
 
128
 
127
   def require_admin!
129
   def require_admin!

+ 2 - 2
app/helpers/groups_helper.rb

1
 module GroupsHelper
1
 module GroupsHelper
2
   def require_membership!
2
   def require_membership!
3
-    require_login!
3
+    return unless require_login!
4
     if !(@group.is_member?(current_person) || current_person.is_admin?)
4
     if !(@group.is_member?(current_person) || current_person.is_admin?)
5
       flash_message(:danger, I18n.t('groups.membership_required'))
5
       flash_message(:danger, I18n.t('groups.membership_required'))
6
       redirect_to dashboard_home_path
6
       redirect_to dashboard_home_path
8
   end
8
   end
9
 
9
 
10
   def require_leader!
10
   def require_leader!
11
-    require_login!
11
+    return unless require_login!
12
 
12
 
13
     if !(@group.is_leader?(current_person) ||
13
     if !(@group.is_leader?(current_person) ||
14
          current_person.is_admin?)
14
          current_person.is_admin?)