jro_apps/redmine Commit - r11624:c90bf645f513

Fixed that submitting the form without selecting a value may raise raises an error with SQLServer (#13783)....

Jean-Philippe Lang -

r11624:c90bf645f513

parent child

Context file:

r11624:c90bf645f513

Collapse all files

app/controllers/enumerations_controller.rb +4 -6

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class EnumerationsController < ApplicationController
               layout 'admin'
               before_filter :require_admin, :except => :index
               before_filter :require_admin_or_api_request, :only => :index
               before_filter :build_new_enumeration, :only => [:new, :create]
               before_filter :find_enumeration, :only => [:edit, :update, :destroy]
               accept_api_auth :index
               helper :custom_fields
               def index
                 respond_to do |format|
                   format.html
                   format.api {
                     @klass = Enumeration.get_subclass(params[:type])
                     if @klass
                       @enumerations = @klass.shared.sorted.all
                     else
                       render_404
                     end
                   }
                 end
               end
               def new
               end
               def create
                 if request.post? && @enumeration.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to enumerations_path
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 if request.put? && @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to enumerations_path
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 if !@enumeration.in_use?
                   # No associated objects
                   @enumeration.destroy
                   redirect_to enumerations_path
                   return
-                elsif params[:reassign_to_id]
+                elsif params[:reassign_to_id].present? && (reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id].to_i))
-                  if reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id])
+                  @enumeration.destroy(reassign_to)
-                    @enumeration.destroy(reassign_to)
+                  redirect_to enumerations_path
-                    redirect_to enumerations_path
+                  return
-                    return
-                  end
                 end
                 @enumerations = @enumeration.class.system.all - [@enumeration]
               end
               private
               def build_new_enumeration
                 class_name = params[:enumeration] && params[:enumeration][:type] || params[:type]
                 @enumeration = Enumeration.new_subclass_instance(class_name, params[:enumeration])
                 if @enumeration.nil?
                   render_404
                 end
               end
               def find_enumeration
                 @enumeration = Enumeration.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/views/enumerations/destroy.html.erb +1 -1

             <h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
             <%= form_tag({}, :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
             <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
-            <%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---") + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
+            <%= select_tag 'reassign_to_id', (content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---", :value => '') + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
             </div>
             <%= submit_tag l(:button_apply) %>
             <%= link_to l(:button_cancel), enumerations_path %>
             <% end %>

test/functional/enumerations_controller_test.rb +7 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class EnumerationsControllerTest < ActionController::TestCase
               fixtures :enumerations, :issues, :users
               def setup
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
               end
               def test_index_should_require_admin
                 @request.session[:user_id] = nil
                 get :index
                 assert_response 302
               end
               def test_new
                 get :new, :type => 'IssuePriority'
                 assert_response :success
                 assert_template 'new'
                 assert_kind_of IssuePriority, assigns(:enumeration)
                 assert_tag 'input', :attributes => {:name => 'enumeration[type]', :value => 'IssuePriority'}
                 assert_tag 'input', :attributes => {:name => 'enumeration[name]'}
               end
               def test_new_with_invalid_type_should_respond_with_404
                 get :new, :type => 'UnknownType'
                 assert_response 404
               end
               def test_create
                 assert_difference 'IssuePriority.count' do
                   post :create, :enumeration => {:type => 'IssuePriority', :name => 'Lowest'}
                 end
                 assert_redirected_to '/enumerations'
                 e = IssuePriority.find_by_name('Lowest')
                 assert_not_nil e
               end
               def test_create_with_failure
                 assert_no_difference 'IssuePriority.count' do
                   post :create, :enumeration => {:type => 'IssuePriority', :name => ''}
                 end
                 assert_response :success
                 assert_template 'new'
               end
               def test_edit
                 get :edit, :id => 6
                 assert_response :success
                 assert_template 'edit'
                 assert_tag 'input', :attributes => {:name => 'enumeration[name]', :value => 'High'}
               end
               def test_edit_invalid_should_respond_with_404
                 get :edit, :id => 999
                 assert_response 404
               end
               def test_update
                 assert_no_difference 'IssuePriority.count' do
                   put :update, :id => 6, :enumeration => {:type => 'IssuePriority', :name => 'New name'}
                 end
                 assert_redirected_to '/enumerations'
                 e = IssuePriority.find(6)
                 assert_equal 'New name', e.name
               end
               def test_update_with_failure
                 assert_no_difference 'IssuePriority.count' do
                   put :update, :id => 6, :enumeration => {:type => 'IssuePriority', :name => ''}
                 end
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy_enumeration_not_in_use
                 assert_difference 'IssuePriority.count', -1 do
                   delete :destroy, :id => 7
                 end
                 assert_redirected_to :controller => 'enumerations', :action => 'index'
                 assert_nil Enumeration.find_by_id(7)
               end
               def test_destroy_enumeration_in_use
                 assert_no_difference 'IssuePriority.count' do
                   delete :destroy, :id => 4
                 end
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Enumeration.find_by_id(4)
                 assert_select 'select[name=reassign_to_id]' do
                   assert_select 'option[value=6]', :text => 'High'
                 end
               end
               def test_destroy_enumeration_in_use_with_reassignment
                 issue = Issue.where(:priority_id => 4).first
                 assert_difference 'IssuePriority.count', -1 do
                   delete :destroy, :id => 4, :reassign_to_id => 6
                 end
                 assert_redirected_to :controller => 'enumerations', :action => 'index'
                 assert_nil Enumeration.find_by_id(4)
                 # check that the issue was reassign
                 assert_equal 6, issue.reload.priority_id
               end
+              def test_destroy_enumeration_in_use_with_blank_reassignment
+                assert_no_difference 'IssuePriority.count' do
+                  delete :destroy, :id => 4, :reassign_to_id => ''
+                end
+                assert_response :success
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages