From ca585d3f42b0109bed605eadd32860c5d3c30aec Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 18 Jun 2019 15:53:48 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02044=20-=20Search=20Form=20Prefill=20not?= =?UTF-8?q?=20effective=20when=20searching=20objects=20to=20add=20to=20an?= =?UTF-8?q?=20AttributeLinkedSet=20(n:1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/ui.linksdirectwidget.class.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/ui.linksdirectwidget.class.inc.php b/application/ui.linksdirectwidget.class.inc.php index c2bcb4b8b..1fb41501b 100644 --- a/application/ui.linksdirectwidget.class.inc.php +++ b/application/ui.linksdirectwidget.class.inc.php @@ -403,10 +403,6 @@ class UILinksWidgetDirect $oFilter->AddCondition('id', $oCurrentObj->GetKey(), '!='); } } - if (count($aAlreadyLinked) > 0) - { - $oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN'); - } if ($oCurrentObj != null) { $this->SetSearchDefaultFromContext($oCurrentObj, $oFilter); @@ -417,6 +413,10 @@ class UILinksWidgetDirect $aPrefillFormParam['filter'] = $oFilter; $oCurrentObj->PrefillForm('search', $aPrefillFormParam); } + if (count($aAlreadyLinked) > 0) + { + $oFilter->AddCondition('id', $aAlreadyLinked, 'NOTIN'); + } $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 }