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

Fixes tracks form

Browse source
This commit is contained in:
Chrisbr 2014-04-28 20:01:20 +02:00
parent c4fbf8d038
commit c67b255e05
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/admin/tracks_controller.rb
View file

@ -10,9 +10,9 @@ class Admin::TracksController < ApplicationController
def update
if @conference.update_attributes(params[:conference])
redirect_to(admin_conference_tracks_list_path(:conference_id => @conference.short_title), :notice => 'Tracks were successfully updated.')
redirect_to(admin_conference_tracks_path(:conference_id => @conference.short_title), :notice => 'Tracks were successfully updated.')
else
redirect_to(admin_conference_tracks_list_path(:conference_id => @conference.short_title), :notice => 'Tracks update failed.')
redirect_to(admin_conference_tracks_path(:conference_id => @conference.short_title), :notice => 'Tracks update failed.')
end
end

4
app/views/admin/conference/_sidebar.html.haml
View file

@ -8,8 +8,8 @@
= link_to "Call for Papers", admin_conference_cfp_info_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_rooms_path(@conference.short_title))}
= link_to "Rooms", admin_conference_rooms_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_tracks_list_path(@conference.short_title))}
= link_to "Tracks", admin_conference_tracks_list_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_tracks_path(@conference.short_title))}
= link_to "Tracks", admin_conference_tracks_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_eventtype_list_path(@conference.short_title))}
= link_to "Event Types", admin_conference_eventtype_list_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_difficulty_levels_path(@conference.short_title))}

2
app/views/admin/tracks/tracks_list.html.haml → app/views/admin/tracks/index.html.haml
View file

@ -2,6 +2,6 @@
.col-md-3
= render 'admin/conference/sidebar'
.col-md-9
= semantic_form_for(@conference, :url => admin_conference_tracks_update_path(@conference.short_title)) do |f|
= semantic_form_for(@conference, :url => admin_conference_track_path(:conference_id => @conference.short_title, :id => @conference.tracks)) do |f|
= dynamic_association :tracks, "Tracks", f
= f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

3
config/routes.rb
View file

@ -24,8 +24,6 @@ Osem::Application.routes.draw do
put "/venue" => "venue#update", :as => "venue_update"
get "/social_events" => "social_events#show", :as => "social_events"
put "/social_events" => "social_events#update"
get "/tracks" => "tracks#show", :as => "tracks_list"
put "/tracks" => "tracks#update", :as => "tracks_update"
get "/dietary_choices" => "dietchoices#show", :as => "dietary_list"
put "/dietary_choices" => "dietchoices#update", :as => "dietary_update"
get "/volunteers_list" => "volunteers#show"
@ -39,6 +37,7 @@ Osem::Application.routes.draw do
resources :difficulty_levels, :only => [ :show, :update, :index ]
resources :rooms, :only => [ :show, :update, :index ]
resources :tracks, :only => [ :show, :update, :index ]
put "/questions/update_conference" => "questions#update_conference"
resources :questions
resources :events do