Merge branch 'master' into Hide_recent_Registrations/Submissions
This commit is contained in:
commit
4e227b4858
11 changed files with 57 additions and 22 deletions
|
|
@ -1,6 +1,6 @@
|
|||
class EventUser < ActiveRecord::Base
|
||||
# TODO Do we need these roles?
|
||||
ROLES = [['Speaker', 'speaker'], ['Submitter', 'submitter'], ['Moderator', 'moderator']]
|
||||
ROLES = [%w[Speaker speaker], %w[Submitter submitter], %w[Moderator moderator]]
|
||||
|
||||
belongs_to :event
|
||||
belongs_to :user
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue