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

Merge branch 'master' into skylight-instrumentation

Browse source
This commit is contained in:
James Mason 2018-02-13 08:56:22 -08:00 • committed by GitHub
commit 4dc09a678b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 130 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/ability.rb
View file

@ -66,7 +66,13 @@ class Ability
can [:new, :create], Registration do |registration|
conference = registration.conference
conference.registration_open? && !conference.registration_limit_exceeded? || conference.program.speakers.confirmed.include?(user)
if conference.user_registered? user
false
elsif conference.program.speakers.confirmed.include?(user) && conference.registration_period
true
else
conference.registration_open? && !conference.registration_limit_exceeded?
end
end
can :index, Organization