Removes RJS from IssuesController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10050 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
b53f9c688b
commit
5b6732cfaf
|
@ -127,13 +127,7 @@ class IssuesController < ApplicationController
|
||||||
def new
|
def new
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { render :action => 'new', :layout => !request.xhr? }
|
format.html { render :action => 'new', :layout => !request.xhr? }
|
||||||
format.js {
|
format.js { render :partial => 'update_form' }
|
||||||
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');}"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -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 %>
|
||||||
|
}
|
|
@ -1525,7 +1525,9 @@ class IssuesControllerTest < ActionController::TestCase
|
||||||
:description => 'This is the description',
|
:description => 'This is the description',
|
||||||
:priority_id => 5}
|
:priority_id => 5}
|
||||||
assert_response :success
|
assert_response :success
|
||||||
|
assert_template 'update_form'
|
||||||
assert_template 'form'
|
assert_template 'form'
|
||||||
|
assert_equal 'text/javascript', response.content_type
|
||||||
|
|
||||||
issue = assigns(:issue)
|
issue = assigns(:issue)
|
||||||
assert_kind_of Issue, issue
|
assert_kind_of Issue, issue
|
||||||
|
@ -2400,6 +2402,8 @@ class IssuesControllerTest < ActionController::TestCase
|
||||||
:description => 'This is the description',
|
:description => 'This is the description',
|
||||||
:priority_id => 5}
|
:priority_id => 5}
|
||||||
assert_response :success
|
assert_response :success
|
||||||
|
assert_equal 'text/javascript', response.content_type
|
||||||
|
assert_template 'update_form'
|
||||||
assert_template 'form'
|
assert_template 'form'
|
||||||
|
|
||||||
issue = assigns(:issue)
|
issue = assigns(:issue)
|
||||||
|
|
Loading…
Reference in New Issue