##// END OF EJS Templates
Don't show "status" field when creating a new version (#23377)....
Jean-Philippe Lang -
r15402:26f0e0dfb1e5
parent child
Show More
@@ -4,7 +4,9
4 <div class="box tabular">
4 <div class="box tabular">
5 <p><%= f.text_field :name, :size => 60, :required => true %></p>
5 <p><%= f.text_field :name, :size => 60, :required => true %></p>
6 <p><%= f.text_field :description, :size => 60 %></p>
6 <p><%= f.text_field :description, :size => 60 %></p>
7 <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
7 <% unless @version.new_record? %>
8 <p><%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %></p>
9 <% end %>
8 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
10 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
9 <p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
11 <p><%= f.date_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
10 <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
12 <p><%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %></p>
@@ -128,6 +128,7 class VersionsControllerTest < Redmine::ControllerTest
128 get :new, :params => {:project_id => '1'}
128 get :new, :params => {:project_id => '1'}
129 assert_response :success
129 assert_response :success
130 assert_select 'input[name=?]', 'version[name]'
130 assert_select 'input[name=?]', 'version[name]'
131 assert_select 'select[name=?]', 'version[status]', false
131 end
132 end
132
133
133 def test_new_from_issue_form
134 def test_new_from_issue_form
@@ -175,7 +176,12 class VersionsControllerTest < Redmine::ControllerTest
175 @request.session[:user_id] = 2
176 @request.session[:user_id] = 2
176 get :edit, :params => {:id => 2}
177 get :edit, :params => {:id => 2}
177 assert_response :success
178 assert_response :success
178 assert_select 'input[name=?][value=?]', 'version[name]', Version.find(2).name
179 version = Version.find(2)
180
181 assert_select 'select[name=?]', 'version[status]' do
182 assert_select 'option[value=?][selected="selected"]', version.status
183 end
184 assert_select 'input[name=?][value=?]', 'version[name]', version.name
179 end
185 end
180
186
181 def test_close_completed
187 def test_close_completed
@@ -190,7 +196,7 class VersionsControllerTest < Redmine::ControllerTest
190 def test_post_update
196 def test_post_update
191 @request.session[:user_id] = 2
197 @request.session[:user_id] = 2
192 put :update, :params => {
198 put :update, :params => {
193 :id => 2,
199 :id => 2,
194 :version => {
200 :version => {
195 :name => 'New version name',
201 :name => 'New version name',
196 :effective_date => Date.today.strftime("%Y-%m-%d")
202 :effective_date => Date.today.strftime("%Y-%m-%d")
General Comments 0
You need to be logged in to leave comments. Login now