summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 17:54:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-19 17:54:26 +0000
commit5b6732cfaf8b71edbbb3e8152f2f8ba80beb0d5a (patch)
tree8530c2586ae29f1233ae2817589ec4c3eed97f07 /app
parentb53f9c688b4a56e868f34609a0f2ddc4199b3491 (diff)
downloadredmine-5b6732cfaf8b71edbbb3e8152f2f8ba80beb0d5a.tar.gz
redmine-5b6732cfaf8b71edbbb3e8152f2f8ba80beb0d5a.zip
Removes RJS from IssuesController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10050 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/issues_controller.rb8
-rw-r--r--app/views/issues/_update_form.js.erb9
2 files changed, 10 insertions, 7 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 246140f45..e7fdb6886 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -127,13 +127,7 @@ class IssuesController < ApplicationController
def new
respond_to do |format|
format.html { render :action => 'new', :layout => !request.xhr? }
- format.js {
- render(:update) { |page|
- page.replace_html 'all_attributes', :partial => 'form'
- m = User.current.allowed_to?(:log_time, @issue.project) ? 'show' : 'hide'
- page << "if ($('log_time')) {Element.#{m}('log_time');}"
- }
- }
+ format.js { render :partial => 'update_form' }
end
end
diff --git a/app/views/issues/_update_form.js.erb b/app/views/issues/_update_form.js.erb
new file mode 100644
index 000000000..89429fc20
--- /dev/null
+++ b/app/views/issues/_update_form.js.erb
@@ -0,0 +1,9 @@
+Element.update('all_attributes', '<%= escape_javascript(render :partial => 'form') %>');
+
+if ($('log_time')) {
+ <% if User.current.allowed_to?(:log_time, @issue.project) %>
+ Element.show('log_time');
+ <% else %>
+ Element.hide('log_time');
+ <% end %>
+}