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

Merge pull request #28 from differentreality/event_registration

Browse source 
Show No of registrations for proposal, in proposal index page
This commit is contained in:
Henne Vogelsang 2014-01-23 03:25:04 -08:00
commit 9d09d6d038
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -30,6 +30,10 @@ module ApplicationHelper
end end
end end
def pre_registered(event)
@conference.events.joins(:registrations).where("events.id = ?", event.id)
end
def add_association_link(association_name, form_builder, div_class, html_options = {}) def add_association_link(association_name, form_builder, div_class, html_options = {})
link_to_add_association "Add " + association_name.to_s.singularize, form_builder, div_class, html_options.merge(:class => "assoc btn btn-success") link_to_add_association "Add " + association_name.to_s.singularize, form_builder, div_class, html_options.merge(:class => "assoc btn btn-success")
end end

2
app/views/proposal/index.html.haml
View file

@ -22,6 +22,8 @@
= link_to event.title, conference_proposal_path(@conference.short_title, event.id) = link_to event.title, conference_proposal_path(@conference.short_title, event.id)
%td %td
= event.public_state = event.public_state
- if event.state == 'confirmed' && event.require_registration == true
(Pre-registered: #{pre_registered(event).count})
- if event.confirmed? && !@conference.user_registered?(current_user) - if event.confirmed? && !@conference.user_registered?(current_user)
%br %br
= link_to "Register to attend", register_conference_path(@conference.short_title), :style => "font-size:10px;" = link_to "Register to attend", register_conference_path(@conference.short_title), :style => "font-size:10px;"