ソースを参照

#913 Error when searching for child requests and no organization is specified. Still, I could not figure out WHY IT WAS WORKING WHEN AN ORG IS SELECTED as a search filter!

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3123 a333f486-631f-4898-b8df-5754b55c2be0
romainq 11 年 前
コミット
c4e078f311
1 ファイル変更2 行追加3 行削除
  1. 2 3
      application/ui.linksdirectwidget.class.inc.php

+ 2 - 3
application/ui.linksdirectwidget.class.inc.php

@@ -318,12 +318,11 @@ class UILinksWidgetDirect
 		{
 			$oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN');
 		}
-		$aArgs = array();
 		if ($oCurrentObj != null)
 		{
-			$aArgs = $oCurrentObj->ToArgs('this');
+			$aArgs = array_merge($oCurrentObj->ToArgs('this'), $oFilter->GetInternalParams());
+			$oFilter->SetInternalParams($aArgs);
 		}
-		$oFilter->SetInternalParams($aArgs);
 		$oBlock = new DisplayBlock($oFilter, 'list', false);
 		$oBlock->Display($oP, "ResultsToAdd_{$this->sInputid}", array('menu' => false, 'cssCount'=> '#count_'.$this->sInputid , 'selection_mode' => true, 'table_id' => 'add_'.$this->sInputid)); // Don't display the 'Actions' menu on the results
 	}