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

Fixes eventtype form

Browse source
This commit is contained in:
Chrisbr 2014-04-28 20:08:06 +02:00
parent c67b255e05
commit 229581efc3
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/eventtype_controller.rb
View file

@ -8,9 +8,9 @@ class Admin::EventtypeController < ApplicationController
def update def update
begin begin
@conference.update_attributes!(params[:conference]) @conference.update_attributes!(params[:conference])
redirect_to(admin_conference_eventtype_list_path(:conference_id => @conference.short_title), :notice => 'Event types were successfully updated.') redirect_to(admin_conference_eventtype_path(:conference_id => @conference.short_title), :notice => 'Event types were successfully updated.')
rescue Exception => e rescue Exception => e
redirect_to(admin_conference_eventtype_list_path(:conference_id => @conference.short_title), :alert => 'Event types update failed: #{e.message}') redirect_to(admin_conference_eventtype_path(:conference_id => @conference.short_title), :alert => 'Event types update failed: #{e.message}')
end end
end end
end end

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

@ -10,8 +10,8 @@
= link_to "Rooms", 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_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) = link_to "Tracks", admin_conference_tracks_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_eventtype_list_path(@conference.short_title))} %li{:class=> active_nav_li(admin_conference_eventtype_index_path(@conference.short_title))}
= link_to "Event Types", admin_conference_eventtype_list_path(@conference.short_title) = link_to "Event Types", admin_conference_eventtype_index_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_difficulty_levels_path(@conference.short_title))} %li{:class=> active_nav_li(admin_conference_difficulty_levels_path(@conference.short_title))}
= link_to "Difficulty Levels", admin_conference_difficulty_levels_path(@conference.short_title) = link_to "Difficulty Levels", admin_conference_difficulty_levels_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_social_events_path(@conference.short_title))} %li{:class=> active_nav_li(admin_conference_social_events_path(@conference.short_title))}

2
app/views/admin/eventtype/event_type_list.html.haml
View file

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

3
config/routes.rb
View file

@ -32,12 +32,11 @@ Osem::Application.routes.draw do
get "/cfp" => "callforpapers#show", :as => "cfp_info" get "/cfp" => "callforpapers#show", :as => "cfp_info"
put "/cfp" => "callforpapers#update", :as => "cfp_update" put "/cfp" => "callforpapers#update", :as => "cfp_update"
post "/cfp" => "callforpapers#create", :as => "cfp_create" post "/cfp" => "callforpapers#create", :as => "cfp_create"
get "/event_types" => "eventtype#show", :as => "eventtype_list"
put "/event_types" => "eventtype#update", :as => "eventtype_update"
resources :difficulty_levels, :only => [ :show, :update, :index ] resources :difficulty_levels, :only => [ :show, :update, :index ]
resources :rooms, :only => [ :show, :update, :index ] resources :rooms, :only => [ :show, :update, :index ]
resources :tracks, :only => [ :show, :update, :index ] resources :tracks, :only => [ :show, :update, :index ]
resources :eventtype, :only => [ :show, :update, :index ]
put "/questions/update_conference" => "questions#update_conference" put "/questions/update_conference" => "questions#update_conference"
resources :questions resources :questions
resources :events do resources :events do