jro_apps/redmine Commit - r6056:21b37187445f

Adds REST API for issue relations (#7366)....

Jean-Philippe Lang -

r6056:21b37187445f

parent child

Context file:

r6056:21b37187445f

Collapse all files

app/views/issue_relations/show.api.rsb created 644 +7 0

@@ -0,0 +1,7
	1	api.relation do
	2	api.id @relation.id
	3	api.issue_id @relation.issue_from_id
	4	api.issue_to_id @relation.issue_to_id
	5	api.relation_type @relation.relation_type_for(@issue)
	6	api.delay @relation.delay
	7	end

test/integration/api_test/issue_relations_test.rb created 644 +83 0

@@ -0,0 +1,83
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2011 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.expand_path('../../../test_helper', __FILE__)
	19
	20	class ApiTest::IssueRelationsTest < ActionController::IntegrationTest
	21	fixtures :all
	22
	23	def setup
	24	Setting.rest_api_enabled = '1'
	25	end
	26
	27	context "/issues/:issue_id/relations" do
	28	context "POST" do
	29	should "create a relation" do
	30	assert_difference('IssueRelation.count') do
	31	post '/issues/2/relations.xml', {:relation => {:issue_to_id => 7, :relation_type => 'relates'}}, :authorization => credentials('jsmith')
	32	end
	33
	34	relation = IssueRelation.first(:order => 'id DESC')
	35	assert_equal 2, relation.issue_from_id
	36	assert_equal 7, relation.issue_to_id
	37	assert_equal 'relates', relation.relation_type
	38
	39	assert_response :created
	40	assert_equal 'application/xml', @response.content_type
	41	assert_tag 'relation', :child => {:tag => 'id', :content => relation.id.to_s}
	42	end
	43
	44	context "with failure" do
	45	should "return the errors" do
	46	assert_no_difference('IssueRelation.count') do
	47	post '/issues/2/relations.xml', {:relation => {:issue_to_id => 7, :relation_type => 'foo'}}, :authorization => credentials('jsmith')
	48	end
	49
	50	assert_response :unprocessable_entity
	51	assert_tag :errors, :child => {:tag => 'error', :content => 'relation_type is not included in the list'}
	52	end
	53	end
	54	end
	55	end
	56
	57	context "/issues/:issue_id/relations/:id" do
	58	context "GET" do
	59	should "return the relation" do
	60	get '/issues/3/relations/2.xml', {}, :authorization => credentials('jsmith')
	61
	62	assert_response :success
	63	assert_equal 'application/xml', @response.content_type
	64	assert_tag 'relation', :child => {:tag => 'id', :content => '2'}
	65	end
	66	end
	67
	68	context "DELETE" do
	69	should "delete the relation" do
	70	assert_difference('IssueRelation.count', -1) do
	71	delete '/issues/3/relations/2.xml', {}, :authorization => credentials('jsmith')
	72	end
	73
	74	assert_response :ok
	75	assert_nil IssueRelation.find_by_id(2)
	76	end
	77	end
	78	end
	79
	80	def credentials(user, password=nil)
	81	ActionController::HttpAuthentication::Basic.encode_credentials(user, password \|\| user)
	82	end
	83	end

app/controllers/issue_relations_controller.rb +32 -9

-            # redMine - project management software
+            # Redmine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2011  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
+              accept_key_auth :show, :create, :destroy
-              def new
+              def show
+                @relation = @issue.find_relation(params[:id])
+                respond_to do |format|
+                  format.html { render :nothing => true }
+                  format.api
+                end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
+              verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
+              def create
                 @relation = IssueRelation.new(params[:relation])
                 @relation.issue_from = @issue
                 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?
+                saved = @relation.save
                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
                   format.js do
                     @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 => issue_relation_url(@issue, @relation)
+                    else
+                      render_validation_errors(@relation)
+                    end
+                  }
                 end
               end
+              verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
               def destroy
