Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,6 @@
"xs:documentation"
],
"xml.format.spaceBeforeEmptyCloseTag": true,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "modificationsIfAvailable",
}
46 changes: 31 additions & 15 deletions 3.2/itop_design.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -519,22 +519,32 @@
<xs:complexType>
<xs:all>
<xs:element name="hidden" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="read_only" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="must_prompt" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="must_change" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="mandatory" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredIdNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand All @@ -554,19 +564,27 @@
<xs:complexType>
<xs:all>
<xs:element name="mandatory" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="must_change" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="must_prompt" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="read_only" minOccurs="0">
<xs:complexType />
<xs:complexType>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredIdNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down Expand Up @@ -595,16 +613,14 @@
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredNode" />
<xs:attributeGroup ref="alteredIdNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredNode" />
<xs:attributeGroup ref="alteredIdNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
Expand Down
31 changes: 26 additions & 5 deletions test/datamodel.must-validate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,11 @@
<field id="enumTest" xsi:type="AttributeEnum" _delta="define">
<sql>enum_test</sql>
<values>
<value id="enum1">
<code>enum1</code>
<rank>10</rank>
<style>
<decoration_classes>decoration</decoration_classes>
<value id="enum1" _delta="define">
<code _delta="define">enum1</code>
<rank _delta="define">10</rank>
<style _delta="define">
<decoration_classes _delta="define">decoration</decoration_classes>
<main_color _delta="define">$ibo-lifecycle-active-state-primary-color</main_color>
<complementary_color _delta="define">$ibo-lifecycle-active-state-secondary-color</complementary_color>
</style>
Expand Down Expand Up @@ -456,6 +456,27 @@
</method>
<method id="TestMethod2" _delta="delete_if_exists" />
</methods>
<lifecycle>
<states>
<state id="state1" _delta="must_exist">
<flags>
<attribute id="attribute1" _delta="define">
<mandatory _delta="define" />
</attribute>
</flags>
<transitions>
<transition id="transition1" _delta="define">
<target>state2</target>
<flags>
<attribute id="attribute1" _delta="define">
<mandatory _delta="define" />
</attribute>
</flags>
</transition>
</transitions>
</state>
</states>
</lifecycle>
<presentation>
<details>
<items>
Expand Down