diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-19 22:20:35 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-19 22:20:35 -0400 |
| commit | fdca9f33aadea4f139619f35e992760a0355d007 (patch) | |
| tree | 2bdb06ba11f0f4cde139572e30c3b8a247fa408d | |
| parent | e681498867d6007caa45ab9312057acb5303f609 (diff) | |
redirect is slightly more intelligent
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 10 | ||||
| -rw-r--r-- | app/views/tournaments/_selected.html.erb | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index bb1d222..57e73aa 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -127,12 +127,11 @@ class TournamentsController < ApplicationController private # Use callbacks to share common setup or constraints between actions. def set_tournament - if @tournament.nil? - respond_to do |format| - format.html { redirect_to @tournament, notice: 'That tournament no longer exists.' } - end + begin + @tournament = Tournament.find(params[:id]) + rescue + redirect_to tournaments_url, notice: 'That tournament no longer exists.' end - @tournament = Tournament.find(params[:id]) end # Never trust parameters from the scary internet, only allow the white list through. @@ -148,4 +147,5 @@ class TournamentsController < ApplicationController def check_edit set_tournament end + end diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index c0f8367..d37c741 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -23,9 +23,9 @@ <% when 0 %> <%= setting_fields.text_field( setting.name, :name ) %> <% when 1 %> - <%# setting_fields.text_area( setting.name, setting.name ) %> + <%= setting_fields.text_area( setting.name, setting.name ) %> <% when 2 %> - <%# setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(',') ) %> + <%= setting_fields.collection_radio_buttons( setting.name, setting.type_opt.split(',') ) %> <% when 3 %> <%= setting_fields.collection_check_boxes( setting.name, setting.type_opt.split(',') ) %> <% when 4 %> |