summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 18:13:21 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 18:13:21 +0000
commit3386008491aff7d8a3e10d4d7fa84108ce5a8a38 (patch)
tree5c075549065a550f31bc353c0906cdc8e1bf59f2
parentdee586e9eb9674ebb969243be8c4f31024a8aece (diff)
downloadredmine-3386008491aff7d8a3e10d4d7fa84108ce5a8a38.tar.gz
redmine-3386008491aff7d8a3e10d4d7fa84108ce5a8a38.zip
Removes RJS from VersionsController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10052 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/versions_controller.rb2
-rw-r--r--app/views/versions/status_by.js.erb1
-rw-r--r--test/functional/versions_controller_test.rb4
3 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 8b9c0acd3..00683cf34 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -165,7 +165,7 @@ class VersionsController < ApplicationController
def status_by
respond_to do |format|
format.html { render :action => 'show' }
- format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
+ format.js
end
end
diff --git a/app/views/versions/status_by.js.erb b/app/views/versions/status_by.js.erb
new file mode 100644
index 000000000..e3a667a89
--- /dev/null
+++ b/app/views/versions/status_by.js.erb
@@ -0,0 +1 @@
+Element.update('status_by', '<%= escape_javascript(render_issue_status_by(@version, params[:status_by])) %>');
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 66e4864c1..449c097e3 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -196,12 +196,16 @@ class VersionsControllerTest < ActionController::TestCase
def test_issue_status_by
xhr :get, :status_by, :id => 2
assert_response :success
+ assert_template 'status_by'
assert_template '_issue_counts'
end
def test_issue_status_by_status
xhr :get, :status_by, :id => 2, :status_by => 'status'
assert_response :success
+ assert_template 'status_by'
assert_template '_issue_counts'
+ assert_include 'Assigned', response.body
+ assert_include 'Closed', response.body
end
end