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

N°2847 - Tranform old itop datatable to jquery DataTable - fix diplay

Browse Source
This commit is contained in:
acognet
2020-11-17 11:54:52 +01:00
parent 1c5cb4e125
commit 9621ff4d5e
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4915,11 +4915,6 @@ class AttributeEmailAddress extends AttributeString
return '<a class="mailto" href="mailto:'.$sValue.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
}
public function GetRenderForDataTable(string $sClassAlias) :string
{
$sRenderFunction = "return '<a class=\'mailto\' href= \'mailto:'+data+'\'><span class=\'fas fa-envelope\'></span> '+data+'</a>' ;";
return $sRenderFunction;
}
}
/**
@@ -5007,11 +5002,6 @@ class AttributePhoneNumber extends AttributeString
return '<a class="tel" href="'.$sUrl.'"><span class="text_decoration '.$sUrlDecorationClass.'"></span>'.parent::GetAsHTML($sValue).'</a>';
}
public function GetRenderForDataTable(string $sClassAlias) :string
{
$sRenderFunction = "return '<a class=\'tel\' href= \'tel:'+data+'\'><span class=\'fas fa-phone\'></span> '+data+'</a>' ;";
return $sRenderFunction;
}
}
/**
@@ -10340,6 +10330,7 @@ class AttributeEnumSet extends AttributeSet
return $sRes;
}
/**
* @param ormSet $value
* @param string $sSeparator

3
pages/ajax.render.php
View File

@@ -410,7 +410,7 @@ try
$aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->GetKey();
}
else {
$aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->Get($sAttCode);
$aObj[$sAlias."/".$sAttCode ] = $aObject[$sAlias]->GetAsHTML($sAttCode);
}
}
}
@@ -420,7 +420,6 @@ try
}
array_push($aResult["data"], $aObj);
}
$oPage->add(json_encode($aResult));
$oKPI->ComputeAndReport('Data fetch and format');
break;

2
sources/application/UI/Component/DataTable/DataTableFactory.php
View File

@@ -204,7 +204,7 @@ class DataTableFactory
$aList = $aDisplayList;
}
$sSelectMode = 'none';
$sSelectMode = '';
if ($bSelectMode) {
$sSelectMode = $bSingleSelectMode ? 'single' : 'multiple';
}