##// END OF EJS Templates
Accept issue id with leading sharp when adding a related issue....
Jean-Philippe Lang -
r12020:d89c968bb116
parent child
Show More
@@ -229,7 +229,8 class RepositoriesController < ApplicationController
229 # Adds a related issue to a changeset
229 # Adds a related issue to a changeset
230 # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues
230 # POST /projects/:project_id/repository/(:repository_id/)revisions/:rev/issues
231 def add_related_issue
231 def add_related_issue
232 @issue = @changeset.find_referenced_issue_by_id(params[:issue_id])
232 issue_id = params[:issue_id].to_s.sub(/^#/,'')
233 @issue = @changeset.find_referenced_issue_by_id(issue_id)
233 if @issue && (!@issue.visible? || @changeset.issues.include?(@issue))
234 if @issue && (!@issue.visible? || @changeset.issues.include?(@issue))
234 @issue = nil
235 @issue = nil
235 end
236 end
@@ -199,6 +199,14 class RepositoriesControllerTest < ActionController::TestCase
199 assert_include 'Feature request #2', response.body
199 assert_include 'Feature request #2', response.body
200 end
200 end
201
201
202 def test_add_related_issue_should_accept_issue_id_with_sharp
203 @request.session[:user_id] = 2
204 assert_difference 'Changeset.find(103).issues.size' do
205 xhr :post, :add_related_issue, :id => 1, :rev => 4, :issue_id => "#2", :format => 'js'
206 end
207 assert_equal [2], Changeset.find(103).issue_ids
208 end
209
202 def test_add_related_issue_with_invalid_issue_id
210 def test_add_related_issue_with_invalid_issue_id
203 @request.session[:user_id] = 2
211 @request.session[:user_id] = 2
204 assert_no_difference 'Changeset.find(103).issues.size' do
212 assert_no_difference 'Changeset.find(103).issues.size' do
General Comments 0
You need to be logged in to leave comments. Login now