summaryrefslogtreecommitdiffstats
path: root/app/controllers/versions_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 16:43:33 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 16:43:33 +0000
commit035805fbd04286bff0965b588b7c7dbef6652c63 (patch)
tree61fcc55e4d595f2d255ca8e71e31d57b4d5b1d9d /app/controllers/versions_controller.rb
parent51d5a5202942dbbe8e39c51b9d4d53210da490c1 (diff)
downloadredmine-035805fbd04286bff0965b588b7c7dbef6652c63.tar.gz
redmine-035805fbd04286bff0965b588b7c7dbef6652c63.zip
Start removing the RJS stuff.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10043 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/versions_controller.rb')
-rw-r--r--app/controllers/versions_controller.rb24
1 files changed, 3 insertions, 21 deletions
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index dcee97c85..8b9c0acd3 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -78,13 +78,7 @@ class VersionsController < ApplicationController
respond_to do |format|
format.html
- format.js do
- render :update do |page|
- page.replace_html 'ajax-modal', :partial => 'versions/new_modal'
- page << "showModal('ajax-modal', '600px');"
- page << "Form.Element.focus('version_name');"
- end
- end
+ format.js
end
end
@@ -103,14 +97,7 @@ class VersionsController < ApplicationController
flash[:notice] = l(:notice_successful_create)
redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
end
- format.js do
- render(:update) {|page|
- page << 'hideModal();'
- # IE doesn't support the replace_html rjs method for select box options
- page.replace "issue_fixed_version_id",
- content_tag('select', content_tag('option') + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
- }
- end
+ format.js
format.api do
render :action => 'show', :status => :created, :location => version_url(@version)
end
@@ -118,12 +105,7 @@ class VersionsController < ApplicationController
else
respond_to do |format|
format.html { render :action => 'new' }
- format.js do
- render :update do |page|
- page.replace_html 'ajax-modal', :partial => 'versions/new_modal'
- page << "Form.Element.focus('version_name');"
- end
- end
+ format.js { render :action => 'new' }
format.api { render_validation_errors(@version) }
end
end