base controller

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

View file

@ -1,5 +1,5 @@
module Admin
class EmailsController < ApplicationController
class EmailsController < Admin::BaseController
load_and_authorize_resource :conference, find_by: :short_title
load_and_authorize_resource class: EmailSettings