composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source
This commit is contained in:
Molkobain
2024-01-17 23:03:02 +01:00
parent 436b6808b5 cc5e105d7f
commit 31225b9e23
5 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
View File

@@ -77,7 +77,7 @@
<default_value/>
<is_null_allowed>true</is_null_allowed>
</field>
<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect" _delta="define">
<field id="contacts_list" xsi:type="AttributeLinkedSetIndirect">
<linked_class>lnkContactToFunctionalCI</linked_class>
<ext_key_to_me>functionalci_id</ext_key_to_me>
<count_min>0</count_min>

12
datamodels/2.x/itop-portal/datamodel.itop-portal.xml
View File

@@ -41,7 +41,7 @@
</allowed_portals>
</properties>
<classes>
<class id="User" _delta="define">
<class id="User">
<!-- Allow <allowed_profile>s to apply the <transition>s below. Flags on <field>s will be merged with those from datamodel -->
<!-- See example in UserRequest class -->
<!--<lifecycle/>-->
@@ -56,21 +56,21 @@
</scope>
</scopes>
</class>
<class id="Organization" _delta="define">
<class id="Organization">
<scopes>
<scope id="all">
<oql_view><![CDATA[SELECT Organization WHERE id = :current_contact->org_id]]></oql_view>
</scope>
</scopes>
</class>
<class id="Location" _delta="define">
<class id="Location">
<scopes>
<scope id="all">
<oql_view><![CDATA[SELECT Location WHERE org_id = :current_contact->org_id]]></oql_view>
</scope>
</scopes>
</class>
<class id="Contact" _delta="define">
<class id="Contact">
<scopes>
<scope id="all">
<oql_view><![CDATA[SELECT Contact WHERE org_id = :current_contact->org_id]]></oql_view>
@@ -145,9 +145,9 @@
</bricks>
<navigation_rules>
<!-- Close form (either the modal or the whole page) -->
<navigation_rule id="close-form" xsi:type="close" _delta="define"/>
<navigation_rule id="close-form" xsi:type="close"/>
<!-- Go to the homepage -->
<navigation_rule id="go-to-homepage" xsi:type="go-to-homepage" _delta="define"/>
<navigation_rule id="go-to-homepage" xsi:type="go-to-homepage"/>
</navigation_rules>
</module_design>
</module_designs>

4
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
View File

@@ -277,7 +277,7 @@
}
]]></code>
</method>
<method id="AddCurrentUserToContacts" _revision_id="294" _delta="define">
<method id="AddCurrentUserToContacts" _revision_id="294">
<comment>/**
*
* Add the current contact associated Person to the contacts_list of this Ticket
@@ -305,7 +305,7 @@
}]]></code>
<arguments/>
</method>
<method id="RemoveCurrentUserFromContacts" _revision_id="296" _delta="define">
<method id="RemoveCurrentUserFromContacts" _revision_id="296">
<comment>/**
*
* Remove the current user associated Person from the contacts_list of this Ticket