composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2847 - Datatable Fix external keys "undefined"

Browse Source
This commit is contained in:
Eric
2020-11-24 11:25:26 +01:00
parent f893603332
commit d9264e5181
2 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/attributedef.class.inc.php
View File

@@ -6784,21 +6784,12 @@ class AttributeExternalKey extends AttributeDBFieldVoid
public function GetAsHTML($sValue, $oHostObject = null, $bLocalize = true)
{
if (!is_null($oHostObject))
{
if (!is_null($oHostObject)) {
return $oHostObject->GetAsHTML($this->GetCode(), $oHostObject);
}
return DBObject::MakeHyperLink($this->GetTargetClass(), $sValue);
}
public function GetRenderForDataTable(string $sClassAlias) :string
{
$oRemoteAtt = $this->GetFinalAttDef();
$sTargetClass = $oRemoteAtt->GetTargetClass();
$sRenderFunction = "return '<a class=\'object-ref-link\' href= \'UI.php?operation=details&class=".$sTargetClass."&id='+data+'\'>'+row['".$sClassAlias."/".$this->GetCode()."_friendlyname']+'</a>' ;";
return $sRenderFunction;
}
}
/**

19
pages/ajax.render.php
View File

@@ -17,12 +17,12 @@
* You should have received a copy of the GNU Affero General Public License
*/
use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory;
use Combodo\iTop\Application\UI\Component\DataTable\DataTableSettings;
use Combodo\iTop\Application\UI\Layout\ActivityPanel\ActivityEntry\ActivityEntryFactory;
use Combodo\iTop\Controller\AjaxRenderController;
use Combodo\iTop\Renderer\BlockRenderer;
use Combodo\iTop\Renderer\Console\ConsoleFormRenderer;
use Combodo\iTop\Application\UI\Component\DataTable\DataTableFactory;
require_once('../approot.inc.php');
require_once(APPROOT.'application/application.inc.php');
@@ -407,19 +407,10 @@ try
while ($aObject = $oSet->FetchAssoc()) {
foreach($aClassAliases as $sAlias=>$sClass) {
foreach($aColumns[$sAlias] as $sAttCode => $oAttDef) {
if($sAttCode=="_key_") {
$aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->GetKey();
}
else {
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
if ($oAttDef instanceof AttributeExternalKey)
{
$aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->Get($sAttCode);
}
else{
$aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}
if ($sAttCode == "_key_") {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetKey();
} else {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}
}
}