From 5b05ffbd564a25c9593e8066524458a1e46ff70e Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Tue, 4 Mar 2014 10:30:23 +0100 Subject: [PATCH] Rename the volunteers to match the other config routes --- app/controllers/admin/volunteers_controller.rb | 10 ++++------ config/routes.rb | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/volunteers_controller.rb b/app/controllers/admin/volunteers_controller.rb index ec9de1c9..81b06db9 100644 --- a/app/controllers/admin/volunteers_controller.rb +++ b/app/controllers/admin/volunteers_controller.rb @@ -11,13 +11,11 @@ class Admin::VolunteersController < ApplicationController def update @conference = Conference.find_all_by_short_title(params[:conference_id]).first -# @conference.update_attributes(params[:conference]) -# redirect_to admin_conference_volunteers_path(@conference.short_title) - begin + begin @conference.update_attributes!(params[:conference]) - redirect_to(admin_conference_volunteer_options_path(:conference_id => params[:conference_id]), :notice => "Volunteering options were successfully updated.") - rescue Exception => e - redirect_to(admin_conference_volunteer_options_path(:conference_id => params[:conference_id]), :alert => "Volunteering options update failed: #{e.message}") + redirect_to(admin_conference_volunteer_info_path(:conference_id => params[:conference_id]), :notice => "Volunteering options were successfully updated.") + rescue Exception => e + redirect_to(admin_conference_volunteer_info_path(:conference_id => params[:conference_id]), :alert => "Volunteering options update failed: #{e.message}") end end end diff --git a/config/routes.rb b/config/routes.rb index b92b3e85..7103e699 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -31,8 +31,8 @@ Osem::Application.routes.draw do get "/dietary_choices" => "dietchoices#show", :as => "dietary_list" put "/dietary_choices" => "dietchoices#update", :as => "dietary_update" get "/volunteers_list" => "volunteers#show" - get "/volunteers" => "volunteers#index", :as => "volunteer_options" - put "/volunteers" => "volunteers#update", :as => "volunteer_options_update" + get "/volunteers" => "volunteers#index", :as => "volunteers_info" + put "/volunteers" => "volunteers#update", :as => "volunteers_update" get "/cfp" => "callforpapers#show", :as => "cfp_info" put "/cfp" => "callforpapers#update", :as => "cfp_update" post "/cfp" => "callforpapers#create", :as => "cfp_create"