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

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2137 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/repositories_controller.rb

@@ -51,8 +51,9 @@ class RepositoriesController < ApplicationController
     @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
     @users.compact!
     @users.sort!
-    if request.post?
-      @repository.committer_ids = params[:committers]
+    if request.post? && params[:committers].is_a?(Hash)
+      # 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

@@ -15,11 +15,16 @@
 	</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>