From 9e618d466a371b57a9a4fb74aa5e15d64c740b24 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Thu, 5 Aug 2010 12:31:07 +0000 Subject: [PATCH] - Minor fixes... SVN:trunk[661] --- application/wizardhelper.class.inc.php | 2 +- modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php index 9fff9a0db..780b98cd7 100644 --- a/application/wizardhelper.class.inc.php +++ b/application/wizardhelper.class.inc.php @@ -76,7 +76,7 @@ class WizardHelper if ( isset($aLinkedObject[$sLinkedAttCode]) && ($aLinkedObject[$sLinkedAttCode] !== null) ) { $sLinkedAttDef = MetaModel::GetAttributeDef($sLinkedClass, $sLinkedAttCode); - if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') ) + if (($sLinkedAttDef->IsExternalKey()) && ($aLinkedObject[$sLinkedAttCode] != '') && ($aLinkedObject[$sLinkedAttCode] != 0) ) { // For external keys: load the target object so that external fields // get filled too diff --git a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php index f3c2a6af6..42b7a82a1 100644 --- a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php @@ -72,7 +72,7 @@ class Location extends cmdbAbstractObject "key_type" => "autoincrement", "name_attcode" => "name", "state_attcode" => "", - "reconc_keys" => array(""), + "reconc_keys" => array("name", "org_id"), "db_table" => "location", "db_key_field" => "id", "db_finalclass_field" => "",