summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 17:06:30 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 17:06:30 +0000
commit85531070161564e6a99bdf518e17486482fa1bdb (patch)
tree3a2793dce2b0ea0463bd4a12773c7015479480e1 /app
parent21ee2e2cf246550436b22d5d32698d87839cad6c (diff)
downloadredmine-85531070161564e6a99bdf518e17486482fa1bdb.tar.gz
redmine-85531070161564e6a99bdf518e17486482fa1bdb.zip
Removes RJS from IssueRelationsController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10045 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/issue_relations_controller.rb13
-rw-r--r--app/views/issue_relations/create.js.erb5
-rw-r--r--app/views/issue_relations/destroy.js.erb1
3 files changed, 9 insertions, 10 deletions
diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb
index 0de78c366..2f1165cad 100644
--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -49,16 +49,9 @@ class IssueRelationsController < ApplicationController
respond_to do |format|
format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
- format.js do
+ format.js {
@relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
- render :update do |page|
- page.replace_html "relations", :partial => 'issues/relations'
- if @relation.errors.empty?
- page << "$('relation_delay').value = ''"
- page << "$('relation_issue_to_id').value = ''"
- end
- end
- end
+ }
format.api {
if saved
render :action => 'show', :status => :created, :location => relation_url(@relation)
@@ -75,7 +68,7 @@ class IssueRelationsController < ApplicationController
respond_to do |format|
format.html { redirect_to issue_path } # TODO : does this really work since @issue is always nil? What is it useful to?
- format.js { render(:update) {|page| page.remove "relation-#{@relation.id}"} }
+ format.js
format.api { render_api_ok }
end
end
diff --git a/app/views/issue_relations/create.js.erb b/app/views/issue_relations/create.js.erb
new file mode 100644
index 000000000..a2446ab7f
--- /dev/null
+++ b/app/views/issue_relations/create.js.erb
@@ -0,0 +1,5 @@
+Element.update('relations', '<%= escape_javascript(render :partial => 'issues/relations') %>');
+<% if @relation.errors.empty? %>
+ $('relation_delay').value = ''
+ $('relation_issue_to_id').value = ''
+<% end %>
diff --git a/app/views/issue_relations/destroy.js.erb b/app/views/issue_relations/destroy.js.erb
new file mode 100644
index 000000000..f3a03d18f
--- /dev/null
+++ b/app/views/issue_relations/destroy.js.erb
@@ -0,0 +1 @@
+Element.remove('<%= "relation-#{@relation.id}" %>');