update

app/views/admin/conference/_recent_submissions.html.haml

@@ -16,8 +16,8 @@
                 %td= link_to event.submitter.name, admin_user_path(event.submitter.id)
               - else
                 %td Unknown Submitter
-              %td= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
-              %td= link_to event.conference.title, admin_conference_path(event.conference.short_title)
+              %td= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
+              %td= link_to event.program.conference.title, admin_conference_path(event.program.conference.short_title)
               %td
                 .span{'class'=>label_for(event.state)} #{event.state.humanize}
 - else

app/views/admin/conference/_todo_list.html.haml

@@ -17,8 +17,8 @@
       Set up registration period
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['cfp'])}"}
     %span{'class'=>icon_for_todo(conference_progress['cfp'])}
-    - if can? :update, CallForPaper.new(conference_id: @conference.id)
-      = link_to 'Set up call for papers', admin_conference_call_for_paper_path(conference_progress['short_title'])
+    - if can? :update, Cfp.new(program_id: @program.id)
+      = link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title'])
     - else
       Set up call for papers
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['venue'])}"}
@@ -32,26 +32,26 @@
       Add venue
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['rooms'])}"}
     %span{'class'=>icon_for_todo(conference_progress['rooms'])}
-    - if can? :update, @conference.rooms.build
-      = link_to 'Add rooms', admin_conference_rooms_path(conference_progress['short_title'])
+    - if @conference.venue && (can? :update, @conference.venue.rooms.build)
+      = link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title'])
     - else
       Add rooms
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['tracks'])}"}
     %span{'class'=>icon_for_todo(conference_progress['tracks'])}
-    - if can? :update, @conference.tracks.build
-      = link_to 'Add tracks', admin_conference_tracks_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.tracks.build
+      = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title'])
     - else
       Add tracks
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['event_types'])}"}
     %span{'class'=>icon_for_todo(conference_progress['event_types'])}
-    - if can? :update, @conference.event_types.build
-      = link_to 'Add event types', admin_conference_event_types_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.event_types.build
+      = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title'])
     - else
       Add event types
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['difficulty_levels'])}"}
     %span{'class'=>icon_for_todo(conference_progress['difficulty_levels'])}
-    - if can? :update, @conference.difficulty_levels.build
-      = link_to 'Add difficulty levels', admin_conference_difficulty_levels_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.difficulty_levels.build
+      = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title'])
     - else
       Add difficulty levels
   %li{class: "list-group-item #{class_for_todo(conference_progress['splashpage'])}"}

app/views/admin/conference/edit.html.haml

@@ -18,5 +18,6 @@
         = f.input :timezone, :as => :time_zone, :hint => "The conference time zone"
         = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
         = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
+      = f.inputs name: "Registrations" do
+        = f.input :registration_limit, as: :number, in: 0..9999, hint: "Limit the number of registrations to the conference (0 no limit)"
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}
-