summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 17:27:14 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 17:27:14 +0000
commit87da04c808e20d47ced23fa758512d5367a076b7 (patch)
tree214e1f1dc663b6fae72e169c97c3cf5a0f716059 /app
parent38060a2cf0132a702c91adf60f344ad28c4e8e00 (diff)
downloadredmine-87da04c808e20d47ced23fa758512d5367a076b7.tar.gz
redmine-87da04c808e20d47ced23fa758512d5367a076b7.zip
Removes RJS from RepositoriesController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10048 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/repositories_controller.rb25
-rw-r--r--app/views/repositories/add_related_issue.js.erb6
-rw-r--r--app/views/repositories/remove_related_issue.js.erb1
3 files changed, 7 insertions, 25 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index b315a200a..e6a76fbc3 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -236,22 +236,6 @@ class RepositoriesController < ApplicationController
if @issue
@changeset.issues << @issue
- respond_to do |format|
- format.js {
- render :update do |page|
- page.replace_html "related-issues", :partial => "related_issues"
- page.visual_effect :highlight, "related-issue-#{@issue.id}"
- end
- }
- end
- else
- respond_to do |format|
- format.js {
- render :update do |page|
- page.alert(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid'))
- end
- }
- end
end
end
@@ -262,14 +246,6 @@ class RepositoriesController < ApplicationController
if @issue
@changeset.issues.delete(@issue)
end
-
- respond_to do |format|
- format.js {
- render :update do |page|
- page.remove "related-issue-#{@issue.id}"
- end if @issue
- }
- end
end
def diff
@@ -456,4 +432,3 @@ class RepositoriesController < ApplicationController
graph.burn
end
end
-
diff --git a/app/views/repositories/add_related_issue.js.erb b/app/views/repositories/add_related_issue.js.erb
new file mode 100644
index 000000000..66740af7f
--- /dev/null
+++ b/app/views/repositories/add_related_issue.js.erb
@@ -0,0 +1,6 @@
+<% if @issue %>
+ Element.update('related-issues', '<%= escape_javascript(render :partial => "related_issues") %>');
+ Effect.highlight('related-issue-<%= @issue.id %>');
+<% else %>
+ alert("<%= escape_javascript(l(:label_issue) + ' ' + l('activerecord.errors.messages.invalid')) %>");
+<% end %>
diff --git a/app/views/repositories/remove_related_issue.js.erb b/app/views/repositories/remove_related_issue.js.erb
new file mode 100644
index 000000000..6fb62cdee
--- /dev/null
+++ b/app/views/repositories/remove_related_issue.js.erb
@@ -0,0 +1 @@
+Element.remove('related-issue-<%= @issue.id %>');