jro_apps/redmine Commit - r8725:60b9e59d1580

Displays the full form when creating a version from the issue form so that required custom fields can be filled (#7398)....

Jean-Philippe Lang -

r8725:60b9e59d1580

parent child

Context file:

r8725:60b9e59d1580

Collapse all files

app/views/versions/_new_modal.html.erb created 644 +9 0

@@ -0,0 +1,9
	1	<h3 class="title"><%=l(:label_version_new)%></h3>
	2
	3	<% labelled_remote_form_for @version, :url => project_versions_path(@project) do \|f\| %>
	4	<%= render :partial => 'versions/form', :locals => { :f => f } %>
	5	<p class="buttons">
	6	<%= submit_tag l(:button_create), :name => nil %>
	7	<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
	8	</p>
	9	<% end %>

app/controllers/versions_controller.rb +20 -4

               def new
                 @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
               def create
                         redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
                       end
                       format.js do
-                        # IE doesn't support the replace_html rjs method for select box options
+                        render(:update) {|page|
-                        render(:update) {|page| page.replace "issue_fixed_version_id",
+                          page << 'hideModal();'
-                          content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
+                          # 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
                       format.api do
                     respond_to do |format|
                       format.html { render :action => 'new' }
                       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
                       format.api  { render_validation_errors(@version) }
                     end

app/views/issues/_attributes.html.erb +4 -6

             <% 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 %>
-            <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
+            <%= link_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
-                                 l(:label_version_new),
+                               {:url => new_project_version_path(@issue.project), :method => 'get'},
-                                 'version[name]',
+                               :title => l(:label_version_new),
-                                 {:controller => 'versions', :action => 'create', :project_id => @issue.project},
+                               :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
-                                 :title => l(:label_version_new),
-                                 :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
             </p>
             <% end %>
             </div>

public/javascripts/application.js +6 -1

             }
             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) {
                 modal.hide();
               }

test/functional/versions_controller_test.rb +27 -3

@@ -96,6 +96,16 class VersionsControllerTest < ActionController::TestCase
96	assert_template 'new'	96	assert_template 'new'
97	end	97	end
98		98
		99	def test_new_from_issue_form
		100	@request.session[:user_id] = 2
		101	xhr :get, :new, :project_id => '1'
		102	assert_response :success
		103	assert_select_rjs :replace_html, "ajax-modal" do
		104	assert_select "form[action=/projects/ecookbook/versions]"
		105	assert_select "input#version_name"
		106	end
		107	end
		108
99	def test_create	109	def test_create
100	@request.session[:user_id] = 2 # manager	110	@request.session[:user_id] = 2 # manager
101	assert_difference 'Version.count' do	111	assert_difference 'Version.count' do
@@ -108,15 +118,29 class VersionsControllerTest < ActionController::TestCase
108	end	118	end
109		119
110	def test_create_from_issue_form	120	def test_create_from_issue_form
111	@request.session[:user_id] = 2 ~~# manager~~	121	@request.session[:user_id] = 2
112	assert_difference 'Version.count' do	122	assert_difference 'Version.count' do
113	xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}	123	xhr :post, :create, :project_id => '1', :version => {:name => 'test_add_version_from_issue_form'}
114	end	124	end
115	assert_response :success
116	assert_select_rjs :replace, 'issue_fixed_version_id'
117	version = Version.find_by_name('test_add_version_from_issue_form')	125	version = Version.find_by_name('test_add_version_from_issue_form')
118	assert_not_nil version	126	assert_not_nil version
119	assert_equal 1, version.project_id	127	assert_equal 1, version.project_id
		128
		129	assert_response :success
		130	assert_select_rjs :replace, 'issue_fixed_version_id' do
		131	assert_select "option[value=#{version.id}][selected=selected]"
		132	end
		133	end
		134
		135	def test_create_from_issue_form_with_failure
		136	@request.session[:user_id] = 2
		137	assert_no_difference 'Version.count' do
		138	xhr :post, :create, :project_id => '1', :version => {:name => ''}
		139	end
		140	assert_response :success
		141	assert_select_rjs :replace_html, "ajax-modal" do
		142	assert_select "div#errorExplanation"
		143	end
120	end	144	end
121		145
122	def test_get_edit	146	def test_get_edit

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages