Merge branch 'master' into Hide_recent_Registrations/Submissions

This commit is contained in:
Stella Rouzi 2017-06-12 10:14:56 +03:00 committed by GitHub
commit 4e227b4858
11 changed files with 57 additions and 22 deletions

View file

@ -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