jro_apps/redmine Commit - r9862:855310701615

Removes RJS from IssueRelationsController....

Jean-Philippe Lang -

r9862:855310701615

parent child

Context file:

r9862:855310701615

Collapse all files

app/views/issue_relations/create.js.erb created 644 +5 0

@@ -0,0 +1,5
	1	Element.update('relations', '<%= escape_javascript(render :partial => 'issues/relations') %>');
	2	<% if @relation.errors.empty? %>
	3	$('relation_delay').value = ''
	4	$('relation_issue_to_id').value = ''
	5	<% end %>

app/views/issue_relations/destroy.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	Element.remove('<%= "relation-#{@relation.id}" %>');

app/controllers/issue_relations_controller.rb +3 -10

             # Redmine - project management software
             # Copyright (C) 2006-2012  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_issue, :find_project_from_association, :authorize, :only => [:index, :create]
               before_filter :find_relation, :except => [:index, :create]
               accept_api_auth :index, :show, :create, :destroy
               def index
                 @relations = @issue.relations
                 respond_to do |format|
                   format.html { render :nothing => true }
                   format.api
                 end
               end
               def show
                 raise Unauthorized unless @relation.visible?
                 respond_to do |format|
                   format.html { render :nothing => true }
                   format.api
                 end
               end
               def create
                 @relation = IssueRelation.new(params[:relation])
                 @relation.issue_from = @issue
                 if params[:relation] && m = params[:relation][:issue_to_id].to_s.strip.match(/^#?(\d+)$/)
                   @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
                 end
                 saved = @relation.save
                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-                  format.js do
+                  format.js {
                     @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
-                    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
                   format.api {
                     if saved
                       render :action => 'show', :status => :created, :location => relation_url(@relation)
                     else
                       render_validation_errors(@relation)
                     end
                   }
                 end
               end
               def destroy
                 raise Unauthorized unless @relation.deletable?
                 @relation.destroy
                 respond_to do |format|
                   format.html { redirect_to issue_path } # TODO : does this really work since @issue is always nil? What is it useful to?
-                  format.js   { render(:update) {|page| page.remove "relation-#{@relation.id}"} }
+                  format.js
                   format.api  { render_api_ok }
                 end
               end
             private
               def find_issue
                 @issue = @object = Issue.find(params[:issue_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_relation
                 @relation = IssueRelation.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

test/functional/issue_relations_controller_test.rb +24 -8

             # Redmine - project management software
             # Copyright (C) 2006-2012  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__)
             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_create
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
                   post :create, :issue_id => 1,
                              :relation => {:issue_to_id => '2', :relation_type => 'relates', :delay => ''}
                 end
                 relation = IssueRelation.first(:order => 'id DESC')
                 assert_equal 1, relation.issue_from_id
                 assert_equal 2, relation.issue_to_id
                 assert_equal 'relates', relation.relation_type
               end
               def test_create_xhr
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
-                  xhr :post, :create,
+                  xhr :post, :create, :issue_id => 3, :relation => {:issue_to_id => '1', :relation_type => 'relates', :delay => ''}
-                    :issue_id => 3,
+                  assert_response :success
-                    :relation => {:issue_to_id => '1', :relation_type => 'relates', :delay => ''}
+                  assert_template 'create'
-                  assert_select_rjs 'relations' do
+                  assert_equal 'text/javascript', response.content_type
-                    assert_select 'table', 1
-                    assert_select 'tr', 2 # relations
-                  end
                 end
                 relation = IssueRelation.first(:order => 'id DESC')
                 assert_equal 3, relation.issue_from_id
                 assert_equal 1, relation.issue_to_id
+                assert_match /Bug #1/, response.body
               end
               def test_create_should_accept_id_with_hash
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
                   post :create, :issue_id => 1,
                              :relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
                 end
                 relation = IssueRelation.first(:order => 'id DESC')
                 assert_equal 2, relation.issue_to_id
               end
               def test_create_should_strip_id
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
                   post :create, :issue_id => 1,
                              :relation => {:issue_to_id => ' 2  ', :relation_type => 'relates', :delay => ''}
                 end
                 relation = IssueRelation.first(:order => 'id DESC')
                 assert_equal 2, relation.issue_to_id
               end
               def test_create_should_not_break_with_non_numerical_id
                 assert_no_difference 'IssueRelation.count' do
                   assert_nothing_raised do
                     @request.session[:user_id] = 3
                     post :create, :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 :create, :issue_id => 1,
                              :relation => {:issue_to_id => '4', :relation_type => 'relates', :delay => ''}
                 end
               end
               should "prevent relation creation when there's a circular dependency"
+              def test_create_xhr_with_failure
+                assert_no_difference 'IssueRelation.count' do
+                  @request.session[:user_id] = 3
+                  xhr :post, :create, :issue_id => 3, :relation => {:issue_to_id => '999', :relation_type => 'relates', :delay => ''}
+                  assert_response :success
+                  assert_template 'create'
+                  assert_equal 'text/javascript', response.content_type
+                end
+                assert_match /errorExplanation/, response.body
+              end
               def test_destroy
                 assert_difference 'IssueRelation.count', -1 do
                   @request.session[:user_id] = 3
                   delete :destroy, :id => '2'
                 end
               end
               def test_destroy_xhr
                 IssueRelation.create!(:relation_type => IssueRelation::TYPE_RELATES) do |r|
                   r.issue_from_id = 3
                   r.issue_to_id = 1
                 end
                 assert_difference 'IssueRelation.count', -1 do
                   @request.session[:user_id] = 3
                   xhr :delete, :destroy, :id => '2'
-                  assert_select_rjs  :remove, 'relation-2'
+                  assert_response :success
+                  assert_template 'destroy'
+                  assert_equal 'text/javascript', response.content_type
+                  assert_match /relation-2/, response.body
                 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