jro_apps/redmine Commit - r2135:7cea286c2344

Fixes repository user mapping submission when a repository username is blank (#2339, Conflicting types for parameter containers)....

Jean-Philippe Lang -

r2135:7cea286c2344

parent child

Context file:

r2135:7cea286c2344

Collapse all files

app/controllers/repositories_controller.rb +3 -2

                 @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
                 @users.compact!
                 @users.sort!
-                if request.post?
+                if request.post? && params[:committers].is_a?(Hash)
-                  @repository.committer_ids = params[:committers]
+                  # Build a hash with repository usernames as keys and corresponding user ids as values
+                  @repository.committer_ids = params[:committers].values.inject({}) {|h, c| h[c.first] = c.last; h}
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'committers', :id => @project
                 end

app/views/repositories/committers.rhtml +6 -1

             	</tr>
             </thead>
             <tbody>
+            <% i = 0 -%>
             <% @committers.each do |committer, user_id| -%>
             	<tr class="<%= cycle 'odd', 'even' %>">
             		<td><%=h committer %></td>
-            		<td><%= select_tag "committers[#{committer}]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %></td>
+            		<td>
+            			<%= hidden_field_tag "committers[#{i}][]", committer %>
+            			<%= select_tag "committers[#{i}][]", content_tag('option', "-- #{l :actionview_instancetag_blank_option} --", :value => '') + options_from_collection_for_select(@users, 'id', 'name', user_id.to_i) %>
+            		</td>
             	</tr>
+            	<% i += 1 -%>
             <% end -%>
             </tbody>
             </table>

test/functional/repositories_controller_test.rb +3 -3

                 assert_tag :td, :content => 'dlopper',
                                 :sibling => { :tag => 'td',
-                                              :child => { :tag => 'select', :attributes => { :name => 'committers[dlopper]' },
+                                              :child => { :tag => 'select', :attributes => { :name => %r{^committers\[\d+\]\[\]$} },
                                                                             :child => { :tag => 'option', :content => 'Dave Lopper',
                                                                                                           :attributes => { :value => '3', :selected => 'selected' }}}}
                 assert_tag :td, :content => 'foo',
                                 :sibling => { :tag => 'td',
-                                              :child => { :tag => 'select', :attributes => { :name => 'committers[foo]' }}}
+                                              :child => { :tag => 'select', :attributes => { :name => %r{^committers\[\d+\]\[\]$} }}}
                 assert_no_tag :td, :content => 'foo',
                                    :sibling => { :tag => 'td',
                                                  :descendant => { :tag => 'option', :attributes => { :selected => 'selected' }}}
                 c = Changeset.create!(:repository => Project.find(1).repository, :committer => 'foo', :committed_on => Time.now, :revision => 100, :comments => 'Committed by foo.')
                 assert_no_difference "Changeset.count(:conditions => 'user_id = 3')" do
-                  post :committers, :id => 1, :committers => { 'foo' => '2', 'dlopper' => '3'}
+                  post :committers, :id => 1, :committers => { '0' => ['foo', '2'], '1' => ['dlopper', '3']}
                   assert_redirected_to '/repositories/committers/ecookbook'
                   assert_equal User.find(2), c.reload.user
                 end

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