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
24 changes: 24 additions & 0 deletions 3.2/itop_design.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,30 @@
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="dashlets" minOccurs="0">
<xs:complexType>
<xs:sequence maxOccurs="unbounded">
<xs:element name="dashlet">
<xs:complexType>
<xs:all>
<xs:element name="label" type="xs:string" minOccurs="0" />
<xs:element name="icon" type="xs:string" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
Comment on lines +248 to +250
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think by default all elements should be alterable..

Suggested change
<xs:element name="label" type="xs:string" minOccurs="0" />
<xs:element name="icon" type="xs:string" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
<xs:element name="label" type="alteredString" minOccurs="0" />
<xs:element name="icon" type="alteredString" minOccurs="0" />
<xs:element name="description" type="alteredString" minOccurs="0" />

<xs:element name="configuration">
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:any processContents="lax" />
</xs:choice>
</xs:complexType>
</xs:element>
Comment on lines +251 to +257
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<xs:element name="configuration">
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:any processContents="lax" />
</xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="configuration">
<xs:complexType>
<xs:choice maxOccurs="unbounded">
<xs:any processContents="lax" />
</xs:choice>
<xs:attributeGroup ref="alteredNode" /> </xs:complexType>
</xs:element>

</xs:all>
<xs:attribute name="id" type="xs:string" use="required" />
<xs:attributeGroup ref="alteredNode" />
Comment on lines +259 to +260
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<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:complexType>
</xs:element>
Expand Down
22 changes: 21 additions & 1 deletion test/datamodel.must-validate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,27 @@
</snippet>
</snippets>
<!-- ***************** Meta ***************** -->
<meta />
<meta>
<!-- Usage of this tag is restricted to Combodo for driving ITSM Designer behavior. -->
<classes>
<class id="classId" _delta="define">
<interfaces>
<interface id="interfaceId" />
</interfaces>
</class>
</classes>
<dashlets>
<dashlet id="dashletId" _delta="define">
<label>DashletLabel</label>
<icon>DashletIcon</icon>
<description>DashletDescription</description>
<configuration>
<arg1>arg 1 value</arg1>
<arg2>arg 2 value</arg2>
</configuration>
</dashlet>
</dashlets>
</meta>
<!-- ***************** Events ***************** -->
<events>
<event id="event-1" _delta="define">
Expand Down