Adds a 'Create and continue' button on project form.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6303 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
ed23149a6c
commit
f595197ecf
|
@ -87,7 +87,10 @@ class ProjectsController < ApplicationController
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html {
|
format.html {
|
||||||
flash[:notice] = l(:notice_successful_create)
|
flash[:notice] = l(:notice_successful_create)
|
||||||
redirect_to :controller => 'projects', :action => 'settings', :id => @project
|
redirect_to(params[:continue] ?
|
||||||
|
{:controller => 'projects', :action => 'new', :project => {:parent_id => @project.parent_id}.reject {|k,v| v.nil?}} :
|
||||||
|
{:controller => 'projects', :action => 'settings', :id => @project}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
|
format.api { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => @project.id) }
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
<% labelled_tabular_form_for :project, @project, :url => { :action => "create" } do |f| %>
|
<% labelled_tabular_form_for :project, @project, :url => { :action => "create" } do |f| %>
|
||||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||||
<%= submit_tag l(:button_save) %>
|
<%= submit_tag l(:button_create) %>
|
||||||
|
<%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
|
||||||
<%= javascript_tag "Form.Element.focus('project_name');" %>
|
<%= javascript_tag "Form.Element.focus('project_name');" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -186,6 +186,13 @@ class ProjectsControllerTest < ActionController::TestCase
|
||||||
assert_kind_of Project, project
|
assert_kind_of Project, project
|
||||||
assert_equal Project.find(1), project.parent
|
assert_equal Project.find(1), project.parent
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "continue" do
|
||||||
|
assert_difference 'Project.count' do
|
||||||
|
post :create, :project => {:name => "blog", :identifier => "blog"}, :continue => 'Create and continue'
|
||||||
|
end
|
||||||
|
assert_redirected_to '/projects/new?'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "by non-admin user with add_project permission" do
|
context "by non-admin user with add_project permission" do
|
||||||
|
|
Loading…
Reference in New Issue