Skip to content

Enable alteration on more elements #80

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 3 commits into from
Jun 23, 2025
Merged

Enable alteration on more elements #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed89d34
Enable alteration of class/naming/attributes and complementary_attrib…
rudnerbjoern Jun 23, 2025
5662ef4
Enable alteration of branding/variables and branding/imports and bran…
rudnerbjoern Jun 23, 2025
21c9c02
add validation
rudnerbjoern Jun 23, 2025
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
9 changes: 6 additions & 3 deletions 3.2/itop_design.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="alteredNode"/>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="complementary_attributes" minOccurs="0">
Expand All @@ -60,11 +60,11 @@
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="alteredNode"/>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="alteredNode"/>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="fields_semantic" minOccurs="0">
Expand Down Expand Up @@ -758,13 +758,15 @@
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="imports" minOccurs="0">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="import" />
</xs:sequence>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="stylesheets" minOccurs="0">
Expand All @@ -780,6 +782,7 @@
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attributeGroup ref="alteredNode" />
</xs:complexType>
</xs:element>
<xs:element name="precompiled_stylesheet" type="xs:string" minOccurs="0" />
Expand Down
51 changes: 47 additions & 4 deletions test/datamodel.must-validate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<class id="Delta6" _delta="if_exists" />
<class id="Delta7" _delta="merge" />
<class id="Delta8" _delta="must_exist" />
<class id="Delta9" _delta="redefine" />
<class id="Delta9" _delta="redefine" _rename_from="DeltaFrom" />
<class id="AttributesClass" _delta="define" _created_in="module1" _altered_in="module2" _alteration="replaced" _revision_id="1" />
<class id="TestClass1">
<parent>ParentClass</parent>
<php_parent>
Expand Down Expand Up @@ -401,6 +402,14 @@
</class>
<class id="TestDelta" _delta="define_if_not_exists">
<properties>
<naming _delta="define">
<attributes _delta="define">
<attribute id="name1" _delta="delete" />
</attributes>
<complementary_attributes _delta="define">
<attribute id="name2" _delta="if_exists" />
</complementary_attributes>
</naming>
<obsolescence _delta="delete_if_exists" />
</properties>
<fields>
Expand All @@ -410,6 +419,40 @@
<filter _delta="redefine"><![CDATA[SELECT FunctionalCI WHERE finalclass IN ('NetworkDevice', 'Server', 'VirtualMachine')]]></filter>
</field>
</fields>
<methods>
<method id="TestMethod1">
<comment _delta="define">comment</comment>
<access _delta="define">public</access>
<type _delta="define">Overload-cmdbAbstractObject</type>
<arguments _delta="force">
<argument id="argument1" _delta="delete" />
</arguments>
<code _delta="define"><![CDATA[function TestFunction()]]> </code>
</method>
<method id="TestMethod2" _delta="delete_if_exists" />
</methods>
<presentation>
<details>
<items>
<item id="item1" _delta="define">
<rank _delta="force">10</rank>
<items>
<item id="item2" _delta="define">
<rank _delta="define">20</rank>
<items>
<item id="item3" _delta="define">
<rank _delta="define">30</rank>
<items>
<item id="item4" _delta="define" />
</items>
</item>
</items>
</item>
</items>
</item>
</items>
</details>
</presentation>
</class>
<class id="TestAttributes">
<fields>
Expand Down Expand Up @@ -1038,15 +1081,15 @@
</stylesheets>
</theme>
<theme id="test-red" _delta="must_exist">
<variables>
<variables _delta="redefine">
<variable id="backoffice-environment-banner-background-color" _delta="define">#C53030</variable>
<variable id="backoffice-environment-banner-text-color" _delta="define">#F7FAFC</variable>
<variable id="backoffice-environment-banner-text-content" _delta="define">"THIS IS A TEST INSTANCE"</variable>
</variables>
<imports>
<imports _delta="redefine">
<import id="css-variables" _delta="define">itop-themes-compat/assets/css/css-variables.scss</import>
</imports>
<stylesheets>
<stylesheets _delta="redefine">
<stylesheet id="jqueryui" _delta="define">compat.scss</stylesheet>
<stylesheet id="main" _delta="define">compat.scss</stylesheet>
</stylesheets>
Expand Down