git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8845 e93f8b46-1217-0410-a6f0-8f06a7374b81tags/1.4.0
def new | def new | ||||
@version = @project.versions.build(params[:version]) | @version = @project.versions.build(params[:version]) | ||||
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 | |||||
end | |||||
end | end | ||||
def create | def create | ||||
redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project | redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project | ||||
end | end | ||||
format.js do | format.js do | ||||
# IE doesn't support the replace_html rjs method for select box options | |||||
render(:update) {|page| page.replace "issue_fixed_version_id", | |||||
content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]') | |||||
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', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]') | |||||
} | } | ||||
end | end | ||||
format.api do | format.api do | ||||
respond_to do |format| | respond_to do |format| | ||||
format.html { render :action => 'new' } | format.html { render :action => 'new' } | ||||
format.js do | format.js do | ||||
render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) } | |||||
render :update do |page| | |||||
page.replace_html 'ajax-modal', :partial => 'versions/new_modal' | |||||
page << "Form.Element.focus('version_name');" | |||||
end | |||||
end | end | ||||
format.api { render_validation_errors(@version) } | format.api { render_validation_errors(@version) } | ||||
end | end |
<% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> | <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> | ||||
<p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %> | <p><%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), :include_blank => true %> | ||||
<%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), | |||||
l(:label_version_new), | |||||
'version[name]', | |||||
{:controller => 'versions', :action => 'create', :project_id => @issue.project}, | |||||
:title => l(:label_version_new), | |||||
:tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %> | |||||
<%= link_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'), | |||||
{:url => new_project_version_path(@issue.project), :method => 'get'}, | |||||
:title => l(:label_version_new), | |||||
:tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %> | |||||
</p> | </p> | ||||
<% end %> | <% end %> | ||||
</div> | </div> |
<h3 class="title"><%=l(:label_version_new)%></h3> | |||||
<% labelled_remote_form_for @version, :url => project_versions_path(@project) do |f| %> | |||||
<%= render :partial => 'versions/form', :locals => { :f => f } %> | |||||
<p class="buttons"> | |||||
<%= submit_tag l(:button_create), :name => nil %> | |||||
<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %> | |||||
</p> | |||||
<% end %> |
} | } | ||||
function hideModal(el) { | function hideModal(el) { | ||||
var modal = Element.up(el, 'div.modal'); | |||||
var modal; | |||||
if (el) { | |||||
modal = Element.up(el, 'div.modal'); | |||||
} else { | |||||
modal = $('ajax-modal'); | |||||
} | |||||
if (modal) { | if (modal) { | ||||
modal.hide(); | modal.hide(); | ||||
} | } |
assert_template 'new' | assert_template 'new' | ||||
end | end | ||||
def test_new_from_issue_form | |||||
@request.session[:user_id] = 2 | |||||
xhr :get, :new, :project_id => '1' | |||||
assert_response :success | |||||
assert_select_rjs :replace_html, "ajax-modal" do | |||||
assert_select "form[action=/projects/ecookbook/versions]" | |||||
assert_select "input#version_name" | |||||
end | |||||
end | |||||
def test_create | def test_create | ||||
@request.session[:user_id] = 2 # manager | @request.session[:user_id] = 2 # manager | ||||
assert_difference 'Version.count' do | assert_difference 'Version.count' do | ||||
end | end | ||||
def test_create_from_issue_form | def test_create_from_issue_form | ||||
@request.session[:user_id] = 2 # manager | |||||
@request.session[:user_id] = 2 | |||||
assert_difference 'Version.count' do | assert_difference 'Version.count' do | ||||
xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'} | xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'} | ||||
end | end | ||||
assert_response :success | |||||
assert_select_rjs :replace, 'issue_fixed_version_id' | |||||
version = Version.find_by_name('test_add_version_from_issue_form') | version = Version.find_by_name('test_add_version_from_issue_form') | ||||
assert_not_nil version | assert_not_nil version | ||||
assert_equal 1, version.project_id | assert_equal 1, version.project_id | ||||
assert_response :success | |||||
assert_select_rjs :replace, 'issue_fixed_version_id' do | |||||
assert_select "option[value=#{version.id}][selected=selected]" | |||||
end | |||||
end | |||||
def test_create_from_issue_form_with_failure | |||||
@request.session[:user_id] = 2 | |||||
assert_no_difference 'Version.count' do | |||||
xhr :post, :create, :project_id => '1', :version => {:name => ''} | |||||
end | |||||
assert_response :success | |||||
assert_select_rjs :replace_html, "ajax-modal" do | |||||
assert_select "div#errorExplanation" | |||||
end | |||||
end | end | ||||
def test_get_edit | def test_get_edit |