-                relation = IssueRelation.find(params[:id])
+                relation = @issue.find_relation(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 {
-                    @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+                    @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                     render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'}
                   }
+                  format.api { head :ok }
                 end
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
             private
               def find_issue
                 @issue = @object = Issue.find(params[:issue_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/issue.rb +5 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 Issue < ActiveRecord::Base
               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :tracker
               belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
               belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
               belongs_to :fixed_version, :class_name => 'Version', :foreign_key => 'fixed_version_id'
               belongs_to :priority, :class_name => 'IssuePriority', :foreign_key => 'priority_id'
               belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
               has_many :journals, :as => :journalized, :dependent => :destroy
               has_many :time_entries, :dependent => :delete_all
               has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC"
               has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
               has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
               acts_as_nested_set :scope => 'root_id', :dependent => :destroy
               acts_as_attachable :after_remove => :attachment_removed
               acts_as_customizable
               acts_as_watchable
               acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
                                  :include => [:project, :journals],
                                  # sort by id so that limited eager loading doesn't break with postgresql
                                  :order_column => "#{table_name}.id"
               acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id} (#{o.status}): #{o.subject}"},
                             :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}},
                             :type => Proc.new {|o| 'issue' + (o.closed? ? ' closed' : '') }
               acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                                         :author_key => :author_id
               DONE_RATIO_OPTIONS = %w(issue_field issue_status)
               attr_reader :current_journal
               validates_presence_of :subject, :priority, :project, :tracker, :author, :status
               validates_length_of :subject, :maximum => 255
               validates_inclusion_of :done_ratio, :in => 0..100
               validates_numericality_of :estimated_hours, :allow_nil => true
               named_scope :visible, lambda {|*args| { :include => :project,
                                                       :conditions => Issue.visible_condition(args.shift || User.current, *args) } }
               named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status
               named_scope :recently_updated, :order => "#{Issue.table_name}.updated_on DESC"
               named_scope :with_limit, lambda { |limit| { :limit => limit} }
               named_scope :on_active_project, :include => [:status, :project, :tracker],
                                               :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
               named_scope :without_version, lambda {
                 {
                   :conditions => { :fixed_version_id => nil}
                 }
               }
               named_scope :with_query, lambda {|query|
                 {
                   :conditions => Query.merge_conditions(query.statement)
                 }
               }
               before_create :default_assign
               before_save :close_duplicates, :update_done_ratio_from_issue_status
               after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
               after_destroy :update_parent_attributes
               # Returns a SQL conditions string used to find all issues visible by the specified user
               def self.visible_condition(user, options={})
                 Project.allowed_to_condition(user, :view_issues, options) do |role, user|
                   case role.issues_visibility
                   when 'all'
                     nil
                   when 'default'
                     "(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id = #{user.id})"
                   when 'own'
                     "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id = #{user.id})"
                   else
                     '1=0'
                   end
                 end
               end
               # Returns true if usr or current user is allowed to view the issue
               def visible?(usr=nil)
                 (usr || User.current).allowed_to?(:view_issues, self.project) do |role, user|
                   case role.issues_visibility
                   when 'all'
                     true
                   when 'default'
                     !self.is_private? || self.author == user || self.assigned_to == user
                   when 'own'
                     self.author == user || self.assigned_to == user
                   else
                     false
                   end
                 end
               end
               def after_initialize
                 if new_record?
                   # set default values for new records only
                   self.status ||= IssueStatus.default
                   self.priority ||= IssuePriority.default
                 end
               end
               # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
               def available_custom_fields
                 (project && tracker) ? (project.all_issue_custom_fields & tracker.custom_fields.all) : []
               end
               def copy_from(arg)
                 issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
                 self.attributes = issue.attributes.dup.except("id", "root_id", "parent_id", "lft", "rgt", "created_on", "updated_on")
                 self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                 self.status = issue.status
                 self
               end
               # Moves/copies an issue to a new project and tracker
               # Returns the moved/copied issue on success, false on failure
               def move_to_project(*args)
                 ret = Issue.transaction do
                   move_to_project_without_transaction(*args) || raise(ActiveRecord::Rollback)
                 end || false
               end
               def move_to_project_without_transaction(new_project, new_tracker = nil, options = {})
                 options ||= {}
                 issue = options[:copy] ? self.class.new.copy_from(self) : self
                 if new_project && issue.project_id != new_project.id
                   # delete issue relations
                   unless Setting.cross_project_issue_relations?
                     issue.relations_from.clear
                     issue.relations_to.clear
                   end
                   # issue is moved to another project
                   # reassign to the category with same name if any
                   new_category = issue.category.nil? ? nil : new_project.issue_categories.find_by_name(issue.category.name)
                   issue.category = new_category
                   # Keep the fixed_version if it's still valid in the new_project
                   unless new_project.shared_versions.include?(issue.fixed_version)
                     issue.fixed_version = nil
                   end
                   issue.project = new_project
                   if issue.parent && issue.parent.project_id != issue.project_id
                     issue.parent_issue_id = nil
                   end
                 end
                 if new_tracker
                   issue.tracker = new_tracker
                   issue.reset_custom_values!
                 end
                 if options[:copy]
                   issue.author = User.current
                   issue.custom_field_values = self.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
                   issue.status = if options[:attributes] && options[:attributes][:status_id]
                                    IssueStatus.find_by_id(options[:attributes][:status_id])
                                  else
                                    self.status
                                  end
                 end
                 # Allow bulk setting of attributes on the issue
                 if options[:attributes]
                   issue.attributes = options[:attributes]
                 end
                 if issue.save
                   if options[:copy]
                     if current_journal && current_journal.notes.present?
                       issue.init_journal(current_journal.user, current_journal.notes)
                       issue.current_journal.notify = false
                       issue.save
                     end
                   else
                     # Manually update project_id on related time entries
                     TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
                     issue.children.each do |child|
                       unless child.move_to_project_without_transaction(new_project)
                         # Move failed and transaction was rollback'd
                         return false
                       end
                     end
                   end
                 else
                   return false
                 end
                 issue
               end
               def status_id=(sid)
                 self.status = nil
                 write_attribute(:status_id, sid)
               end
               def priority_id=(pid)
                 self.priority = nil
                 write_attribute(:priority_id, pid)
               end
               def tracker_id=(tid)
                 self.tracker = nil
                 result = write_attribute(:tracker_id, tid)
                 @custom_field_values = nil
                 result
               end
               def description=(arg)
                 if arg.is_a?(String)
                   arg = arg.gsub(/(\r\n|\n|\r)/, "\r\n")
                 end
                 write_attribute(:description, arg)
               end
               # Overrides attributes= so that tracker_id gets assigned first
               def attributes_with_tracker_first=(new_attributes, *args)
                 return if new_attributes.nil?
                 new_tracker_id = new_attributes['tracker_id'] || new_attributes[:tracker_id]
                 if new_tracker_id
                   self.tracker_id = new_tracker_id
                 end
                 send :attributes_without_tracker_first=, new_attributes, *args
               end
               # Do not redefine alias chain on reload (see #4838)
               alias_method_chain(:attributes=, :tracker_first) unless method_defined?(:attributes_without_tracker_first=)
               def estimated_hours=(h)
                 write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
               end
               safe_attributes 'tracker_id',
                 'status_id',
                 'parent_issue_id',
                 'category_id',
                 'assigned_to_id',
                 'priority_id',
                 'fixed_version_id',
                 'subject',
                 'description',
                 'start_date',
                 'due_date',
                 'done_ratio',
                 'estimated_hours',
                 'custom_field_values',
                 'custom_fields',
                 'lock_version',
                 :if => lambda {|issue, user| issue.new_record? || user.allowed_to?(:edit_issues, issue.project) }
               safe_attributes 'status_id',
                 'assigned_to_id',
                 'fixed_version_id',
                 'done_ratio',
                 :if => lambda {|issue, user| issue.new_statuses_allowed_to(user).any? }
               safe_attributes 'is_private',
                 :if => lambda {|issue, user|
                   user.allowed_to?(:set_issues_private, issue.project) ||
                     (issue.author == user && user.allowed_to?(:set_own_issues_private, issue.project))
                 }
               # Safely sets attributes
               # Should be called from controllers instead of #attributes=
               # attr_accessible is too rough because we still want things like
               # Issue.new(:project => foo) to work
               # TODO: move workflow/permission checks from controllers to here
               def safe_attributes=(attrs, user=User.current)
                 return unless attrs.is_a?(Hash)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 attrs = delete_unsafe_attributes(attrs, user)
                 return if attrs.empty?
                 # Tracker must be set before since new_statuses_allowed_to depends on it.
                 if t = attrs.delete('tracker_id')
                   self.tracker_id = t
                 end
                 if attrs['status_id']
                   unless new_statuses_allowed_to(user).collect(&:id).include?(attrs['status_id'].to_i)
                     attrs.delete('status_id')
                   end
                 end
                 unless leaf?
                   attrs.reject! {|k,v| %w(priority_id done_ratio start_date due_date estimated_hours).include?(k)}
                 end
                 if attrs.has_key?('parent_issue_id')
                   if !user.allowed_to?(:manage_subtasks, project)
                     attrs.delete('parent_issue_id')
                   elsif !attrs['parent_issue_id'].blank?
                     attrs.delete('parent_issue_id') unless Issue.visible(user).exists?(attrs['parent_issue_id'].to_i)
                   end
                 end
                 self.attributes = attrs
               end
               def done_ratio
                 if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   status.default_done_ratio
                 else
                   read_attribute(:done_ratio)
                 end
               end
               def self.use_status_for_done_ratio?
                 Setting.issue_done_ratio == 'issue_status'
               end
               def self.use_field_for_done_ratio?
                 Setting.issue_done_ratio == 'issue_field'
               end
               def validate
                 if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
                   errors.add :due_date, :not_a_date
                 end
                 if self.due_date and self.start_date and self.due_date < self.start_date
                   errors.add :due_date, :greater_than_start_date
                 end
                 if start_date && soonest_start && start_date < soonest_start
                   errors.add :start_date, :invalid
                 end
                 if fixed_version
                   if !assignable_versions.include?(fixed_version)
                     errors.add :fixed_version_id, :inclusion
                   elsif reopened? && fixed_version.closed?
                     errors.add_to_base I18n.t(:error_can_not_reopen_issue_on_closed_version)
                   end
                 end
                 # Checks that the issue can not be added/moved to a disabled tracker
                 if project && (tracker_id_changed? || project_id_changed?)
                   unless project.trackers.include?(tracker)
                     errors.add :tracker_id, :inclusion
                   end
                 end
                 # Checks parent issue assignment
                 if @parent_issue
                   if @parent_issue.project_id != project_id
                     errors.add :parent_issue_id, :not_same_project
                   elsif !new_record?
                     # moving an existing issue
                     if @parent_issue.root_id != root_id
                       # we can always move to another tree
                     elsif move_possible?(@parent_issue)
                       # move accepted inside tree
                     else
                       errors.add :parent_issue_id, :not_a_valid_parent
                     end
                   end
                 end
               end
               # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
               # even if the user turns off the setting later
               def update_done_ratio_from_issue_status
                 if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   self.done_ratio = status.default_done_ratio
                 end
               end
               def init_journal(user, notes = "")
                 @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
                 @issue_before_change = self.clone
                 @issue_before_change.status = self.status
                 @custom_values_before_change = {}
                 self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
                 # Make sure updated_on is updated when adding a note.
                 updated_on_will_change!
                 @current_journal
               end
               # Return true if the issue is closed, otherwise false
               def closed?
                 self.status.is_closed?
               end
               # Return true if the issue is being reopened
               def reopened?
                 if !new_record? && status_id_changed?
                   status_was = IssueStatus.find_by_id(status_id_was)
                   status_new = IssueStatus.find_by_id(status_id)
                   if status_was && status_new && status_was.is_closed? && !status_new.is_closed?
                     return true
                   end
                 end
                 false
               end
               # Return true if the issue is being closed
               def closing?
                 if !new_record? && status_id_changed?
                   status_was = IssueStatus.find_by_id(status_id_was)
                   status_new = IssueStatus.find_by_id(status_id)
                   if status_was && status_new && !status_was.is_closed? && status_new.is_closed?
                     return true
                   end
                 end
                 false
               end
               # Returns true if the issue is overdue
               def overdue?
                 !due_date.nil? && (due_date < Date.today) && !status.is_closed?
               end
               # Is the amount of work done less than it should for the due date
               def behind_schedule?
                 return false if start_date.nil? || due_date.nil?
                 done_date = start_date + ((due_date - start_date+1)* done_ratio/100).floor
                 return done_date <= Date.today
               end
               # Does this issue have children?
               def children?
                 !leaf?
               end
               # Users the issue can be assigned to
               def assignable_users
                 users = project.assignable_users
                 users << author if author
                 users.uniq.sort
               end
               # Versions that the issue can be assigned to
               def assignable_versions
                 @assignable_versions ||= (project.shared_versions.open + [Version.find_by_id(fixed_version_id_was)]).compact.uniq.sort
               end
               # Returns true if this issue is blocked by another issue that is still open
               def blocked?
                 !relations_to.detect {|ir| ir.relation_type == 'blocks' && !ir.issue_from.closed?}.nil?
               end
               # Returns an array of status that user is able to apply
               def new_statuses_allowed_to(user, include_default=false)
                 statuses = status.find_new_statuses_allowed_to(
                   user.roles_for_project(project),
                   tracker,
                   author == user,
                   assigned_to_id_changed? ? assigned_to_id_was == user.id : assigned_to_id == user.id
                   )
                 statuses << status unless statuses.empty?
                 statuses << IssueStatus.default if include_default
                 statuses = statuses.uniq.sort
                 blocked? ? statuses.reject {|s| s.is_closed?} : statuses
               end
               # Returns the mail adresses of users that should be notified
               def recipients
                 notified = project.notified_users
                 # Author and assignee are always notified unless they have been
                 # locked or don't want to be notified
                 notified << author if author && author.active? && author.notify_about?(self)
                 notified << assigned_to if assigned_to && assigned_to.active? && assigned_to.notify_about?(self)
                 notified.uniq!
                 # Remove users that can not view the issue
                 notified.reject! {|user| !visible?(user)}
                 notified.collect(&:mail)
               end
               # Returns the total number of hours spent on this issue and its descendants
               #
               # Example:
               #   spent_hours => 0.0
               #   spent_hours => 50.2
               def spent_hours
                 @spent_hours ||= self_and_descendants.sum("#{TimeEntry.table_name}.hours", :include => :time_entries).to_f || 0.0
               end
               def relations
                 (relations_from + relations_to).sort
               end
+              # Finds an issue relation given its id.
+              def find_relation(relation_id)
+                IssueRelation.find(relation_id, :conditions => ["issue_to_id = ? OR issue_from_id = ?", id, id])
+              end
               def all_dependent_issues(except=[])
                 except << self
                 dependencies = []
                 relations_from.each do |relation|
                   if relation.issue_to && !except.include?(relation.issue_to)
                     dependencies << relation.issue_to
                     dependencies += relation.issue_to.all_dependent_issues(except)
                   end
                 end
                 dependencies
               end
               # Returns an array of issues that duplicate this one
               def duplicates
                 relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from}
               end
               # Returns the due date or the target due date if any
               # Used on gantt chart
               def due_before
                 due_date || (fixed_version ? fixed_version.effective_date : nil)
               end
               # Returns the time scheduled for this issue.
               #
               # Example:
               #   Start Date: 2/26/09, End Date: 3/04/09
               #   duration => 6
               def duration
                 (start_date && due_date) ? due_date - start_date : 0
               end
               def soonest_start
                 @soonest_start ||= (
                     relations_to.collect{|relation| relation.successor_soonest_start} +
                     ancestors.collect(&:soonest_start)
                   ).compact.max
               end
               def reschedule_after(date)
                 return if date.nil?
                 if leaf?
                   if start_date.nil? || start_date < date
                     self.start_date, self.due_date = date, date + duration
                     save
                   end
                 else
                   leaves.each do |leaf|
                     leaf.reschedule_after(date)
                   end
                 end
               end
               def <=>(issue)
                 if issue.nil?
                   -1
                 elsif root_id != issue.root_id
                   (root_id || 0) <=> (issue.root_id || 0)
                 else
                   (lft || 0) <=> (issue.lft || 0)
                 end
               end
               def to_s
                 "#{tracker} ##{id}: #{subject}"
               end
               # Returns a string of css classes that apply to the issue
               def css_classes
                 s = "issue status-#{status.position} priority-#{priority.position}"
                 s << ' closed' if closed?
                 s << ' overdue' if overdue?
                 s << ' child' if child?
                 s << ' parent' unless leaf?
                 s << ' private' if is_private?
                 s << ' created-by-me' if User.current.logged? && author_id == User.current.id
                 s << ' assigned-to-me' if User.current.logged? && assigned_to_id == User.current.id
                 s
               end
               # Saves an issue, time_entry, attachments, and a journal from the parameters
               # Returns false if save fails
               def save_issue_with_child_records(params, existing_time_entry=nil)
                 Issue.transaction do
                   if params[:time_entry] && (params[:time_entry][:hours].present? || params[:time_entry][:comments].present?) && User.current.allowed_to?(:log_time, project)
                     @time_entry = existing_time_entry || TimeEntry.new
                     @time_entry.project = project
                     @time_entry.issue = self
                     @time_entry.user = User.current
                     @time_entry.spent_on = Date.today
                     @time_entry.attributes = params[:time_entry]
                     self.time_entries << @time_entry
                   end
                   if valid?
                     attachments = Attachment.attach_files(self, params[:attachments])
                     attachments[:files].each {|a| @current_journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                     # TODO: Rename hook
                     Redmine::Hook.call_hook(:controller_issues_edit_before_save, { :params => params, :issue => self, :time_entry => @time_entry, :journal => @current_journal})
                     begin
                       if save
                         # TODO: Rename hook
                         Redmine::Hook.call_hook(:controller_issues_edit_after_save, { :params => params, :issue => self, :time_entry => @time_entry, :journal => @current_journal})
                       else
                         raise ActiveRecord::Rollback
                       end
                     rescue ActiveRecord::StaleObjectError
                       attachments[:files].each(&:destroy)
                       errors.add_to_base l(:notice_locking_conflict)
                       raise ActiveRecord::Rollback
                     end
                   end
                 end
               end
               # Unassigns issues from +version+ if it's no longer shared with issue's project
               def self.update_versions_from_sharing_change(version)
                 # Update issues assigned to the version
                 update_versions(["#{Issue.table_name}.fixed_version_id = ?", version.id])
               end
               # Unassigns issues from versions that are no longer shared
               # after +project+ was moved
               def self.update_versions_from_hierarchy_change(project)
                 moved_project_ids = project.self_and_descendants.reload.collect(&:id)
                 # Update issues of the moved projects and issues assigned to a version of a moved project
                 Issue.update_versions(["#{Version.table_name}.project_id IN (?) OR #{Issue.table_name}.project_id IN (?)", moved_project_ids, moved_project_ids])
               end
               def parent_issue_id=(arg)
                 parent_issue_id = arg.blank? ? nil : arg.to_i
                 if parent_issue_id && @parent_issue = Issue.find_by_id(parent_issue_id)
                   @parent_issue.id
                 else
                   @parent_issue = nil
                   nil
                 end
               end
               def parent_issue_id
                 if instance_variable_defined? :@parent_issue
                   @parent_issue.nil? ? nil : @parent_issue.id
                 else
                   parent_id
                 end
               end
               # Extracted from the ReportsController.
               def self.by_tracker(project)
                 count_and_group_by(:project => project,
                                    :field => 'tracker_id',
                                    :joins => Tracker.table_name)
               end
               def self.by_version(project)
                 count_and_group_by(:project => project,
                                    :field => 'fixed_version_id',
                                    :joins => Version.table_name)
               end
               def self.by_priority(project)
                 count_and_group_by(:project => project,
                                    :field => 'priority_id',
                                    :joins => IssuePriority.table_name)
               end
               def self.by_category(project)
                 count_and_group_by(:project => project,
                                    :field => 'category_id',
                                    :joins => IssueCategory.table_name)
               end
               def self.by_assigned_to(project)
                 count_and_group_by(:project => project,
                                    :field => 'assigned_to_id',
                                    :joins => User.table_name)
               end
               def self.by_author(project)
                 count_and_group_by(:project => project,
                                    :field => 'author_id',
                                    :joins => User.table_name)
               end
               def self.by_subproject(project)
                 ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                             s.is_closed as closed,
                                                             #{Issue.table_name}.project_id as project_id,
                                                             count(#{Issue.table_name}.id) as total
                                                           from
                                                             #{Issue.table_name}, #{Project.table_name}, #{IssueStatus.table_name} s
                                                           where
                                                             #{Issue.table_name}.status_id=s.id
                                                             and #{Issue.table_name}.project_id = #{Project.table_name}.id
                                                             and #{visible_condition(User.current, :project => project, :with_subprojects => true)}
                                                             and #{Issue.table_name}.project_id <> #{project.id}
                                                           group by s.id, s.is_closed, #{Issue.table_name}.project_id") if project.descendants.active.any?
               end
               # End ReportsController extraction
               # Returns an array of projects that current user can move issues to
               def self.allowed_target_projects_on_move
                 projects = []
                 if User.current.admin?
                   # admin is allowed to move issues to any active (visible) project
                   projects = Project.visible.all
                 elsif User.current.logged?
                   if Role.non_member.allowed_to?(:move_issues)
                     projects = Project.visible.all
                   else
                     User.current.memberships.each {|m| projects << m.project if m.roles.detect {|r| r.allowed_to?(:move_issues)}}
                   end
                 end
                 projects
               end
               private
               def update_nested_set_attributes
                 if root_id.nil?
                   # issue was just created
                   self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id)
                   set_default_left_and_right
                   Issue.update_all("root_id = #{root_id}, lft = #{lft}, rgt = #{rgt}", ["id = ?", id])
                   if @parent_issue
                     move_to_child_of(@parent_issue)
                   end
                   reload
                 elsif parent_issue_id != parent_id
                   former_parent_id = parent_id
                   # moving an existing issue
                   if @parent_issue && @parent_issue.root_id == root_id
                     # inside the same tree
                     move_to_child_of(@parent_issue)
                   else
                     # to another tree
                     unless root?
                       move_to_right_of(root)
                       reload
                     end
                     old_root_id = root_id
                     self.root_id = (@parent_issue.nil? ? id : @parent_issue.root_id )
                     target_maxright = nested_set_scope.maximum(right_column_name) || 0
                     offset = target_maxright + 1 - lft
                     Issue.update_all("root_id = #{root_id}, lft = lft + #{offset}, rgt = rgt + #{offset}",
                                       ["root_id = ? AND lft >= ? AND rgt <= ? ", old_root_id, lft, rgt])
                     self[left_column_name] = lft + offset
                     self[right_column_name] = rgt + offset
                     if @parent_issue
                       move_to_child_of(@parent_issue)
                     end
                   end
                   reload
                   # delete invalid relations of all descendants
                   self_and_descendants.each do |issue|
                     issue.relations.each do |relation|
                       relation.destroy unless relation.valid?
                     end
                   end
                   # update former parent
                   recalculate_attributes_for(former_parent_id) if former_parent_id
                 end
                 remove_instance_variable(:@parent_issue) if instance_variable_defined?(:@parent_issue)
               end
               def update_parent_attributes
                 recalculate_attributes_for(parent_id) if parent_id
               end
               def recalculate_attributes_for(issue_id)
                 if issue_id && p = Issue.find_by_id(issue_id)
                   # priority = highest priority of children
                   if priority_position = p.children.maximum("#{IssuePriority.table_name}.position", :include => :priority)
                     p.priority = IssuePriority.find_by_position(priority_position)
                   end
                   # start/due dates = lowest/highest dates of children
                   p.start_date = p.children.minimum(:start_date)
                   p.due_date = p.children.maximum(:due_date)
                   if p.start_date && p.due_date && p.due_date < p.start_date
                     p.start_date, p.due_date = p.due_date, p.start_date
                   end
                   # done ratio = weighted average ratio of leaves
                   unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
                     leaves_count = p.leaves.count
                     if leaves_count > 0
                       average = p.leaves.average(:estimated_hours).to_f
                       if average == 0
                         average = 1
                       end
                       done = p.leaves.sum("COALESCE(estimated_hours, #{average}) * (CASE WHEN is_closed = #{connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)", :include => :status).to_f
                       progress = done / (average * leaves_count)
                       p.done_ratio = progress.round
                     end
                   end
                   # estimate = sum of leaves estimates
                   p.estimated_hours = p.leaves.sum(:estimated_hours).to_f
                   p.estimated_hours = nil if p.estimated_hours == 0.0
                   # ancestors will be recursively updated
                   p.save(false)
                 end
               end
               # Update issues so their versions are not pointing to a
               # fixed_version that is not shared with the issue's project
               def self.update_versions(conditions=nil)
                 # Only need to update issues with a fixed_version from
                 # a different project and that is not systemwide shared
                 Issue.all(:conditions => merge_conditions("#{Issue.table_name}.fixed_version_id IS NOT NULL" +
                                                             " AND #{Issue.table_name}.project_id <> #{Version.table_name}.project_id" +
                                                             " AND #{Version.table_name}.sharing <> 'system'",
                                                             conditions),
                           :include => [:project, :fixed_version]
                           ).each do |issue|
                   next if issue.project.nil? || issue.fixed_version.nil?
                   unless issue.project.shared_versions.include?(issue.fixed_version)
                     issue.init_journal(User.current)
                     issue.fixed_version = nil
                     issue.save
                   end
                 end
               end
               # Callback on attachment deletion
               def attachment_removed(obj)
                 journal = init_journal(User.current)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => obj.id,
                                                      :old_value => obj.filename)
                 journal.save
               end
               # Default assignment based on category
               def default_assign
                 if assigned_to.nil? && category && category.assigned_to
                   self.assigned_to = category.assigned_to
                 end
               end
               # Updates start/due dates of following issues
               def reschedule_following_issues
                 if start_date_changed? || due_date_changed?
                   relations_from.each do |relation|
                     relation.set_issue_to_dates
                   end
                 end
               end
               # Closes duplicates if the issue is being closed
               def close_duplicates
                 if closing?
                   duplicates.each do |duplicate|
                     # Reload is need in case the duplicate was updated by a previous duplicate
                     duplicate.reload
                     # Don't re-close it if it's already closed
                     next if duplicate.closed?
                     # Same user and notes
                     if @current_journal
                       duplicate.init_journal(@current_journal.user, @current_journal.notes)
                     end
                     duplicate.update_attribute :status, self.status
                   end
                 end
               end
               # Saves the changes in a Journal
               # Called after_save
               def create_journal
                 if @current_journal
                   # attributes changes
                   (Issue.column_names - %w(id root_id lft rgt lock_version created_on updated_on)).each {|c|
                     before = @issue_before_change.send(c)
                     after = send(c)
                     next if before == after || (before.blank? && after.blank?)
                     @current_journal.details << JournalDetail.new(:property => 'attr',
                                                                   :prop_key => c,
                                                                   :old_value => @issue_before_change.send(c),
                                                                   :value => send(c))
                   }
                   # custom fields changes
                   custom_values.each {|c|
                     next if (@custom_values_before_change[c.custom_field_id]==c.value ||
                               (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
                     @current_journal.details << JournalDetail.new(:property => 'cf',
                                                                   :prop_key => c.custom_field_id,
                                                                   :old_value => @custom_values_before_change[c.custom_field_id],
                                                                   :value => c.value)
                   }
                   @current_journal.save
                   # reset current journal
                   init_journal @current_journal.user, @current_journal.notes
                 end
               end
               # Query generator for selecting groups of issue counts for a project
               # based on specific criteria
               #
               # Options
               # * project - Project to search in.
               # * field - String. Issue field to key off of in the grouping.
               # * joins - String. The table name to join against.
               def self.count_and_group_by(options)
                 project = options.delete(:project)
                 select_field = options.delete(:field)
                 joins = options.delete(:joins)
                 where = "#{Issue.table_name}.#{select_field}=j.id"
                 ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                             s.is_closed as closed,
                                                             j.id as #{select_field},
                                                             count(#{Issue.table_name}.id) as total
                                                           from
                                                               #{Issue.table_name}, #{Project.table_name}, #{IssueStatus.table_name} s, #{joins} j
                                                           where
                                                             #{Issue.table_name}.status_id=s.id
                                                             and #{where}
                                                             and #{Issue.table_name}.project_id=#{Project.table_name}.id
                                                             and #{visible_condition(User.current, :project => project)}
                                                           group by s.id, s.is_closed, j.id")
               end
             end

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

             <div class="contextual">
             <% if User.current.allowed_to?(:manage_issue_relations, @project) %>
               <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
             <% end %>
             </div>
             <p><strong><%=l(:label_related_issues)%></strong></p>
             <% if @relations.present? %>
             <form>
             <table class="list issues">
             <% @relations.each do |relation| %>
             <tr class="issue hascontextmenu">
             <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? %>
                 <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
             </td>
             <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},
-                                                              :method => :post
+                                                              :method => :delete
                                                             }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
             </tr>
             <% end %>
             </table>
             </form>
             <% end %>
             <% remote_form_for(:relation, @relation,
-                             :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
+                             :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue},
                              :method => :post,
                              :complete => "Form.Element.focus('relation_issue_to_id');",
                              :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
             <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
             <% end %>

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

             api.issue do
               api.id @issue.id
               api.project(:id => @issue.project_id, :name => @issue.project.name) unless @issue.project.nil?
               api.tracker(:id => @issue.tracker_id, :name => @issue.tracker.name) unless @issue.tracker.nil?
               api.status(:id => @issue.status_id, :name => @issue.status.name) unless @issue.status.nil?
               api.priority(:id => @issue.priority_id, :name => @issue.priority.name) unless @issue.priority.nil?
               api.author(:id => @issue.author_id, :name => @issue.author.name) unless @issue.author.nil?
               api.assigned_to(:id => @issue.assigned_to_id, :name => @issue.assigned_to.name) unless @issue.assigned_to.nil?
               api.category(:id => @issue.category_id, :name => @issue.category.name) unless @issue.category.nil?
               api.fixed_version(:id => @issue.fixed_version_id, :name => @issue.fixed_version.name) unless @issue.fixed_version.nil?
               api.parent(:id => @issue.parent_id) unless @issue.parent.nil?
               api.subject @issue.subject
               api.description @issue.description
               api.start_date @issue.start_date
               api.due_date @issue.due_date
               api.done_ratio @issue.done_ratio
               api.estimated_hours @issue.estimated_hours
               api.spent_hours(@issue.spent_hours) if User.current.allowed_to?(:view_time_entries, @project)
               render_api_custom_values @issue.custom_field_values, api
               api.created_on @issue.created_on
               api.updated_on @issue.updated_on
               render_api_issue_children(@issue, api) if include_in_api_response?('children')
               api.array :relations do
                 @relations.each do |relation|
-                  api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
+                  api.relation(:id => relation.id, :issue_id => relation.issue_from_id, :issue_to_id => relation.issue_to_id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
                 end
               end if include_in_api_response?('relations') && @relations.present?
               api.array :changesets do
                 @issue.changesets.each do |changeset|
                   api.changeset :revision => changeset.revision do
                     api.user(:id => changeset.user_id, :name => changeset.user.name) unless changeset.user.nil?
                     api.comments changeset.comments
                     api.committed_on changeset.committed_on
                   end
                 end
               end if include_in_api_response?('changesets') && User.current.allowed_to?(:view_changesets, @project)
               api.array :journals do
                 @issue.journals.each do |journal|
                   api.journal :id => journal.id do
                     api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
                     api.notes journal.notes
                     api.created_on journal.created_on
                     api.array :details do
                       journal.details.each do |detail|
                         api.detail :property => detail.property, :name => detail.prop_key do
                           api.old_value detail.old_value
                           api.new_value detail.value
                         end
                       end
                     end
                   end
                 end
               end if include_in_api_response?('journals')
             end

config/routes.rb +1 -6

             ActionController::Routing::Routes.draw do |map|
               # Add your own custom routes here.
               # The priority is based upon order of creation: first created -> highest priority.
               # Here's a sample route:
               # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
               # Keep in mind you can assign values other than :controller and :action
               map.home '', :controller => 'welcome'
               map.signin 'login', :controller => 'account', :action => 'login'
               map.signout 'logout', :controller => 'account', :action => 'logout'
               map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
               map.connect 'help/:ctrl/:page', :controller => 'help'
               map.with_options :controller => 'time_entry_reports', :action => 'report',:conditions => {:method => :get} do |time_report|
                 time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report'
                 time_report.connect 'projects/:project_id/issues/:issue_id/time_entries/report.:format'
                 time_report.connect 'projects/:project_id/time_entries/report'
                 time_report.connect 'projects/:project_id/time_entries/report.:format'
                 time_report.connect 'time_entries/report'
                 time_report.connect 'time_entries/report.:format'
               end
               map.bulk_edit_time_entry 'time_entries/bulk_edit',
                                :controller => 'timelog', :action => 'bulk_edit', :conditions => { :method => :get }
               map.bulk_update_time_entry 'time_entries/bulk_edit',
                                :controller => 'timelog', :action => 'bulk_update', :conditions => { :method => :post }
               map.time_entries_context_menu '/time_entries/context_menu',
                                :controller => 'context_menus', :action => 'time_entries'
               # TODO: wasteful since this is also nested under issues, projects, and projects/issues
               map.resources :time_entries, :controller => 'timelog'
               map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
               map.with_options :controller => 'messages' do |messages_routes|
                 messages_routes.with_options :conditions => {:method => :get} do |messages_views|
                   messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
                   messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
                 end
                 messages_routes.with_options :conditions => {:method => :post} do |messages_actions|
                   messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
                   messages_actions.connect 'boards/:board_id/topics/:id/:action', :action => /edit|destroy/
                 end
               end
               map.with_options :controller => 'boards' do |board_routes|
                 board_routes.with_options :conditions => {:method => :get} do |board_views|
                   board_views.connect 'projects/:project_id/boards', :action => 'index'
                   board_views.connect 'projects/:project_id/boards/new', :action => 'new'
                   board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id.:format', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
                 end
                 board_routes.with_options :conditions => {:method => :post} do |board_actions|
                   board_actions.connect 'projects/:project_id/boards', :action => 'new'
                   board_actions.connect 'projects/:project_id/boards/:id/:action', :action => /edit|destroy/
                 end
               end
               map.with_options :controller => 'documents' do |document_routes|
                 document_routes.with_options :conditions => {:method => :get} do |document_views|
                   document_views.connect 'projects/:project_id/documents', :action => 'index'
                   document_views.connect 'projects/:project_id/documents/new', :action => 'new'
                   document_views.connect 'documents/:id', :action => 'show'
                   document_views.connect 'documents/:id/edit', :action => 'edit'
                 end
                 document_routes.with_options :conditions => {:method => :post} do |document_actions|
                   document_actions.connect 'projects/:project_id/documents', :action => 'new'
                   document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
                 end
               end
               map.resources :issue_moves, :only => [:new, :create], :path_prefix => '/issues', :as => 'move'
               # Misc issue routes. TODO: move into resources
               map.auto_complete_issues '/issues/auto_complete', :controller => 'auto_completes', :action => 'issues'
               map.preview_issue '/issues/preview/:id', :controller => 'previews', :action => 'issue' # TODO: would look nicer as /issues/:id/preview
               map.issues_context_menu '/issues/context_menu', :controller => 'context_menus', :action => 'issues'
               map.issue_changes '/issues/changes', :controller => 'journals', :action => 'index'
               map.bulk_edit_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_edit', :conditions => { :method => :get }
               map.bulk_update_issue 'issues/bulk_edit', :controller => 'issues', :action => 'bulk_update', :conditions => { :method => :post }
               map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post }
               map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy
               map.with_options :controller => 'gantts', :action => 'show' do |gantts_routes|
                 gantts_routes.connect '/projects/:project_id/issues/gantt'
                 gantts_routes.connect '/projects/:project_id/issues/gantt.:format'
                 gantts_routes.connect '/issues/gantt.:format'
               end
               map.with_options :controller => 'calendars', :action => 'show' do |calendars_routes|
                 calendars_routes.connect '/projects/:project_id/issues/calendar'
                 calendars_routes.connect '/issues/calendar'
               end
               map.with_options :controller => 'reports', :conditions => {:method => :get} do |reports|
                 reports.connect 'projects/:id/issues/report', :action => 'issue_report'
                 reports.connect 'projects/:id/issues/report/:detail', :action => 'issue_report_details'
               end
               # Following two routes conflict with the resources because #index allows POST
               map.connect '/issues', :controller => 'issues', :action => 'index', :conditions => { :method => :post }
               map.connect '/issues/create', :controller => 'issues', :action => 'index', :conditions => { :method => :post }
               map.resources :issues, :member => { :edit => :post }, :collection => {} do |issues|
                 issues.resources :time_entries, :controller => 'timelog'
+                issues.resources :relations, :controller => 'issue_relations', :only => [:show, :create, :destroy]
               end
               map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post } do |issues|
                 issues.resources :time_entries, :controller => 'timelog'
               end
