瀏覽代碼

Properly handle restrictions (e.g. AllowedValues) on objects that are used as n:n relationships managed via LinksWidget.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1684 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 13 年之前
父節點
當前提交
7cba1f8f17
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      application/cmdbabstract.class.inc.php
  2. 1 1
      application/ui.linkswidget.class.inc.php

+ 2 - 1
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':

+ 1 - 1
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();