[webui] Handle the group case correctly for the set_bugowner request

openSUSE · Jan 24, 2013 · 84b95b6 · 84b95b6
1 parent 8ae6c74
commit 84b95b6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/src/webui/app/controllers/request_controller.rb b/src/webui/app/controllers/request_controller.rb
@@ -228,9 +228,16 @@ def set_bugowner_request_dialog
   end
 
   def set_bugowner_request
-    required_parameters :project, :user
+    required_parameters :project, :user, :group
     begin
-      req = BsRequest.new(:type => "set_bugowner", :targetproject => params[:project], :targetpackage => params[:package], :person => params[:user], :description => params[:description])
+      if params[:group] == "False"
+        req = BsRequest.new(:type => "set_bugowner", :targetproject => params[:project], :targetpackage => params[:package],
+                            :person => params[:user], :description => params[:description])
+      end
+      if params[:user] == "False"
+        req = BsRequest.new(:type => "set_bugowner", :targetproject => params[:project], :targetpackage => params[:package],
+                            :group => params[:group], :description => params[:description])
+      end
       req.save(:create => true)
       Rails.cache.delete "requests_new"
     rescue ActiveXML::Transport::NotFoundError => e

diff --git a/src/webui/app/models/bs_request.rb b/src/webui/app/models/bs_request.rb
@@ -39,15 +39,24 @@ def make_stub(opt)
             action = ""
             opt[:targetproject].each do |p|
               project, package = p.split("/")
-              logger.debug "project: #{project.to_xs} and package #{package.to_xs}"
-              action += "<action type=\"#{opt[:type]}\">"
-              action +="<person name=\"#{opt[:person]}\" role=\"bugowner\"/>"
+              action += "<action type=\"#{opt[:type]}\">"              
+              if opt[:person]
+                action +="<person name=\"#{opt[:person]}\" role=\"bugowner\"/>"
+              end
+              if opt[:group]
+                action +="<group name=\"#{opt[:group]}\" role=\"bugowner\"/>"
+              end
               action +="<target project=\"#{project.to_xs}\" package=\"#{package.to_xs}\"/>"
               action +="</action>"
             end
           else
             action = "<action type=\"#{opt[:type]}\">"
-            action += "<person name=\"#{opt[:person]}\" role=\"bugowner\"/>"
+            if opt[:person]
+              action += "<person name=\"#{opt[:person]}\" role=\"bugowner\"/>"
+            end
+            if opt[:group]
+              action += "<group name=\"#{opt[:group]}\" role=\"bugowner\"/>"
+            end
             action += "<target project=\"#{opt[:targetproject].to_xs}\" #{target_package} />"
             action +="</action>"
           end

diff --git a/src/webui/app/views/request/_set_bugowner_request_dialog.html.erb b/src/webui/app/views/request/_set_bugowner_request_dialog.html.erb
@@ -6,12 +6,14 @@
       <%= form_tag({:action => "set_bugowner_request"}, :name => 'bugowner') do %>
         <p>
           <%= label_tag(:user, "User:") %><br/>
-          <%= text_field_tag(:user, nil, :onclick => "javascript:document.bugowner.group.disabled=true", :name => 'user' ) %><br/>
+          <input id="userbkp" name="user" type="hidden" value="False" />
+          <%= text_field_tag(:user, nil, :onclick => "javascript:document.getElementById('group').disabled=true", :name => 'user' ) %><br/>
           <%= javascript_tag do %>
             $("#user").autocomplete({source: '<%= url_for :controller => 'user', :action => 'autocomplete' %>', minLength: 2});
           <% end %>
           <%= label_tag(:user, "Group:") %><br/>
-          <%= text_field_tag(:group, nil, :onclick => "javascript:document.bugowner.user.disabled=true", :name => 'group' ) %><br/>
+          <input id="groupbkp" name="group" type="hidden" value="False" />
+          <%= text_field_tag(:group, nil, :onclick => "javascript:document.getElementById('user').disabled=true", :name => 'group' ) %><br/>
           <%= javascript_tag do %>
             $("#group").autocomplete({source: '<%= url_for :controller => 'group', :action => 'autocomplete' %>', minLength: 2});
           <% end %>