gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-18 14:11:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes rooms form

Browse source
This commit is contained in:
Chrisbr 2014-04-28 19:58:49 +02:00
parent fc11653f27
commit c4fbf8d038
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,9 +7,9 @@ class Admin::RoomsController < ApplicationController
def update def update
if @conference.update_attributes(params[:conference]) if @conference.update_attributes(params[:conference])
redirect_to(admin_conference_rooms_list_path(:conference_id => @conference.short_title), :notice => 'Rooms were successfully updated.') redirect_to(admin_conference_rooms_path(:conference_id => @conference.short_title), :notice => 'Rooms were successfully updated.')
else else
redirect_to(admin_conference_rooms_list_path(:conference_id => @conference.short_title), :notice => 'Room update failed.') redirect_to(admin_conference_rooms_path(:conference_id => @conference.short_title), :notice => 'Room update failed.')
end end
end end

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

@ -6,8 +6,8 @@
= link_to "Venue", admin_conference_venue_info_path(@conference.short_title) = link_to "Venue", admin_conference_venue_info_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_cfp_info_path(@conference.short_title))} %li{:class=> active_nav_li(admin_conference_cfp_info_path(@conference.short_title))}
= link_to "Call for Papers", admin_conference_cfp_info_path(@conference.short_title) = link_to "Call for Papers", admin_conference_cfp_info_path(@conference.short_title)
%li{:class=> active_nav_li(admin_conference_rooms_list_path(@conference.short_title))} %li{:class=> active_nav_li(admin_conference_rooms_path(@conference.short_title))}
= link_to "Rooms", admin_conference_rooms_list_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))} %li{:class=> active_nav_li(admin_conference_tracks_list_path(@conference.short_title))}
= link_to "Tracks", 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_eventtype_list_path(@conference.short_title))} %li{:class=> active_nav_li(admin_conference_eventtype_list_path(@conference.short_title))}

2
app/views/admin/rooms/rooms_list.html.haml → app/views/admin/rooms/index.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_rooms_update_path(@conference.short_title)) do |f| = semantic_form_for(@conference, :url => admin_conference_room_path(:conferecene_id => @conference.short_title, :id => @conference.rooms)) do |f|
= dynamic_association :rooms, "Rooms", f = dynamic_association :rooms, "Rooms", f
= f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

5
config/routes.rb
View file

@ -24,8 +24,6 @@ Osem::Application.routes.draw do
put "/venue" => "venue#update", :as => "venue_update" put "/venue" => "venue#update", :as => "venue_update"
get "/social_events" => "social_events#show", :as => "social_events" get "/social_events" => "social_events#show", :as => "social_events"
put "/social_events" => "social_events#update" put "/social_events" => "social_events#update"
get "/rooms" => "rooms#show", :as => "rooms_list"
put "/rooms" => "rooms#update", :as => "rooms_update"
get "/tracks" => "tracks#show", :as => "tracks_list" get "/tracks" => "tracks#show", :as => "tracks_list"
put "/tracks" => "tracks#update", :as => "tracks_update" put "/tracks" => "tracks#update", :as => "tracks_update"
get "/dietary_choices" => "dietchoices#show", :as => "dietary_list" get "/dietary_choices" => "dietchoices#show", :as => "dietary_list"
@ -38,8 +36,9 @@ Osem::Application.routes.draw do
post "/cfp" => "callforpapers#create", :as => "cfp_create" post "/cfp" => "callforpapers#create", :as => "cfp_create"
get "/event_types" => "eventtype#show", :as => "eventtype_list" get "/event_types" => "eventtype#show", :as => "eventtype_list"
put "/event_types" => "eventtype#update", :as => "eventtype_update" put "/event_types" => "eventtype#update", :as => "eventtype_update"
#put "/difficulty_levels" => "difficulty_levels#update"
resources :difficulty_levels, :only => [ :show, :update, :index ] resources :difficulty_levels, :only => [ :show, :update, :index ]
resources :rooms, :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