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

Add Booth type dropdown and update ability file.

Browse source
This commit is contained in:
Rishabh Singh 2019-08-17 18:11:47 +05:30
parent 319b8b5bf7
commit 7dd9780c84
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/helpers/events_helper.rb
View file

@ -73,6 +73,21 @@ module EventsHelper
active_dropdown(selection, options) active_dropdown(selection, options)
end end
def booth_type_dropdown(booth, booth_types, conference_id)
selection = booth.booth_type.try(:title) || 'Booth Type'
options = booth_types.collect do |booth_type|
[
booth_type.title,
admin_conference_booth_path(
conference_id,
booth,
booth: { booth_type_id: booth_type.id }
)
]
end
active_dropdown(selection, options)
end
def track_dropdown(event, tracks, conference_id) def track_dropdown(event, tracks, conference_id)
selection = event.track.try(:name) || 'Track' selection = event.track.try(:name) || 'Track'
options = tracks.collect do |track| options = tracks.collect do |track|

6
app/models/admin_ability.rb
View file

@ -102,6 +102,7 @@ class AdminAbility
signed_in_with_organizer_role(user, conf_ids_for_organization_admin) signed_in_with_organizer_role(user, conf_ids_for_organization_admin)
end end
# rubocop:disable Metrics/AbcSize
def signed_in_with_organizer_role(user, conf_ids_for_organization_admin = []) def signed_in_with_organizer_role(user, conf_ids_for_organization_admin = [])
# ids of all the conferences for which the user has the 'organizer' role and # ids of all the conferences for which the user has the 'organizer' role and
# conferences that belong to organizations for which user is 'organization_admin' # conferences that belong to organizations for which user is 'organization_admin'
@ -131,6 +132,7 @@ class AdminAbility
can :manage, Cfp, program: { conference_id: conf_ids } can :manage, Cfp, program: { conference_id: conf_ids }
can :manage, Event, program: { conference_id: conf_ids } can :manage, Event, program: { conference_id: conf_ids }
can :manage, EventType, program: { conference_id: conf_ids } can :manage, EventType, program: { conference_id: conf_ids }
can :manage, BoothType, program: { conference_id: conf_ids }
can :manage, Track, program: { conference_id: conf_ids } can :manage, Track, program: { conference_id: conf_ids }
can :manage, DifficultyLevel, program: { conference_id: conf_ids } can :manage, DifficultyLevel, program: { conference_id: conf_ids }
can :manage, Commercial, commercialable_type: 'Event', can :manage, Commercial, commercialable_type: 'Event',
@ -163,6 +165,7 @@ class AdminAbility
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, item_type: 'User' can [:index, :revert_object, :revert_attribute], PaperTrail::Version, item_type: 'User'
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, conference_id: conf_ids can [:index, :revert_object, :revert_attribute], PaperTrail::Version, conference_id: conf_ids
end end
# rubocop:enable Metrics/AbcSize
def signed_in_with_cfp_role(user) def signed_in_with_cfp_role(user)
# ids of all the conferences for which the user has the 'cfp' role # ids of all the conferences for which the user has the 'cfp' role
@ -175,6 +178,7 @@ class AdminAbility
can :manage, Booth, conference_id: conf_ids_for_cfp can :manage, Booth, conference_id: conf_ids_for_cfp
can :manage, Event, program: { conference_id: conf_ids_for_cfp } can :manage, Event, program: { conference_id: conf_ids_for_cfp }
can :manage, EventType, program: { conference_id: conf_ids_for_cfp } can :manage, EventType, program: { conference_id: conf_ids_for_cfp }
can :manage, BoothType, program: { conference_id: conf_ids_for_cfp }
can :manage, Track, program: { conference_id: conf_ids_for_cfp } can :manage, Track, program: { conference_id: conf_ids_for_cfp }
can :manage, DifficultyLevel, program: { conference_id: conf_ids_for_cfp } can :manage, DifficultyLevel, program: { conference_id: conf_ids_for_cfp }
can :manage, EmailSettings, conference_id: conf_ids_for_cfp can :manage, EmailSettings, conference_id: conf_ids_for_cfp
@ -201,7 +205,7 @@ class AdminAbility
end end
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, can [:index, :revert_object, :revert_attribute], PaperTrail::Version,
item_type: %w[Event EventType Track DifficultyLevel EmailSettings Room Cfp Program Comment], conference_id: conf_ids_for_cfp item_type: %w[Event EventType BoothType Track DifficultyLevel EmailSettings Room Cfp Program Comment], conference_id: conf_ids_for_cfp
can [:index, :revert_object, :revert_attribute], PaperTrail::Version, can [:index, :revert_object, :revert_attribute], PaperTrail::Version,
["item_type = 'Commercial' AND conference_id IN (?) AND (object LIKE '%Event%' OR object_changes LIKE '%Event%')", conf_ids_for_cfp] do |version| ["item_type = 'Commercial' AND conference_id IN (?) AND (object LIKE '%Event%' OR object_changes LIKE '%Event%')", conf_ids_for_cfp] do |version|
version.item_type == 'Commercial' && conf_ids_for_cfp.include?(version.conference_id) && version.item_type == 'Commercial' && conf_ids_for_cfp.include?(version.conference_id) &&