Skip to content

Allow _delta for filter elements #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rudnerbjoern merged 1 commit into from
Jun 18, 2025
Merged

Allow _delta for filter elements #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"extkey",
"fileref",
"finalclass",
"functionalci",
"Hipska",
"ITSM",
"jointype",
Expand Down
10 changes: 5 additions & 5 deletions 3.2/itop_design.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="filter" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="alteredString" minOccurs="0" />
<xs:element name="disabled" type="xs:boolean" minOccurs="0" />
<xs:element name="is_blocking" type="xs:boolean" minOccurs="0" default="true" />
</xs:all>
Expand Down Expand Up @@ -2034,7 +2034,7 @@
<xs:element name="is_null_allowed" type="xs:boolean" minOccurs="0" />
<xs:element name="on_target_delete" type="onTargetDeleteEnumeration" minOccurs="0" />
<xs:element name="target_class" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="alteredString" minOccurs="0" />
<xs:element name="dependencies" type="dependenciesType" minOccurs="0" />
<xs:element name="max_combo_length" type="xs:unsignedByte" minOccurs="0" />
<xs:element name="min_autocomplete_chars" type="xs:unsignedByte" minOccurs="0" />
Expand Down Expand Up @@ -2062,7 +2062,7 @@
<xs:element name="sql" type="xs:string" minOccurs="0" />
<xs:element name="is_null_allowed" type="xs:boolean" minOccurs="0" />
<xs:element name="on_target_delete" type="onTargetDeleteEnumeration" minOccurs="0" />
<xs:element name="filter" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="alteredString" minOccurs="0" />
<xs:element name="dependencies" type="dependenciesType" minOccurs="0" />
<xs:element name="max_combo_length" type="xs:unsignedByte" minOccurs="0" />
<xs:element name="min_autocomplete_chars" type="xs:unsignedByte" minOccurs="0" />
Expand Down Expand Up @@ -2160,7 +2160,7 @@
<xs:extension base="AttributeDefinition">
<xs:all>
<xs:element name="linked_class" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="alteredString" minOccurs="0" />
<xs:element name="ext_key_to_me" type="xs:string" minOccurs="0" />
<xs:element name="tracking_level" type="trackingLevelLinkedSetEnumeration" minOccurs="0" />
<xs:element name="edit_mode" type="editModeEnumeration" minOccurs="0" default="actions" />
Expand Down Expand Up @@ -2236,7 +2236,7 @@
</xs:element>
<xs:element name="with_php_constraint" type="xs:boolean" minOccurs="0" />
<xs:element name="with_php_computation" type="xs:boolean" minOccurs="0" />
<xs:element name="filter" type="xs:string" minOccurs="0" />
<xs:element name="filter" type="alteredString" minOccurs="0" />
<xs:element name="dependencies" type="dependenciesType" minOccurs="0" />
</xs:all>
</xs:extension>
Expand Down
9 changes: 8 additions & 1 deletion test/datamodel.must-validate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,10 +398,17 @@
</summary>
</presentation>
</class>
<class id="TestDeleteIfExists" _delta="define_if_not_exists">
<class id="TestDelta" _delta="define_if_not_exists">
<properties>
<obsolescence _delta="delete_if_exists" />
</properties>
<fields>
<field id="functionalci_id" xsi:type="AttributeExternalKey" _delta="must_exist">
<!-- Issue: Tag filter of an AttributeExternalKey may be redefined
https://github.com/rudnerbjoern/iTop-schema/issues/71 -->
<filter _delta="redefine"><![CDATA[SELECT FunctionalCI WHERE finalclass IN ('NetworkDevice', 'Server', 'VirtualMachine')]]></filter>
</field>
</fields>
</class>
<class id="TestAttributes">
<fields>
Expand Down