jro_apps/redmine Commit - r3299:55a3ac764f19

Issue relation: fixes error with postgres when entering a non-numeric id (#4820) + accept hash (#) before id....

Jean-Philippe Lang -

r3299:55a3ac764f19

parent child

Context file:

r3299:55a3ac764f19

Collapse all files

app/controllers/issue_relations_controller.rb +2 -2

              # redMine - project management software
              # Copyright (C) 2006-2007  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 IssueRelationsController < ApplicationController
                before_filter :find_project, :authorize
                def new
                  @relation = IssueRelation.new(params[:relation])
                  @relation.issue_from = @issue
-                 if params[:relation] && !params[:relation][:issue_to_id].blank?
-                   @relation.issue_to = Issue.visible.find_by_id(params[:relation][:issue_to_id])
+                 if params[:relation] && m = params[:relation][:issue_to_id].to_s.match(/^#?(\d+)$/)
+                   @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
                  end
                  @relation.save if request.post?
                  respond_to do |format|
                    format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
                    format.js do
                      render :update do |page|
                        page.replace_html "relations", :partial => 'issues/relations'
                        if @relation.errors.empty?
                          page << "$('relation_delay').value = ''"
                          page << "$('relation_issue_to_id').value = ''"
                        end
                      end
                    end
                  end
                end
                def destroy
                  relation = IssueRelation.find(params[:id])
                  if request.post? && @issue.relations.include?(relation)
                    relation.destroy
                    @issue.reload
                  end
                  respond_to do |format|
                    format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
                    format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
                  end
                end
              private
                def find_project
                  @issue = Issue.find(params[:issue_id])
                  @project = @issue.project
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
              end

test/functional/issue_relations_controller_test.rb +18 0

              require File.dirname(__FILE__) + '/../test_helper'
              require 'issue_relations_controller'
              # Re-raise errors caught by the controller.
              class IssueRelationsController; def rescue_action(e) raise e end; end
              class IssueRelationsControllerTest < ActionController::TestCase
                fixtures :projects,
                         :users,
                         :roles,
                         :members,
                         :member_roles,
                         :issues,
                         :issue_statuses,
                         :issue_relations,
                         :enabled_modules,
                         :enumerations,
                         :trackers
                def setup
                  @controller = IssueRelationsController.new
                  @request    = ActionController::TestRequest.new
                  @response   = ActionController::TestResponse.new
                  User.current = nil
                end
                def test_new_routing
                  assert_routing(
                    {:method => :post, :path => '/issues/1/relations'},
                    {:controller => 'issue_relations', :action => 'new', :issue_id => '1'}
                  )
                end
                def test_new
                  assert_difference 'IssueRelation.count' do
                    @request.session[:user_id] = 3
                    post :new, :issue_id => 1,
                               :relation => {:issue_to_id => '2', :relation_type => 'relates', :delay => ''}
                  end
                end
+               def test_new_should_accept_id_with_hash
+                 assert_difference 'IssueRelation.count' do
+                   @request.session[:user_id] = 3
+                   post :new, :issue_id => 1,
+                              :relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
+                 end
+               end
+               def test_new_should_not_break_with_non_numerical_id
+                 assert_no_difference 'IssueRelation.count' do
+                   assert_nothing_raised do
+                     @request.session[:user_id] = 3
+                     post :new, :issue_id => 1,
+                                :relation => {:issue_to_id => 'foo', :relation_type => 'relates', :delay => ''}
+                   end
+                 end
+               end
                def test_should_create_relations_with_visible_issues_only
                  Setting.cross_project_issue_relations = '1'
                  assert_nil Issue.visible(User.find(3)).find_by_id(4)
                  assert_no_difference 'IssueRelation.count' do
                    @request.session[:user_id] = 3
                    post :new, :issue_id => 1,
                               :relation => {:issue_to_id => '4', :relation_type => 'relates', :delay => ''}
                  end
                end
                def test_destroy_routing
                  assert_recognizes( #TODO: use DELETE on issue URI
                    {:controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'},
                    {:method => :post, :path => '/issues/1/relations/23/destroy'}
                  )
                end
                def test_destroy
                  assert_difference 'IssueRelation.count', -1 do
                    @request.session[:user_id] = 3
                    post :destroy, :id => '2', :issue_id => '3'
                  end
                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