Browse Source

Put some default reconciliation keys to ease the use of CSV import

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1821 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 13 years ago
parent
commit
241da93e74
2 changed files with 11 additions and 11 deletions
  1. 3 3
      core/action.class.inc.php
  2. 8 8
      core/trigger.class.inc.php

+ 3 - 3
core/action.class.inc.php

@@ -42,7 +42,7 @@ abstract class Action extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('name'),
 			"db_table" => "priv_action",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
@@ -106,7 +106,7 @@ abstract class ActionNotification extends Action
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('name'),
 			"db_table" => "priv_action_notification",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -139,7 +139,7 @@ class ActionEmail extends ActionNotification
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('name'),
 			"db_table" => "priv_action_email",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",

+ 8 - 8
core/trigger.class.inc.php

@@ -41,7 +41,7 @@ abstract class Trigger extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "realclass",
@@ -87,7 +87,7 @@ abstract class TriggerOnObject extends Trigger
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onobject",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -118,7 +118,7 @@ class TriggerOnPortalUpdate extends TriggerOnObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onportalupdate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -144,7 +144,7 @@ abstract class TriggerOnStateChange extends TriggerOnObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onstatechange",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -173,7 +173,7 @@ class TriggerOnStateEnter extends TriggerOnStateChange
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onstateenter",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -201,7 +201,7 @@ class TriggerOnStateLeave extends TriggerOnStateChange
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onstateleave",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -229,7 +229,7 @@ class TriggerOnObjectCreate extends TriggerOnObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "description",
 			"state_attcode" => "",
-			"reconc_keys" => array(),
+			"reconc_keys" => array('description'),
 			"db_table" => "priv_trigger_onobjcreate",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -257,7 +257,7 @@ class lnkTriggerAction extends cmdbAbstractObject
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
-			"reconc_keys" => array(""),
+			"reconc_keys" => array('action_id', 'trigger_id'),
 			"db_table" => "priv_link_action_trigger",
 			"db_key_field" => "link_id",
 			"db_finalclass_field" => "",