-              map.with_options  :controller => 'issue_relations', :conditions => {:method => :post} do |relations|
-                relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
-                relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
-              end
               map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
               map.with_options :controller => 'users' do |users|
                 users.connect 'users/:id/edit/:tab', :action => 'edit', :tab => nil, :conditions => {:method => :get}
                 users.with_options :conditions => {:method => :post} do |user_actions|
                   user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
                 end
               end
               map.resources :users, :member => {
                 :edit_membership => :post,
                 :destroy_membership => :post
               }
               # For nice "roadmap" in the url for the index action
               map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index'
               map.all_news 'news', :controller => 'news', :action => 'index'
               map.formatted_all_news 'news.:format', :controller => 'news', :action => 'index'
               map.preview_news '/news/preview', :controller => 'previews', :action => 'news'
               map.connect 'news/:id/comments', :controller => 'comments', :action => 'create', :conditions => {:method => :post}
               map.connect 'news/:id/comments/:comment_id', :controller => 'comments', :action => 'destroy', :conditions => {:method => :delete}
               map.resources :projects, :member => {
                 :copy => [:get, :post],
                 :settings => :get,
                 :modules => :post,
                 :archive => :post,
                 :unarchive => :post
               } do |project|
                 project.resource :project_enumerations, :as => 'enumerations', :only => [:update, :destroy]
                 project.resources :files, :only => [:index, :new, :create]
                 project.resources :versions, :collection => {:close_completed => :put}, :member => {:status_by => :post}
                 project.resources :news, :shallow => true
                 project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
                 project.wiki_start_page 'wiki', :controller => 'wiki', :action => 'show', :conditions => {:method => :get}
                 project.wiki_index 'wiki/index', :controller => 'wiki', :action => 'index', :conditions => {:method => :get}
                 project.wiki_diff 'wiki/:id/diff/:version', :controller => 'wiki', :action => 'diff', :version => nil
                 project.wiki_diff 'wiki/:id/diff/:version/vs/:version_from', :controller => 'wiki', :action => 'diff'
                 project.wiki_annotate 'wiki/:id/annotate/:version', :controller => 'wiki', :action => 'annotate'
                 project.resources :wiki, :except => [:new, :create], :member => {
                   :rename => [:get, :post],
                   :history => :get,
                   :preview => :any,
                   :protect => :post,
                   :add_attachment => :post
                 }, :collection => {
                   :export => :get,
                   :date_index => :get
                 }
               end
               # Destroy uses a get request to prompt the user before the actual DELETE request
               map.project_destroy_confirm 'projects/:id/destroy', :controller => 'projects', :action => 'destroy', :conditions => {:method => :get}
               # TODO: port to be part of the resources route(s)
               map.with_options :controller => 'projects' do |project_mapper|
                 project_mapper.with_options :conditions => {:method => :get} do |project_views|
                   project_views.connect 'projects/:id/settings/:tab', :controller => 'projects', :action => 'settings'
                   project_views.connect 'projects/:project_id/issues/:copy_from/copy', :controller => 'issues', :action => 'new'
                 end
               end
               map.with_options :controller => 'activities', :action => 'index', :conditions => {:method => :get} do |activity|
                 activity.connect 'projects/:id/activity'
                 activity.connect 'projects/:id/activity.:format'
                 activity.connect 'activity', :id => nil
                 activity.connect 'activity.:format', :id => nil
               end
               map.with_options :controller => 'issue_categories' do |categories|
                 categories.connect 'projects/:project_id/issue_categories/new', :action => 'new'
               end
               map.with_options :controller => 'repositories' do |repositories|
                 repositories.with_options :conditions => {:method => :get} do |repository_views|
                   repository_views.connect 'projects/:id/repository', :action => 'show'
                   repository_views.connect 'projects/:id/repository/edit', :action => 'edit'
                   repository_views.connect 'projects/:id/repository/statistics', :action => 'stats'
                   repository_views.connect 'projects/:id/repository/revisions', :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions.:format', :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/raw/*path', :action => 'entry', :format => 'raw', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
                   repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
                   repository_views.connect 'projects/:id/repository/raw/*path', :action => 'entry', :format => 'raw'
                   # TODO: why the following route is required?
                   repository_views.connect 'projects/:id/repository/entry/*path', :action => 'entry'
                   repository_views.connect 'projects/:id/repository/:action/*path'
                 end
                 repositories.connect 'projects/:id/repository/:action', :conditions => {:method => :post}
               end
               map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
               map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
               map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
               map.resources :groups
               #left old routes at the bottom for backwards compat
               map.connect 'projects/:project_id/queries/:action', :controller => 'queries'
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
               map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
               map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'
