fix: Missing attribute forAll in CustomField

git-svn-id: file:///home/sven/rmc_backup/svn_neu/trunk@396 738a3cfe-f54d-0410-852a-ebac1faf349d
snaewe · Mar 7, 2010 · 2ede820 · 2ede820
1 parent ebec80e
commit 2ede820
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/app/views/mylyn_connector/custom_fields/all.rxml b/app/views/mylyn_connector/custom_fields/all.rxml
@@ -18,6 +18,7 @@ xml.customFields :xmlns => 'http://redmin-mylyncon.sf.net/schemas/WS-API-2.6' do
       xml.defaultValue field.default_value
       xml.required field.is_required
       xml.filter field.is_filter
+      xml.forAll field.is_for_all
     end
   end
 end
diff --git a/app/views/mylyn_connector/projects/_issue_custom_field.rxml b/app/views/mylyn_connector/projects/_issue_custom_field.rxml
@@ -15,5 +15,6 @@ xml.issueCustomField(:id => issue_custom_field.id) do
   xml.defaultValue issue_custom_field.default_value
   xml.required issue_custom_field.is_required
   xml.filter issue_custom_field.is_filter
+  xml.forAll issue_custom_field.is_for_all
   xml.trackers integer_list(issue_custom_field.trackers)
 end
diff --git a/lib/mylyn_connector/version.rb b/lib/mylyn_connector/version.rb
@@ -2,7 +2,7 @@ module MylynConnector
   module Version
     MAJOR = 2
     MINOR = 6
-    TINY  = 2
+    TINY  = 3
 
     # stable/trunk
     BRANCH = 'trunk'

diff --git a/release-note.txt b/release-note.txt
@@ -1,3 +1,10 @@
+Version 2.6.3
+  bugfix: Missing CustomField-Attribute forAll
+
+Version 2.6.2
+  bugfix: IssueCustomFields without assigned Tracker(s)
+  bugfix: Changes for Redmine 0.9
+
 Version 2.6.1
   bugfix: Compatibility with Redmine 0.8.7
 

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
@@ -47,7 +47,7 @@ def test_all
     assert_tag :tag => 'issuecategory', :attributes => {:id => 2}, :children => {:only => {:tag => 'name', :content => 'Recipes'}}, :parent => {:tag => 'issuecategories', :children => {:count => 2}, :parent => p}
     #redmine 0.8: 2 customfields
     #redmine 0.9: 3 customfields
-    assert_tag :tag => 'issuecustomfield', :attributes => {:id => 1}, :children => {:only => {:tag => 'name', :content => 'Database', :sibling => {:tag => 'fieldformat', :content => 'list', :sibling => {:tag => 'trackers', :content => '1', :sibling => {:tag => 'required', :content => 'false'}, :sibling => {:tag => 'filter', :content => 'true'}}}}}, :parent => {:tag => 'issuecustomfields', :children => {:count => 2..3}, :parent =>p}
+    assert_tag :tag => 'issuecustomfield', :attributes => {:id => 1}, :children => {:only => {:tag => 'name', :content => 'Database', :sibling => {:tag => 'fieldformat', :content => 'list', :sibling => {:tag => 'trackers', :content => '1', :sibling => {:tag => 'required', :content => 'false', :sibling => {:tag => 'filter', :content => 'true', :sibling => {:tag => 'forAll', :content => 'true'}}}}}}}, :parent => {:tag => 'issuecustomfields', :children => {:count => 2..3}, :parent =>p}
     #redmine 0.8: 2 queries
     #redmine 0.9: 5 queries
     assert_tag :tag => 'query', :attributes => {:id => 1}, :children => {:only => {:tag => 'name', :content => 'Multiple custom fields query'}}, :parent => {:tag => 'queries', :children => {:count => 2..5}, :parent => p}

diff --git a/test/schema/types/customField.xsd b/test/schema/types/customField.xsd
@@ -38,6 +38,9 @@
 					<xsd:element name="defaultValue" type="xsd:string" />
 					<xsd:element name="required" type="xsd:boolean" />
 					<xsd:element name="filter" type="xsd:boolean" />
+                                        <!-- TODO in required 2.7  -->
+					<xsd:element name="forAll" type="xsd:boolean" minOccurs="1" />
+
                 </xsd:sequence>
 			</xsd:extension>
 		</xsd:complexContent>