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

rework users page, add role assignment

Browse source
This commit is contained in:
Stella Rouzi 2014-07-20 19:40:16 +03:00
parent 9998e00ae3
commit 80d48ed7d8
13 changed files with 118 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/conference_registration_controller.rb
View file

@ -1,7 +1,7 @@
class ConferenceRegistrationController < ApplicationController
before_filter :verify_user
authorize_resource class: false
load_and_authorize_resource :conference, find_by: :short_title
authorize_resource :conference_registration, class: Registration
def register
@workshops = @conference.events.where('require_registration = ? AND state LIKE ?',