Преглед изворни кода

Fix bug #835 Remove dependency between ticket and Delivery model

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@2994 a333f486-631f-4898-b8df-5754b55c2be0
etaloc пре 11 година
родитељ
комит
8f228cc474

+ 14 - 0
datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -25,6 +25,20 @@
         </details>
       </presentation>
     </class>
+    <class id="Ticket">
+      <fields>     
+        <field id="team_id" xsi:type="AttributeExternalKey" _delta="redefine">
+          <filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>team_id</sql>
+          <target_class>Team</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+      </fields>
+    </class>
     <class id="Contract" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>

+ 1 - 0
datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php

@@ -14,6 +14,7 @@ SetupWebPage::AddModule(
 		//
 		'dependencies' => array(
 			'itop-config-mgmt/2.0.0',
+		        'itop-tickets/2.0.0',
 		),
 		'mandatory' => false,
 		'visible' => true,

+ 14 - 2
datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml

@@ -25,8 +25,20 @@
         </details>
       </presentation>
     </class>
-
-
+    <class id="Ticket">
+      <fields>     
+        <field id="team_id" xsi:type="AttributeExternalKey" _delta="redefine">
+          <filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
+          <dependencies>
+            <attribute id="org_id"/>
+          </dependencies>
+          <sql>team_id</sql>
+          <target_class>Team</target_class>
+          <is_null_allowed>true</is_null_allowed>
+          <on_target_delete>DEL_AUTO</on_target_delete>
+        </field>
+      </fields>
+    </class>
     <class id="Contract" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>

+ 1 - 0
datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php

@@ -14,6 +14,7 @@ SetupWebPage::AddModule(
 		//
 		'dependencies' => array(
 			'itop-config-mgmt/2.0.0',
+			'itop-tickets/2.0.0',
 		),
 		'mandatory' => false,
 		'visible' => true,

+ 0 - 4
datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -64,10 +64,6 @@
           <target_attcode>name</target_attcode>
         </field>
         <field id="team_id" xsi:type="AttributeExternalKey">
-          <filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
-          <dependencies>
-            <attribute id="org_id"/>
-          </dependencies>
           <sql>team_id</sql>
           <target_class>Team</target_class>
           <is_null_allowed>true</is_null_allowed>