-              map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
               map.connect 'projects/:project_id/news/:action', :controller => 'news'
               map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
               map.with_options :controller => 'repositories' do |omap|
                 omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
                 omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
                 omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
                 omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
                 omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
                 omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
               end
               map.with_options :controller => 'sys' do |sys|
                 sys.connect 'sys/projects.:format', :action => 'projects', :conditions => {:method => :get}
                 sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post}
               end
               # Install the default route as the lowest priority.
               map.connect ':controller/:action/:id'
               map.connect 'robots.txt', :controller => 'welcome', :action => 'robots'
               # Used for OpenID
               map.root :controller => 'account', :action => 'login'
             end

lib/redmine.rb +1 -1

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/activity'
             require 'redmine/search'
             require 'redmine/custom_field_format'
             require 'redmine/mime_type'
             require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/hook'
             require 'redmine/plugin'
             require 'redmine/notifiable'
             require 'redmine/wiki_formatting'
             require 'redmine/scm/base'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             if RUBY_VERSION < '1.9'
               require 'faster_csv'
             else
               require 'csv'
               FCSV = CSV
             end
             Redmine::Scm::Base.add "Subversion"
             Redmine::Scm::Base.add "Darcs"
             Redmine::Scm::Base.add "Mercurial"
             Redmine::Scm::Base.add "Cvs"
             Redmine::Scm::Base.add "Bazaar"
             Redmine::Scm::Base.add "Git"
             Redmine::Scm::Base.add "Filesystem"
             Redmine::CustomFieldFormat.map do |fields|
               fields.register Redmine::CustomFieldFormat.new('string', :label => :label_string, :order => 1)
               fields.register Redmine::CustomFieldFormat.new('text', :label => :label_text, :order => 2)
               fields.register Redmine::CustomFieldFormat.new('int', :label => :label_integer, :order => 3)
               fields.register Redmine::CustomFieldFormat.new('float', :label => :label_float, :order => 4)
               fields.register Redmine::CustomFieldFormat.new('list', :label => :label_list, :order => 5)
               fields.register Redmine::CustomFieldFormat.new('date', :label => :label_date, :order => 6)
               fields.register Redmine::CustomFieldFormat.new('bool', :label => :label_boolean, :order => 7)
               fields.register Redmine::CustomFieldFormat.new('user', :label => :label_user, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 8)
               fields.register Redmine::CustomFieldFormat.new('version', :label => :label_version, :only => %w(Issue TimeEntry Version Project), :edit_as => 'list', :order => 9)
             end
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
               map.permission :manage_versions, {:projects => :settings, :versions => [:new, :create, :edit, :update, :close_completed, :destroy]}, :require => :member
               map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:issues => [:index, :show],
                                               :auto_complete => [:issues],
                                               :context_menus => [:issues],
                                               :versions => [:index, :show, :status_by],
                                               :journals => [:index, :diff],
                                               :queries => :index,
                                               :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
                 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
