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

Merge a84441ca80 into 47bc3c7354

Browse source
This commit is contained in:
David Sedeño 2016-04-15 09:41:55 +00:00
commit 9b8c80d7e8
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/admin/events/_proposal.html.haml
View file

@ -94,13 +94,23 @@
off_color: 'warning',
on_text: 'Yes',
off_text: 'No' }
- if @event.require_registration
%tr
%td
%b Registrations
%td
= @event.registrations.size
- if !@event.room.nil?
%tr
%td
%b Room
%td
= @event.room.name
%tr
%td
%b Room size
%td
= @event.room.size
- if !@event.start_time.nil?
%tr
%td

6
app/views/admin/events/index.html.haml
View file

@ -24,6 +24,8 @@
%b Speaker
%th
%b Pre-registration
%th
%b Registrations
%th
%b Highlight
%th
@ -90,7 +92,9 @@
off_color: 'warning',
on_text: 'Yes',
off_text: 'No' }
%td
- if event.require_registration
= event.registrations.size
%td{'data-order' => "#{event.is_highlight}"}
= check_box_tag @conference.short_title, event.id, event.is_highlight,
method: :patch, url: "/admin/conference/#{@conference.short_title}/program/events/#{event.id}?event[is_highlight]=",