Restore chooseCalendar

concretecms · Jan 18, 2024 · 057b077 · 057b077
1 parent b41e32b
commit 057b077
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 128 deletions.
diff --git a/src/main/resources/concrete-cif-1.0.xsd b/src/main/resources/concrete-cif-1.0.xsd
@@ -2744,6 +2744,7 @@
                 <xs:complexType>
                     <xs:all>
                         <xs:element name="caID" type="xs:integer" minOccurs="0" maxOccurs="1" />
+                        <xs:element name="chooseCalendar" type="chooseCalendarEnum" minOccurs="0" maxOccurs="1" />
                         <xs:element name="calendarAttributeKeyHandle" type="handle" minOccurs="0" maxOccurs="1" />
                         <xs:element name="filterByTopicAttributeKeyID" type="xs:integer" minOccurs="0" maxOccurs="1" />
                         <xs:element name="filterByTopicID" type="xs:integer" minOccurs="0" maxOccurs="1" />
@@ -3298,6 +3299,7 @@
                 <xs:complexType>
                     <xs:all>
                         <xs:element name="caID" type="xs:string" minOccurs="0" maxOccurs="1" />
+                        <xs:element name="chooseCalendar" type="chooseCalendarEnum" minOccurs="0" maxOccurs="1" />
                         <xs:element name="calendarAttributeKeyHandle" type="handle" minOccurs="0" maxOccurs="1" />
                         <xs:element name="totalToRetrieve" type="integer-greather-than-zero" minOccurs="0" maxOccurs="1" />
                         <xs:element name="totalPerPage" type="integer-greather-than-zero" minOccurs="0" maxOccurs="1" />
@@ -4926,4 +4928,16 @@
         <xs:restriction base="xs:string" />
     </xs:simpleType>
 
+    <!--
+    ### Calendar-related
+    -->
+
+    <xs:simpleType name="chooseCalendarEnum">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="" />
+            <xs:enumeration value="specific" />
+            <xs:enumeration value="site" />
+        </xs:restriction>
+    </xs:simpleType>
+
 </xs:schema>
diff --git a/src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml b/src/test/resources/cifs-good/9.2.2-themes-atomik-documentation-calendar-PATCHED.xml
diff --git a/...-themes-atomik-documentation-calendar.xml → ...-themes-atomik-documentation-calendar.xml b/...-themes-atomik-documentation-calendar.xml → ...-themes-atomik-documentation-calendar.xml