[api] add incident number in patchinfo also on maintenance_request ac…

…cept

src/api/app/controllers/request_controller.rb

@@ -1695,7 +1695,12 @@ def command_changestate
 
         # create patchinfo XML file
         node = Builder::XmlMarkup.new(:indent=>2)
-        xml = node.patchinfo() do |n|
+        attrs = { }
+        if patchinfo.db_project.project_type == "maintenance_incident"
+          # this is a maintenance incident project, the sub project name is the maintenance ID
+          attrs[:incident] = patchinfo.db_project.name.gsub(/.*:/, '')
+        end
+        xml = node.patchinfo(attrs) do |n|
           node.packager    req.creator
           node.category    "recommended" # update_patchinfo may switch to security
           node.rating      "low"

src/api/app/controllers/source_controller.rb

@@ -1561,7 +1561,7 @@ def index_project_createpatchinfo
     # create patchinfo XML file
     node = Builder::XmlMarkup.new(:indent=>2)
     attrs = { }
-    if MaintenanceIncident.count( :conditions => ["db_project_id = ?", pkg.db_project.id] )
+    if pkg.db_project.project_type == "maintenance_incident"
       # this is a maintenance incident project, the sub project name is the maintenance ID
       attrs[:incident] = pkg.db_project.name.gsub(/.*:/, '')
     end

src/api/test/functional/maintenance_test.rb

@@ -150,6 +150,7 @@ def test_maintenance_request_from_foreign_project
     get "/source/#{incidentProject}/patchinfo/_patchinfo"
     assert_response :success
     assert_xml_tag :tag => 'packager', :content => "tom"
+    assert_xml_tag( :tag => "patchinfo", :attributes => { :incident => "0" } )
     assert_xml_tag :tag => 'description', :content => "To fix my bug"
 
     # again but find update project automatically and use a linked package
@@ -203,6 +204,7 @@ def test_maintenance_request_from_foreign_project
     assert_response :success
     assert_xml_tag :tag => 'packager', :content => "tom"
     assert_xml_tag :tag => 'description', :content => "To fix my bug"
+    assert_xml_tag( :tag => "patchinfo", :attributes => { :incident => "1" } )
 
     # reopen ...
     prepare_request_with_user "maintenance_coord", "power"