add: CustomField-Tracker-Relations

snaewe · Nov 26, 2010 · c7d577e · c7d577e
1 parent 2c49204
commit c7d577e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/app/views/mylyn_connector/trackers/all.xml.builder b/app/views/mylyn_connector/trackers/all.xml.builder
@@ -4,6 +4,7 @@ xml.trackers :xmlns => 'http://redmin-mylyncon.sf.net/api', :api=>api_version do
     xml.tracker :id => tracker.id do
       xml.name tracker.name
       xml.position tracker.position
+      xml.issueCustomFields integer_list(tracker.custom_fields)
     end
   end
 end
diff --git a/test/functional/trackers_controller_test.rb b/test/functional/trackers_controller_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class MylynConnector::TrackersControllerTest < MylynConnector::ControllerTest
-  fixtures :trackers
+  fixtures :trackers, :custom_fields, :custom_fields_trackers
 
   def setup
     super
@@ -22,6 +22,7 @@ def test_all
     tr = {:tag => 'tracker', :attributes => {:id => 3}, :parent => trs}
     assert_tag :tag => 'name', :content => 'Support request', :parent => tr
     assert_tag :tag => 'position', :content => '3', :parent => tr
+    assert_tag :tag => 'issuecustomfields', :content=> '2 6', :parent => tr
 
   end
 

diff --git a/test/schema/types/tracker.xsd b/test/schema/types/tracker.xsd
@@ -6,10 +6,15 @@
 	elementFormDefault="qualified" >
 
 	<xsd:include schemaLocation="property.xsd" />
+	<xsd:include schemaLocation="idList.xsd" />
 
 	<xsd:complexType name="tracker">
 		<xsd:complexContent>
-			<xsd:extension base="tns:sortedProperty" />
+			<xsd:extension base="tns:sortedProperty">
+				<xsd:sequence>
+					<xsd:element name="issueCustomFields" type="tns:idList"/>
+				</xsd:sequence>
+			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>