New associations and models: schedule versioning
For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data. User Interface addapted to make use of the introduced associations and models
This commit is contained in:
parent
e34a1904e0
commit
c047ffd699
21 changed files with 165 additions and 49 deletions
|
|
@ -106,18 +106,18 @@
|
|||
%td
|
||||
= @event.language
|
||||
|
||||
- unless @event.room.nil?
|
||||
- unless @event.scheduled_room.nil?
|
||||
%tr
|
||||
%td
|
||||
%b Room
|
||||
%td
|
||||
= @event.room.name
|
||||
- unless @event.start_time.nil?
|
||||
= @event.scheduled_room.name
|
||||
- unless @event.scheduled_start_time.nil?
|
||||
%tr
|
||||
%td
|
||||
%b Scheduled time
|
||||
%td
|
||||
= @event.start_time
|
||||
= @event.scheduled_start_time
|
||||
%tr
|
||||
%td
|
||||
%b Submitter
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
for
|
||||
= @event.title
|
||||
|
||||
- if @event.room && (@event_registrations.length > @event.room.size)
|
||||
- if @event.scheduled_room && (@event_registrations.length > @event.scheduled_room.size)
|
||||
%b Attention:
|
||||
You have more registrations than the capacity of the room!
|
||||
|
||||
|
|
|
|||
|
|
@ -27,5 +27,4 @@
|
|||
%td
|
||||
= event.state
|
||||
%td
|
||||
= event.start_time
|
||||
|
||||
= event.scheduled_start_time
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue