gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base controller

Browse source 
Conflicts:
	app/controllers/admin/commercials_controller.rb
	app/controllers/admin/questions_controller.rb
	app/controllers/admin/users_controller.rb
This commit is contained in:
Stella Rouzi 2014-08-13 14:37:05 +03:00
parent 336d0e9d04
commit 17ebad413e
29 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/commercials_controller.rb
View file

@ -1,5 +1,5 @@
module Admin
class CommercialsController < ApplicationController
class CommercialsController < Admin::BaseController
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource through: :conference, except: [:new, :create]
@ -9,7 +9,7 @@ module Admin
def new
@commercial = @conference.commercials.build
authorize! :create, @commercial
authorize! :create, @conference.commercials.new
end
def edit; end