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

N°4346 - Restore HTML metadata (data-xxx) on lists in the backoffice

Browse Source
This commit is contained in:
Eric Espie
2021-10-21 16:18:48 +02:00
parent 9e1f5a1b63
commit e6d2b0bc18
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/Controller/AjaxRenderController.php
View File

@@ -73,9 +73,14 @@ class AjaxRenderController
foreach ($aClassAliases as $sAlias => $sClass) {
if (isset($aObject[$sAlias]) && !is_null($aObject[$sAlias])) {
$aObj[$sAlias."/_key_"] = $aObject[$sAlias]->GetKey();
$aObj[$sAlias."/_key_/raw"] = $aObject[$sAlias]->GetKey();
$aObj[$sAlias."/hyperlink"] = $aObject[$sAlias]->GetHyperlink();
foreach ($aColumnsLoad[$sAlias] as $sAttCode) {
$aObj[$sAlias."/".$sAttCode] = $aObject[$sAlias]->GetAsHTML($sAttCode);
$oRawValue = $aObject[$sAlias]->Get($sAttCode);
if (is_scalar($oRawValue)) {
$aObj[$sAlias."/".$sAttCode."/raw"] = $oRawValue;
}
}
$sObjHighlightClass = $aObject[$sAlias]->GetHilightClass();
if (!empty($sObjHighlightClass)) {

11
templates/base/components/datatable/layout.ready.js.twig
View File

@@ -172,6 +172,17 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
attribute_label: "{{ aColumn["attribute_label"] }}"
},
data: "{{ aColumn["class_alias"] }}/{{ aColumn["attribute_code"] }}",
createdCell: function (td, cellData, rowData, row, col) {
$(td).attr('data-object-class', '{{ aColumn["object_class"] }}');
$(td).attr('data-attribute-label', '{{ aColumn["attribute_label"] }}');
{% if aColumn["attribute_code"] != "_key_" %}
$(td).attr('data-attribute-code', '{{ aColumn["attribute_code"] }}');
$(td).attr('data-attribute-type', '{{ aColumn["attribute_type"] }}');
{% endif %}
if (rowData["{{ aColumn["class_alias"] }}/{{ aColumn["attribute_code"] }}/raw"]) {
$(td).attr('data-value-raw', rowData["{{ aColumn["class_alias"] }}/{{ aColumn["attribute_code"] }}/raw"]);
}
},
render: {
display: function (data, type, row) { {{ aColumn["render"]|raw }}},
_: "{{ aColumn["class_alias"] }}/{{ aColumn["attribute_code"] }}"