From 22f79b7d99fdcfbc697d1cfa3af6cc28b1f387de Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Mon, 21 Nov 2011 13:00:36 +0000
Subject: [PATCH] Properly handle restrictions (e.g. AllowedValues) on objects
 that are used as n:n relationships managed via LinksWidget.

SVN:trunk[1684]
---
 application/cmdbabstract.class.inc.php   | 3 ++-
 application/ui.linkswidget.class.inc.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index ad471e4f1..f8560f59d 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -1566,7 +1566,8 @@ EOF
 					$aEventsList[] ='validate';
 					$aEventsList[] ='change';
 					$oWidget = new UILinksWidget($sClass, $sAttCode, $iId, $sNameSuffix, $oAttDef->DuplicatesAllowed(), $aArgs);
-					$sHTMLValue = $oWidget->Display($oPage, $value, array(), '', $this);
+					$oObj = isset($aArgs['this']) ? $aArgs['this'] : null;
+					$sHTMLValue = $oWidget->Display($oPage, $value, array(), $sFormPrefix, $oObj);
 				break;
 							
 				case 'Document':
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 96289a5c6..ab79d9d11 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -244,7 +244,7 @@ class UILinksWidget
 		}
 		$sHtmlValue .= $this->DisplayFormTable($oPage, $this->m_aTableConfig, $aForm);
 		$sDuplicates = ($this->m_bDuplicatesAllowed) ? 'true' : 'false';
-		$sWizHelper = 'oWizardHelper'.$this->m_sFormPrefix;
+		$sWizHelper = 'oWizardHelper'.$sFormPrefix;
 		$oPage->add_ready_script(<<<EOF
 		oWidget{$this->m_iInputId} = new LinksWidget('{$this->m_sAttCode}{$this->m_sNameSuffix}', '{$this->m_sClass}', '{$this->m_sAttCode}', '{$this->m_iInputId}', '{$this->m_sNameSuffix}', $sDuplicates, $sWizHelper);
 		oWidget{$this->m_iInputId}.Init();