Browse Source

Apply callback to :change_organiser, allow :activity_id

Maarten van den Berg 7 years ago
parent
commit
29cc5d0401
1 changed files with 3 additions and 3 deletions
  1. 3 3
      app/controllers/activities_controller.rb

+ 3 - 3
app/controllers/activities_controller.rb

1
 class ActivitiesController < ApplicationController
1
 class ActivitiesController < ApplicationController
2
   include GroupsHelper
2
   include GroupsHelper
3
   include ActivitiesHelper
3
   include ActivitiesHelper
4
-  before_action :set_activity_and_group, only: [:show, :edit, :update, :destroy, :presence]
5
-  before_action :set_group,            except: [:show, :edit, :update, :destroy, :presence]
4
+  before_action :set_activity_and_group, only: [:show, :edit, :update, :destroy, :presence, :change_organizer]
5
+  before_action :set_group,            except: [:show, :edit, :update, :destroy, :presence, :change_organizer]
6
   before_action :require_membership!
6
   before_action :require_membership!
7
   before_action :require_leader!, only: [:mass_new, :mass_create, :new, :create, :destroy]
7
   before_action :require_leader!, only: [:mass_new, :mass_create, :new, :create, :destroy]
8
   before_action :require_organizer!, only: [:edit, :update, :change_organizer]
8
   before_action :require_organizer!, only: [:edit, :update, :change_organizer]
162
   private
162
   private
163
     # The Activity's group takes precedence over whatever's in the URL, set_group not required (and can be mislead)
163
     # The Activity's group takes precedence over whatever's in the URL, set_group not required (and can be mislead)
164
     def set_activity_and_group
164
     def set_activity_and_group
165
-      @activity = Activity.find(params[:id])
165
+      @activity = Activity.find(params[:id] || params[:activity_id])
166
       @group = @activity.group
166
       @group = @activity.group
167
     end
167
     end
168
 
168