comparison app/controllers/issue_relations_controller.rb @ 1295:622f24f53b42 redmine-2.3

Update to Redmine SVN revision 11972 on 2.3-stable branch
author Chris Cannam
date Fri, 14 Jun 2013 09:02:21 +0100
parents 433d4f72a19b
children e248c7af89ec
comparison
equal deleted inserted replaced
1294:3e4c3460b6ca 1295:622f24f53b42
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
46 @relation.issue_to = Issue.visible.find_by_id(m[1].to_i) 46 @relation.issue_to = Issue.visible.find_by_id(m[1].to_i)
47 end 47 end
48 saved = @relation.save 48 saved = @relation.save
49 49
50 respond_to do |format| 50 respond_to do |format|
51 format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue } 51 format.html { redirect_to issue_path(@issue) }
52 format.js { 52 format.js {
53 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? } 53 @relations = @issue.reload.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
54 } 54 }
55 format.api { 55 format.api {
56 if saved 56 if saved
57 render :action => 'show', :status => :created, :location => relation_url(@relation) 57 render :action => 'show', :status => :created, :location => relation_url(@relation)
58 else 58 else
65 def destroy 65 def destroy
66 raise Unauthorized unless @relation.deletable? 66 raise Unauthorized unless @relation.deletable?
67 @relation.destroy 67 @relation.destroy
68 68
69 respond_to do |format| 69 respond_to do |format|
70 format.html { redirect_to issue_path } # TODO : does this really work since @issue is always nil? What is it useful to? 70 format.html { redirect_to issue_path(@relation.issue_from) }
71 format.js 71 format.js
72 format.api { render_api_ok } 72 format.api { render_api_ok }
73 end 73 end
74 end 74 end
75 75