From 645802ed3278cce29ea97d2ad81f1f72e928e7a1 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Thu, 22 Mar 2012 17:15:53 +0000
Subject: [PATCH] Bug fix: support [+] button inside linkedsets.. with
 constraints

SVN:trunk[1925]
---
 application/ui.linkswidget.class.inc.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 027ecf361..3d4511624 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -119,10 +119,10 @@ class UILinksWidget
 			foreach($this->m_aEditableFields as $sFieldCode)
 			{
 				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId->GetKey().']';
-				$sSafeId = str_replace(array('[',']','-'), '_', $sFieldId);
+				$sSafeId = self::MakeID($sFieldId);
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
 				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $linkObjOrId->Get($sFieldCode), '' /* DisplayValue */, $sSafeId, $sNameSuffix, 0, $aArgs);
-				$aFieldsMap[$sFieldCode] = $sFieldId;
+				$aFieldsMap[$sFieldCode] = $sSafeId;
 			}
 			$sState = $linkObjOrId->GetState();
 		}
@@ -144,10 +144,10 @@ class UILinksWidget
 			foreach($this->m_aEditableFields as $sFieldCode)
 			{
 				$sFieldId = $this->m_iInputId.'_'.$sFieldCode.'['.$linkObjOrId.']';
-				$sSafeId = str_replace(array('[',']','-'), '_', $sFieldId);
+				$sSafeId = self::MakeID($sFieldId);
 				$oAttDef = MetaModel::GetAttributeDef($this->m_sLinkedClass, $sFieldCode);
 				$aRow[$sFieldCode] = cmdbAbstractObject::GetFormElementForField($oP, $this->m_sLinkedClass, $sFieldCode, $oAttDef, $oNewLinkObj->Get($sFieldCode) /* TO DO/ call GetDefaultValue($oObject->ToArgs()) */, '' /* DisplayValue */, $sSafeId /* id */, $sNameSuffix, 0, $aArgs);
-				$aFieldsMap[$sFieldCode] = $sFieldId;
+				$aFieldsMap[$sFieldCode] = $sSafeId;
 			}
 			$sState = '';
 			$oP->add_script(
@@ -174,11 +174,11 @@ EOF
 			);
 		}
 		
-		$sExtKeyToMeId = $this->MakeID($sPrefix.$this->m_sExtKeyToMe);
+		$sExtKeyToMeId = self::MakeID($sPrefix.$this->m_sExtKeyToMe);
 		$aFieldsMap[$this->m_sExtKeyToMe] = $sExtKeyToMeId;
 		$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToMeId\" value=\"".$oCurrentObj->GetKey()."\">";
 
-		$sExtKeyToRemoteId = $this->MakeID($sPrefix.$this->m_sExtKeyToRemote);
+		$sExtKeyToRemoteId = self::MakeID($sPrefix.$this->m_sExtKeyToRemote);
 		$aFieldsMap[$this->m_sExtKeyToRemote] = $sExtKeyToRemoteId;
 		$aRow['form::checkbox'] .= "<input type=\"hidden\" id=\"$sExtKeyToRemoteId\" value=\"$iRemoteObjKey\">";