jro_apps/redmine Commit - r6064:42f9dc7d2c5a

Makes relations resource shallow (#7366)....

Jean-Philippe Lang -

r6064:42f9dc7d2c5a

parent child

Context file:

r6064:42f9dc7d2c5a

Collapse all files

app/controllers/issue_relations_controller.rb +15 -10

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueRelationsController < ApplicationController
-              before_filter :find_issue, :find_project_from_association, :authorize
+              before_filter :find_issue, :find_project_from_association, :authorize, :only => [:index, :create]
+              before_filter :find_relation, :except => [:index, :create]
               accept_key_auth :index, :show, :create, :destroy
               def index
               end
               def show
-                @relation = @issue.find_relation(params[:id])
+                raise Unauthorized unless @relation.visible?
                 respond_to do |format|
                   format.html { render :nothing => true }
                   end
                   format.api {
                     if saved
-                      render :action => 'show', :status => :created, :location => issue_relation_url(@issue, @relation)
+                      render :action => 'show', :status => :created, :location => relation_url(@relation)
                     else
                       render_validation_errors(@relation)
                     end
               verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
               def destroy
-                relation = @issue.find_relation(params[:id])
+                raise Unauthorized unless @relation.deletable?
-                relation.destroy
+                @relation.destroy
                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-                  format.js {
+                  format.js   { render(:update) {|page| page.remove "relation-#{@relation.id}"} }
-                    @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+                  format.api  { head :ok }
-                    render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'}
-                  format.api { head :ok }
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
+              def find_relation
+                @relation = IssueRelation.find(params[:id])
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             end

app/models/issue_relation.rb +10 0

@@ -43,6 +43,16 class IssueRelation < ActiveRecord::Base
43		43
44	attr_protected :issue_from_id, :issue_to_id	44	attr_protected :issue_from_id, :issue_to_id
45		45
		46	def visible?(user=User.current)
		47	(issue_from.nil? \|\| issue_from.visible?(user)) && (issue_to.nil? \|\| issue_to.visible?(user))
		48	end
		49
		50	def deletable?(user=User.current)
		51	visible?(user) &&
		52	((issue_from.nil? \|\| user.allowed_to?(:manage_issue_relations, issue_from.project)) \|\|
		53	(issue_to.nil? \|\| user.allowed_to?(:manage_issue_relations, issue_to.project)))
		54	end
		55
46	def after_initialize	56	def after_initialize
47	if new_record?	57	if new_record?
48	if relation_type.blank?	58	if relation_type.blank?

app/views/issue_relations/show.api.rsb +1 -1

               api.id @relation.id
               api.issue_id @relation.issue_from_id
               api.issue_to_id @relation.issue_to_id
-              api.relation_type @relation.relation_type_for(@issue)
+              api.relation_type @relation.relation_type
               api.delay @relation.delay
             end

app/views/issues/_relations.rhtml +2 -2

             <form>
             <table class="list issues">
             <% @relations.each do |relation| %>
-            <tr class="issue hascontextmenu">
+            <tr class="issue hascontextmenu" id="relation-<%= relation.id %>">
             <td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
             <td class="subject"><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
                 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
             <td class="status"><%= relation.other_issue(@issue).status.name %></td>
             <td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
             <td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
-            <td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},
+            <td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
                                                               :method => :delete
                                                             }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
             </tr>

config/routes.rb +1 -1

               map.resources :issues, :member => { :edit => :post }, :collection => {} do |issues|
                 issues.resources :time_entries, :controller => 'timelog'
-                issues.resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
+                issues.resources :relations, :shallow => true, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post } do |issues|

test/functional/issue_relations_controller_test.rb +3 -6

               def test_destroy
                 assert_difference 'IssueRelation.count', -1 do
                   @request.session[:user_id] = 3
-                  delete :destroy, :id => '2', :issue_id => '3'
+                  delete :destroy, :id => '2'
                 end
               end
                 assert_difference 'IssueRelation.count', -1 do
                   @request.session[:user_id] = 3
-                  xhr :delete, :destroy, :id => '2', :issue_id => '3'
+                  xhr :delete, :destroy, :id => '2'
-                  assert_select_rjs 'relations' do
+                  assert_select_rjs  :remove, 'relation-2'
-                    assert_select 'table', 1
-                    assert_select 'tr', 1 # relation left
-                  end
                 end
               end
             end

test/integration/api_test/issue_relations_test.rb +3 -3

                 end
               end
-              context "/issues/:issue_id/relations/:id" do
+              context "/relations/:id" do
                 context "GET" do
                   should "return the relation" do
-                    get '/issues/3/relations/2.xml', {}, :authorization => credentials('jsmith')
+                    get '/relations/2.xml', {}, :authorization => credentials('jsmith')
                     assert_response :success
                     assert_equal 'application/xml', @response.content_type
                 context "DELETE" do
                   should "delete the relation" do
                     assert_difference('IssueRelation.count', -1) do
-                      delete '/issues/3/relations/2.xml', {}, :authorization => credentials('jsmith')
+                      delete '/relations/2.xml', {}, :authorization => credentials('jsmith')
                     end
                     assert_response :ok

test/integration/routing_test.rb +6 -6

                 should_route :post, "/issues/1/relations.xml", :controller => 'issue_relations', :action => 'create', :issue_id => '1', :format => 'xml'
                 should_route :post, "/issues/1/relations.json", :controller => 'issue_relations', :action => 'create', :issue_id => '1', :format => 'json'
-                should_route :get, "/issues/1/relations/23", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :id => '23'
+                should_route :get, "/relations/23", :controller => 'issue_relations', :action => 'show', :id => '23'
-                should_route :get, "/issues/1/relations/23.xml", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :id => '23', :format => 'xml'
+                should_route :get, "/relations/23.xml", :controller => 'issue_relations', :action => 'show', :id => '23', :format => 'xml'
-                should_route :get, "/issues/1/relations/23.json", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :id => '23', :format => 'json'
+                should_route :get, "/relations/23.json", :controller => 'issue_relations', :action => 'show', :id => '23', :format => 'json'
-                should_route :delete, "/issues/1/relations/23", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'
+                should_route :delete, "/relations/23", :controller => 'issue_relations', :action => 'destroy', :id => '23'
-                should_route :delete, "/issues/1/relations/23.xml", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23', :format => 'xml'
+                should_route :delete, "/relations/23.xml", :controller => 'issue_relations', :action => 'destroy', :id => '23', :format => 'xml'
-                should_route :delete, "/issues/1/relations/23.json", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23', :format => 'json'
+                should_route :delete, "/relations/23.json", :controller => 'issue_relations', :action => 'destroy', :id => '23', :format => 'json'
               end
               context "issue reports" do

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