Selaa lähdekoodia

Don't show "status" field when creating a new version (#23377).

git-svn-id: http://svn.redmine.org/redmine/trunk@15784 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 vuotta sitten
vanhempi
commit
26f0e0dfb1

+ 3
- 1
app/views/versions/_form.html.erb Näytä tiedosto

@@ -4,7 +4,9 @@
<div class="box tabular">
<p><%= f.text_field :name, :size => 60, :required => true %></p>
<p><%= f.text_field :description, :size => 60 %></p>
<p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
<% unless @version.new_record? %>
<p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
<% end %>
<p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
<p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
<p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>

+ 8
- 2
test/functional/versions_controller_test.rb Näytä tiedosto

@@ -128,6 +128,7 @@ class VersionsControllerTest < Redmine::ControllerTest
get :new, :params => {:project_id => '1'}
assert_response :success
assert_select 'input[name=?]', 'version[name]'
assert_select 'select[name=?]', 'version[status]', false
end

def test_new_from_issue_form
@@ -175,7 +176,12 @@ class VersionsControllerTest < Redmine::ControllerTest
@request.session[:user_id] = 2
get :edit, :params => {:id => 2}
assert_response :success
assert_select 'input[name=?][value=?]', 'version[name]', Version.find(2).name
version = Version.find(2)

assert_select 'select[name=?]', 'version[status]' do
assert_select 'option[value=?][selected="selected"]', version.status
end
assert_select 'input[name=?][value=?]', 'version[name]', version.name
end

def test_close_completed
@@ -190,7 +196,7 @@ class VersionsControllerTest < Redmine::ControllerTest
def test_post_update
@request.session[:user_id] = 2
put :update, :params => {
:id => 2,
:id => 2,
:version => {
:name => 'New version name',
:effective_date => Date.today.strftime("%Y-%m-%d")

Loading…
Peruuta
Tallenna