-                map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
+                map.permission :manage_issue_relations, {:issue_relations => [:show, :create, :destroy]}
                 map.permission :manage_subtasks, {}
                 map.permission :set_issues_private, {}
                 map.permission :set_own_issues_private, {}, :require => :loggedin
                 map.permission :add_issue_notes, {:issues => [:edit, :update], :journals => [:new]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issue_moves => [:new, :create]}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
                 map.permission :delete_issue_watchers, {:watchers => :destroy}
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => [:new, :create, :edit, :update, :bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :view_time_entries, :timelog => [:index, :show], :time_entry_reports => [:report]
                 map.permission :edit_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy, :bulk_edit, :bulk_update]}, :require => :member
                 map.permission :edit_own_time_entries, {:timelog => [:new, :create, :edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
                 map.permission :manage_project_activities, {:project_enumerations => [:update, :destroy]}, :require => :member
               end
               map.project_module :news do |map|
                 map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:comments => :create}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:files => [:new, :create]}, :require => :loggedin
                 map.permission :view_files, :files => :index, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :show, :special, :date_index]
                 map.permission :export_wiki_pages, :wiki => [:export]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :update, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                 map.permission :commit_access, {}
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
                 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
               end
               map.project_module :calendar do |map|
                 map.permission :view_calendar, :calendars => [:show, :update]
               end
               map.project_module :gantt do |map|
                 map.permission :view_gantt, :gantts => [:show, :update]
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_path
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
               menu.push :help, Redmine::Info.help_url, :last => true
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :admin_menu do |menu|
               menu.push :projects, {:controller => 'admin', :action => 'projects'}, :caption => :label_project_plural
               menu.push :users, {:controller => 'users'}, :caption => :label_user_plural
               menu.push :groups, {:controller => 'groups'}, :caption => :label_group_plural
               menu.push :roles, {:controller => 'roles'}, :caption => :label_role_and_permissions
               menu.push :trackers, {:controller => 'trackers'}, :caption => :label_tracker_plural
               menu.push :issue_statuses, {:controller => 'issue_statuses'}, :caption => :label_issue_status_plural,
                         :html => {:class => 'issue_statuses'}
               menu.push :workflows, {:controller => 'workflows', :action => 'edit'}, :caption => :label_workflow
               menu.push :custom_fields, {:controller => 'custom_fields'},  :caption => :label_custom_field_plural,
                         :html => {:class => 'custom_fields'}
               menu.push :enumerations, {:controller => 'enumerations'}
               menu.push :settings, {:controller => 'settings'}
               menu.push :ldap_authentication, {:controller => 'ldap_auth_sources', :action => 'index'},
                         :html => {:class => 'server_authentication'}
               menu.push :plugins, {:controller => 'admin', :action => 'plugins'}, :last => true
               menu.push :info, {:controller => 'admin', :action => 'info'}, :caption => :label_information_plural, :last => true
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'activities', :action => 'index' }
               menu.push :roadmap, { :controller => 'versions', :action => 'index' }, :param => :project_id,
                           :if => Proc.new { |p| p.shared_versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :gantt, { :controller => 'gantts', :action => 'show' }, :param => :project_id, :caption => :label_gantt
               menu.push :calendar, { :controller => 'calendars', :action => 'show' }, :param => :project_id, :caption => :label_calendar
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'show', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_plural, :param => :project_id
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
             end
             Redmine::Activity.map do |activity|
               activity.register :issues, :class_name => %w(Issue Journal)
               activity.register :changesets
               activity.register :news
               activity.register :documents, :class_name => %w(Document Attachment)
               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
               activity.register :time_entries, :default => false
             end
             Redmine::Search.map do |search|
               search.register :issues
               search.register :news
               search.register :documents
               search.register :changesets
               search.register :wiki_pages
               search.register :messages
               search.register :projects
             end
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end
             ActionView::Template.register_template_handler :rsb, Redmine::Views::ApiTemplateHandler

test/functional/issue_relations_controller_test.rb +28 -11

+            # Redmine - project management software
+            # Copyright (C) 2006-2011  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_new
+              def test_create
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
-                  post :new, :issue_id => 1,
+                  post :create, :issue_id => 1,
                              :relation => {:issue_to_id => '2', :relation_type => 'relates', :delay => ''}
                 end
               end
-              def test_new_xhr
+              def test_create_xhr
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
-                  xhr :post, :new,
+                  xhr :post, :create,
                     :issue_id => 3,
                     :relation => {:issue_to_id => '1', :relation_type => 'relates', :delay => ''}
                   assert_select_rjs 'relations' do
                     assert_select 'table', 1
                     assert_select 'tr', 2 # relations
                   end
                 end
               end
-              def test_new_should_accept_id_with_hash
+              def test_create_should_accept_id_with_hash
                 assert_difference 'IssueRelation.count' do
                   @request.session[:user_id] = 3
-                  post :new, :issue_id => 1,
+                  post :create, :issue_id => 1,
                              :relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
                 end
               end
-              def test_new_should_not_break_with_non_numerical_id
+              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 :new, :issue_id => 1,
+                    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 :new, :issue_id => 1,
+                  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_destroy
                 assert_difference 'IssueRelation.count', -1 do
                   @request.session[:user_id] = 3
-                  post :destroy, :id => '2', :issue_id => '3'
+                  delete :destroy, :id => '2', :issue_id => '3'
                 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 :post, :destroy, :id => '2', :issue_id => '3'
+                  xhr :delete, :destroy, :id => '2', :issue_id => '3'
                   assert_select_rjs 'relations' do
                     assert_select 'table', 1
                     assert_select 'tr', 1 # relation left
                   end
                 end
               end
             end

test/integration/routing_test.rb +11 -2

             # redMine - project management software
             # Copyright (C) 2006-2010  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 RoutingTest < ActionController::IntegrationTest
               context "activities" do
                 should_route :get, "/activity", :controller => 'activities', :action => 'index', :id => nil
                 should_route :get, "/activity.atom", :controller => 'activities', :action => 'index', :id => nil, :format => 'atom'
               end
               context "attachments" do
                 should_route :get, "/attachments/1", :controller => 'attachments', :action => 'show', :id => '1'
                 should_route :get, "/attachments/1/filename.ext", :controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext'
                 should_route :get, "/attachments/download/1", :controller => 'attachments', :action => 'download', :id => '1'
                 should_route :get, "/attachments/download/1/filename.ext", :controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext'
               end
               context "boards" do
                 should_route :get, "/projects/world_domination/boards", :controller => 'boards', :action => 'index', :project_id => 'world_domination'
                 should_route :get, "/projects/world_domination/boards/new", :controller => 'boards', :action => 'new', :project_id => 'world_domination'
                 should_route :get, "/projects/world_domination/boards/44", :controller => 'boards', :action => 'show', :project_id => 'world_domination', :id => '44'
                 should_route :get, "/projects/world_domination/boards/44.atom", :controller => 'boards', :action => 'show', :project_id => 'world_domination', :id => '44', :format => 'atom'
                 should_route :get, "/projects/world_domination/boards/44/edit", :controller => 'boards', :action => 'edit', :project_id => 'world_domination', :id => '44'
                 should_route :post, "/projects/world_domination/boards/new", :controller => 'boards', :action => 'new', :project_id => 'world_domination'
                 should_route :post, "/projects/world_domination/boards/44/edit", :controller => 'boards', :action => 'edit', :project_id => 'world_domination', :id => '44'
                 should_route :post, "/projects/world_domination/boards/44/destroy", :controller => 'boards', :action => 'destroy', :project_id => 'world_domination', :id => '44'
               end
               context "documents" do
                 should_route :get, "/projects/567/documents", :controller => 'documents', :action => 'index', :project_id => '567'
                 should_route :get, "/projects/567/documents/new", :controller => 'documents', :action => 'new', :project_id => '567'
                 should_route :get, "/documents/22", :controller => 'documents', :action => 'show', :id => '22'
                 should_route :get, "/documents/22/edit", :controller => 'documents', :action => 'edit', :id => '22'
                 should_route :post, "/projects/567/documents/new", :controller => 'documents', :action => 'new', :project_id => '567'
                 should_route :post, "/documents/567/edit", :controller => 'documents', :action => 'edit', :id => '567'
                 should_route :post, "/documents/567/destroy", :controller => 'documents', :action => 'destroy', :id => '567'
               end
               context "issues" do
                 # REST actions
                 should_route :get, "/issues", :controller => 'issues', :action => 'index'
                 should_route :get, "/issues.pdf", :controller => 'issues', :action => 'index', :format => 'pdf'
                 should_route :get, "/issues.atom", :controller => 'issues', :action => 'index', :format => 'atom'
                 should_route :get, "/issues.xml", :controller => 'issues', :action => 'index', :format => 'xml'
                 should_route :get, "/projects/23/issues", :controller => 'issues', :action => 'index', :project_id => '23'
                 should_route :get, "/projects/23/issues.pdf", :controller => 'issues', :action => 'index', :project_id => '23', :format => 'pdf'
                 should_route :get, "/projects/23/issues.atom", :controller => 'issues', :action => 'index', :project_id => '23', :format => 'atom'
                 should_route :get, "/projects/23/issues.xml", :controller => 'issues', :action => 'index', :project_id => '23', :format => 'xml'
                 should_route :get, "/issues/64", :controller => 'issues', :action => 'show', :id => '64'
                 should_route :get, "/issues/64.pdf", :controller => 'issues', :action => 'show', :id => '64', :format => 'pdf'
                 should_route :get, "/issues/64.atom", :controller => 'issues', :action => 'show', :id => '64', :format => 'atom'
                 should_route :get, "/issues/64.xml", :controller => 'issues', :action => 'show', :id => '64', :format => 'xml'
                 should_route :get, "/projects/23/issues/new", :controller => 'issues', :action => 'new', :project_id => '23'
                 should_route :post, "/projects/23/issues", :controller => 'issues', :action => 'create', :project_id => '23'
                 should_route :post, "/issues.xml", :controller => 'issues', :action => 'create', :format => 'xml'
                 should_route :get, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
                 # TODO: Should use PUT
                 should_route :post, "/issues/64/edit", :controller => 'issues', :action => 'edit', :id => '64'
                 should_route :put, "/issues/1.xml", :controller => 'issues', :action => 'update', :id => '1', :format => 'xml'
                 # TODO: Should use DELETE
                 should_route :post, "/issues/64/destroy", :controller => 'issues', :action => 'destroy', :id => '64'
                 should_route :delete, "/issues/1.xml", :controller => 'issues', :action => 'destroy', :id => '1', :format => 'xml'
                 # Extra actions
                 should_route :get, "/projects/23/issues/64/copy", :controller => 'issues', :action => 'new', :project_id => '23', :copy_from => '64'
                 should_route :get, "/issues/move/new", :controller => 'issue_moves', :action => 'new'
                 should_route :post, "/issues/move", :controller => 'issue_moves', :action => 'create'
                 should_route :post, "/issues/1/quoted", :controller => 'journals', :action => 'new', :id => '1'
                 should_route :get, "/issues/calendar", :controller => 'calendars', :action => 'show'
                 should_route :get, "/projects/project-name/issues/calendar", :controller => 'calendars', :action => 'show', :project_id => 'project-name'
                 should_route :get, "/issues/gantt", :controller => 'gantts', :action => 'show'
                 should_route :get, "/issues/gantt.pdf", :controller => 'gantts', :action => 'show', :format => 'pdf'
                 should_route :get, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
                 should_route :get, "/projects/project-name/issues/gantt.pdf", :controller => 'gantts', :action => 'show', :project_id => 'project-name', :format => 'pdf'
                 should_route :get, "/issues/auto_complete", :controller => 'auto_completes', :action => 'issues'
                 should_route :get, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
                 should_route :post, "/issues/preview/123", :controller => 'previews', :action => 'issue', :id => '123'
                 should_route :get, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
                 should_route :post, "/issues/context_menu", :controller => 'context_menus', :action => 'issues'
                 should_route :get, "/issues/changes", :controller => 'journals', :action => 'index'
                 should_route :get, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_edit'
                 should_route :post, "/issues/bulk_edit", :controller => 'issues', :action => 'bulk_update'
               end
               context "issue categories" do
                 should_route :get, "/projects/test/issue_categories/new", :controller => 'issue_categories', :action => 'new', :project_id => 'test'
                 should_route :post, "/projects/test/issue_categories/new", :controller => 'issue_categories', :action => 'new', :project_id => 'test'
               end
               context "issue relations" do
-                should_route :post, "/issues/1/relations", :controller => 'issue_relations', :action => 'new', :issue_id => '1'
+                should_route :post, "/issues/1/relations", :controller => 'issue_relations', :action => 'create', :issue_id => '1'
-                should_route :post, "/issues/1/relations/23/destroy", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23'
+                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, "/issues/1/relations/23.xml", :controller => 'issue_relations', :action => 'show', :issue_id => '1', :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 :delete, "/issues/1/relations/23", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :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, "/issues/1/relations/23.json", :controller => 'issue_relations', :action => 'destroy', :issue_id => '1', :id => '23', :format => 'json'
               end
               context "issue reports" do
                 should_route :get, "/projects/567/issues/report", :controller => 'reports', :action => 'issue_report', :id => '567'
                 should_route :get, "/projects/567/issues/report/assigned_to", :controller => 'reports', :action => 'issue_report_details', :id => '567', :detail => 'assigned_to'
               end
               context "members" do
                 should_route :post, "/projects/5234/members/new", :controller => 'members', :action => 'new', :id => '5234'
               end
               context "messages" do
                 should_route :get, "/boards/22/topics/2", :controller => 'messages', :action => 'show', :id => '2', :board_id => '22'
                 should_route :get, "/boards/lala/topics/new", :controller => 'messages', :action => 'new', :board_id => 'lala'
                 should_route :get, "/boards/lala/topics/22/edit", :controller => 'messages', :action => 'edit', :id => '22', :board_id => 'lala'
                 should_route :post, "/boards/lala/topics/new", :controller => 'messages', :action => 'new', :board_id => 'lala'
                 should_route :post, "/boards/lala/topics/22/edit", :controller => 'messages', :action => 'edit', :id => '22', :board_id => 'lala'
                 should_route :post, "/boards/22/topics/555/replies", :controller => 'messages', :action => 'reply', :id => '555', :board_id => '22'
                 should_route :post, "/boards/22/topics/555/destroy", :controller => 'messages', :action => 'destroy', :id => '555', :board_id => '22'
               end
               context "news" do
                 should_route :get, "/news", :controller => 'news', :action => 'index'
                 should_route :get, "/news.atom", :controller => 'news', :action => 'index', :format => 'atom'
                 should_route :get, "/news.xml", :controller => 'news', :action => 'index', :format => 'xml'
                 should_route :get, "/news.json", :controller => 'news', :action => 'index', :format => 'json'
                 should_route :get, "/projects/567/news", :controller => 'news', :action => 'index', :project_id => '567'
                 should_route :get, "/projects/567/news.atom", :controller => 'news', :action => 'index', :format => 'atom', :project_id => '567'
                 should_route :get, "/projects/567/news.xml", :controller => 'news', :action => 'index', :format => 'xml', :project_id => '567'
                 should_route :get, "/projects/567/news.json", :controller => 'news', :action => 'index', :format => 'json', :project_id => '567'
                 should_route :get, "/news/2", :controller => 'news', :action => 'show', :id => '2'
                 should_route :get, "/projects/567/news/new", :controller => 'news', :action => 'new', :project_id => '567'
                 should_route :get, "/news/234", :controller => 'news', :action => 'show', :id => '234'
                 should_route :get, "/news/567/edit", :controller => 'news', :action => 'edit', :id => '567'
                 should_route :get, "/news/preview", :controller => 'previews', :action => 'news'
                 should_route :post, "/projects/567/news", :controller => 'news', :action => 'create', :project_id => '567'
                 should_route :post, "/news/567/comments", :controller => 'comments', :action => 'create', :id => '567'
                 should_route :put, "/news/567", :controller => 'news', :action => 'update', :id => '567'
                 should_route :delete, "/news/567", :controller => 'news', :action => 'destroy', :id => '567'
                 should_route :delete, "/news/567/comments/15", :controller => 'comments', :action => 'destroy', :id => '567', :comment_id => '15'
               end
               context "projects" do
                 should_route :get, "/projects", :controller => 'projects', :action => 'index'
                 should_route :get, "/projects.atom", :controller => 'projects', :action => 'index', :format => 'atom'
                 should_route :get, "/projects.xml", :controller => 'projects', :action => 'index', :format => 'xml'
                 should_route :get, "/projects/new", :controller => 'projects', :action => 'new'
                 should_route :get, "/projects/test", :controller => 'projects', :action => 'show', :id => 'test'
                 should_route :get, "/projects/1.xml", :controller => 'projects', :action => 'show', :id => '1', :format => 'xml'
                 should_route :get, "/projects/4223/settings", :controller => 'projects', :action => 'settings', :id => '4223'
                 should_route :get, "/projects/4223/settings/members", :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
                 should_route :get, "/projects/33/files", :controller => 'files', :action => 'index', :project_id => '33'
                 should_route :get, "/projects/33/files/new", :controller => 'files', :action => 'new', :project_id => '33'
                 should_route :get, "/projects/33/roadmap", :controller => 'versions', :action => 'index', :project_id => '33'
                 should_route :get, "/projects/33/activity", :controller => 'activities', :action => 'index', :id => '33'
                 should_route :get, "/projects/33/activity.atom", :controller => 'activities', :action => 'index', :id => '33', :format => 'atom'
                 should_route :post, "/projects", :controller => 'projects', :action => 'create'
                 should_route :post, "/projects.xml", :controller => 'projects', :action => 'create', :format => 'xml'
                 should_route :post, "/projects/33/files", :controller => 'files', :action => 'create', :project_id => '33'
                 should_route :post, "/projects/64/archive", :controller => 'projects', :action => 'archive', :id => '64'
                 should_route :post, "/projects/64/unarchive", :controller => 'projects', :action => 'unarchive', :id => '64'
                 should_route :put, "/projects/64/enumerations", :controller => 'project_enumerations', :action => 'update', :project_id => '64'
                 should_route :put, "/projects/4223", :controller => 'projects', :action => 'update', :id => '4223'
                 should_route :put, "/projects/1.xml", :controller => 'projects', :action => 'update', :id => '1', :format => 'xml'
                 should_route :delete, "/projects/64", :controller => 'projects', :action => 'destroy', :id => '64'
                 should_route :delete, "/projects/1.xml", :controller => 'projects', :action => 'destroy', :id => '1', :format => 'xml'
                 should_route :delete, "/projects/64/enumerations", :controller => 'project_enumerations', :action => 'destroy', :project_id => '64'
               end
               context "queries" do
                 should_route :get, "/queries/new", :controller => 'queries', :action => 'new'
                 should_route :get, "/projects/redmine/queries/new", :controller => 'queries', :action => 'new', :project_id => 'redmine'
                 should_route :post, "/queries/new", :controller => 'queries', :action => 'new'
                 should_route :post, "/projects/redmine/queries/new", :controller => 'queries', :action => 'new', :project_id => 'redmine'
               end
               context "repositories" do
                 should_route :get, "/projects/redmine/repository", :controller => 'repositories', :action => 'show', :id => 'redmine'
                 should_route :get, "/projects/redmine/repository/edit", :controller => 'repositories', :action => 'edit', :id => 'redmine'
                 should_route :get, "/projects/redmine/repository/revisions", :controller => 'repositories', :action => 'revisions', :id => 'redmine'
                 should_route :get, "/projects/redmine/repository/revisions.atom", :controller => 'repositories', :action => 'revisions', :id => 'redmine', :format => 'atom'
                 should_route :get, "/projects/redmine/repository/revisions/2457", :controller => 'repositories', :action => 'revision', :id => 'redmine', :rev => '2457'
                 should_route :get, "/projects/redmine/repository/revisions/2457/diff", :controller => 'repositories', :action => 'diff', :id => 'redmine', :rev => '2457'
                 should_route :get, "/projects/redmine/repository/revisions/2457/diff.diff", :controller => 'repositories', :action => 'diff', :id => 'redmine', :rev => '2457', :format => 'diff'
                 should_route :get, "/projects/redmine/repository/diff/path/to/file.c", :controller => 'repositories', :action => 'diff', :id => 'redmine', :path => %w[path to file.c]
                 should_route :get, "/projects/redmine/repository/revisions/2/diff/path/to/file.c", :controller => 'repositories', :action => 'diff', :id => 'redmine', :path => %w[path to file.c], :rev => '2'
                 should_route :get, "/projects/redmine/repository/browse/path/to/file.c", :controller => 'repositories', :action => 'browse', :id => 'redmine', :path => %w[path to file.c]
                 should_route :get, "/projects/redmine/repository/entry/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c]
                 should_route :get, "/projects/redmine/repository/revisions/2/entry/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :rev => '2'
                 should_route :get, "/projects/redmine/repository/raw/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :format => 'raw'
                 should_route :get, "/projects/redmine/repository/revisions/2/raw/path/to/file.c", :controller => 'repositories', :action => 'entry', :id => 'redmine', :path => %w[path to file.c], :rev => '2', :format => 'raw'
                 should_route :get, "/projects/redmine/repository/annotate/path/to/file.c", :controller => 'repositories', :action => 'annotate', :id => 'redmine', :path => %w[path to file.c]
                 should_route :get, "/projects/redmine/repository/changes/path/to/file.c", :controller => 'repositories', :action => 'changes', :id => 'redmine', :path => %w[path to file.c]
                 should_route :get, "/projects/redmine/repository/statistics", :controller => 'repositories', :action => 'stats', :id => 'redmine'
                 should_route :post, "/projects/redmine/repository/edit", :controller => 'repositories', :action => 'edit', :id => 'redmine'
               end
               context "timelogs (global)" do
                 should_route :get, "/time_entries", :controller => 'timelog', :action => 'index'
                 should_route :get, "/time_entries.csv", :controller => 'timelog', :action => 'index', :format => 'csv'
                 should_route :get, "/time_entries.atom", :controller => 'timelog', :action => 'index', :format => 'atom'
                 should_route :get, "/time_entries/new", :controller => 'timelog', :action => 'new'
                 should_route :get, "/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22'
                 should_route :post, "/time_entries", :controller => 'timelog', :action => 'create'
                 should_route :put, "/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22'
                 should_route :delete, "/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55'
               end
               context "timelogs (scoped under project)" do
                 should_route :get, "/projects/567/time_entries", :controller => 'timelog', :action => 'index', :project_id => '567'
                 should_route :get, "/projects/567/time_entries.csv", :controller => 'timelog', :action => 'index', :project_id => '567', :format => 'csv'
                 should_route :get, "/projects/567/time_entries.atom", :controller => 'timelog', :action => 'index', :project_id => '567', :format => 'atom'
                 should_route :get, "/projects/567/time_entries/new", :controller => 'timelog', :action => 'new', :project_id => '567'
                 should_route :get, "/projects/567/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22', :project_id => '567'
                 should_route :post, "/projects/567/time_entries", :controller => 'timelog', :action => 'create', :project_id => '567'
                 should_route :put, "/projects/567/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :project_id => '567'
                 should_route :delete, "/projects/567/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :project_id => '567'
               end
               context "timelogs (scoped under issues)" do
                 should_route :get, "/issues/234/time_entries", :controller => 'timelog', :action => 'index', :issue_id => '234'
                 should_route :get, "/issues/234/time_entries.csv", :controller => 'timelog', :action => 'index', :issue_id => '234', :format => 'csv'
                 should_route :get, "/issues/234/time_entries.atom", :controller => 'timelog', :action => 'index', :issue_id => '234', :format => 'atom'
                 should_route :get, "/issues/234/time_entries/new", :controller => 'timelog', :action => 'new', :issue_id => '234'
                 should_route :get, "/issues/234/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22', :issue_id => '234'
                 should_route :post, "/issues/234/time_entries", :controller => 'timelog', :action => 'create', :issue_id => '234'
                 should_route :put, "/issues/234/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :issue_id => '234'
                 should_route :delete, "/issues/234/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :issue_id => '234'
               end
               context "timelogs (scoped under project and issues)" do
                 should_route :get, "/projects/ecookbook/issues/234/time_entries", :controller => 'timelog', :action => 'index', :issue_id => '234', :project_id => 'ecookbook'
                 should_route :get, "/projects/ecookbook/issues/234/time_entries.csv", :controller => 'timelog', :action => 'index', :issue_id => '234', :project_id => 'ecookbook', :format => 'csv'
                 should_route :get, "/projects/ecookbook/issues/234/time_entries.atom", :controller => 'timelog', :action => 'index', :issue_id => '234', :project_id => 'ecookbook', :format => 'atom'
                 should_route :get, "/projects/ecookbook/issues/234/time_entries/new", :controller => 'timelog', :action => 'new', :issue_id => '234', :project_id => 'ecookbook'
                 should_route :get, "/projects/ecookbook/issues/234/time_entries/22/edit", :controller => 'timelog', :action => 'edit', :id => '22', :issue_id => '234', :project_id => 'ecookbook'
                 should_route :post, "/projects/ecookbook/issues/234/time_entries", :controller => 'timelog', :action => 'create', :issue_id => '234', :project_id => 'ecookbook'
                 should_route :put, "/projects/ecookbook/issues/234/time_entries/22", :controller => 'timelog', :action => 'update', :id => '22', :issue_id => '234', :project_id => 'ecookbook'
                 should_route :delete, "/projects/ecookbook/issues/234/time_entries/55", :controller => 'timelog', :action => 'destroy', :id => '55', :issue_id => '234', :project_id => 'ecookbook'
               end
               context "time_entry_reports" do
                 should_route :get, "/time_entries/report", :controller => 'time_entry_reports', :action => 'report'
                 should_route :get, "/projects/567/time_entries/report", :controller => 'time_entry_reports', :action => 'report', :project_id => '567'
                 should_route :get, "/projects/567/time_entries/report.csv", :controller => 'time_entry_reports', :action => 'report', :project_id => '567', :format => 'csv'
               end
               context "users" do
                 should_route :get, "/users", :controller => 'users', :action => 'index'
                 should_route :get, "/users.xml", :controller => 'users', :action => 'index', :format => 'xml'
                 should_route :get, "/users/44", :controller => 'users', :action => 'show', :id => '44'
                 should_route :get, "/users/44.xml", :controller => 'users', :action => 'show', :id => '44', :format => 'xml'
                 should_route :get, "/users/current", :controller => 'users', :action => 'show', :id => 'current'
                 should_route :get, "/users/current.xml", :controller => 'users', :action => 'show', :id => 'current', :format => 'xml'
                 should_route :get, "/users/new", :controller => 'users', :action => 'new'
                 should_route :get, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
                 should_route :get, "/users/222/edit/membership", :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'
                 should_route :post, "/users", :controller => 'users', :action => 'create'
                 should_route :post, "/users.xml", :controller => 'users', :action => 'create', :format => 'xml'
                 should_route :post, "/users/123/memberships", :controller => 'users', :action => 'edit_membership', :id => '123'
                 should_route :post, "/users/123/memberships/55", :controller => 'users', :action => 'edit_membership', :id => '123', :membership_id => '55'
                 should_route :post, "/users/567/memberships/12/destroy", :controller => 'users', :action => 'destroy_membership', :id => '567', :membership_id => '12'
                 should_route :put, "/users/444", :controller => 'users', :action => 'update', :id => '444'
                 should_route :put, "/users/444.xml", :controller => 'users', :action => 'update', :id => '444', :format => 'xml'
                 should_route :delete, "/users/44", :controller => 'users', :action => 'destroy', :id => '44'
                 should_route :delete, "/users/44.xml", :controller => 'users', :action => 'destroy', :id => '44', :format => 'xml'
               end
               # TODO: should they all be scoped under /projects/:project_id ?
               context "versions" do
                 should_route :get, "/projects/foo/versions/new", :controller => 'versions', :action => 'new', :project_id => 'foo'
                 should_route :get, "/versions/show/1", :controller => 'versions', :action => 'show', :id => '1'
                 should_route :get, "/versions/edit/1", :controller => 'versions', :action => 'edit', :id => '1'
                 should_route :post, "/projects/foo/versions", :controller => 'versions', :action => 'create', :project_id => 'foo'
                 should_route :post, "/versions/update/1", :controller => 'versions', :action => 'update', :id => '1'
                 should_route :delete, "/versions/destroy/1", :controller => 'versions', :action => 'destroy', :id => '1'
               end
               context "wiki (singular, project's pages)" do
                 should_route :get, "/projects/567/wiki", :controller => 'wiki', :action => 'show', :project_id => '567'
                 should_route :get, "/projects/567/wiki/lalala", :controller => 'wiki', :action => 'show', :project_id => '567', :id => 'lalala'
                 should_route :get, "/projects/567/wiki/my_page/edit", :controller => 'wiki', :action => 'edit', :project_id => '567', :id => 'my_page'
                 should_route :get, "/projects/1/wiki/CookBook_documentation/history", :controller => 'wiki', :action => 'history', :project_id => '1', :id => 'CookBook_documentation'
                 should_route :get, "/projects/1/wiki/CookBook_documentation/diff", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation'
                 should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation', :version => '2'
                 should_route :get, "/projects/1/wiki/CookBook_documentation/diff/2/vs/1", :controller => 'wiki', :action => 'diff', :project_id => '1', :id => 'CookBook_documentation', :version => '2', :version_from => '1'
                 should_route :get, "/projects/1/wiki/CookBook_documentation/annotate/2", :controller => 'wiki', :action => 'annotate', :project_id => '1', :id => 'CookBook_documentation', :version => '2'
                 should_route :get, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
                 should_route :get, "/projects/567/wiki/index", :controller => 'wiki', :action => 'index', :project_id => '567'
                 should_route :get, "/projects/567/wiki/date_index", :controller => 'wiki', :action => 'date_index', :project_id => '567'
                 should_route :get, "/projects/567/wiki/export", :controller => 'wiki', :action => 'export', :project_id => '567'
                 should_route :post, "/projects/567/wiki/CookBook_documentation/preview", :controller => 'wiki', :action => 'preview', :project_id => '567', :id => 'CookBook_documentation'
                 should_route :post, "/projects/22/wiki/ladida/rename", :controller => 'wiki', :action => 'rename', :project_id => '22', :id => 'ladida'
                 should_route :post, "/projects/22/wiki/ladida/protect", :controller => 'wiki', :action => 'protect', :project_id => '22', :id => 'ladida'
                 should_route :post, "/projects/22/wiki/ladida/add_attachment", :controller => 'wiki', :action => 'add_attachment', :project_id => '22', :id => 'ladida'
                 should_route :put, "/projects/567/wiki/my_page", :controller => 'wiki', :action => 'update', :project_id => '567', :id => 'my_page'
                 should_route :delete, "/projects/22/wiki/ladida", :controller => 'wiki', :action => 'destroy', :project_id => '22', :id => 'ladida'
               end
               context "wikis (plural, admin setup)" do
                 should_route :get, "/projects/ladida/wiki/destroy", :controller => 'wikis', :action => 'destroy', :id => 'ladida'
                 should_route :post, "/projects/ladida/wiki", :controller => 'wikis', :action => 'edit', :id => 'ladida'
                 should_route :post, "/projects/ladida/wiki/destroy", :controller => 'wikis', :action => 'destroy', :id => 'ladida'
               end
               context "administration panel" do
                 should_route :get, "/admin/projects", :controller => 'admin', :action => 'projects'
               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