diff options
| -rw-r--r-- | app/views/versions/_form.html.erb | 4 | ||||
| -rw-r--r-- | test/functional/versions_controller_test.rb | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index 3d8ecd4da..e723a4e2e 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -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> diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb index 48cf6e641..d794cf3e4 100644 --- a/test/functional/versions_controller_test.rb +++ b/test/functional/versions_controller_test.rb @@ -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") |