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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Stephen Abello
2019-02-13 15:03:50 +01:00
parent 6f0effcc66 43b0747b83
commit 456b51d7f8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/datatable.class.inc.php
View File

@@ -431,7 +431,7 @@ EOF;
} }
else else
{ {
$aRow['form::select'] = "<input type=\"checkBox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>"; $aRow['form::select'] = "<input type=\"checkbox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
} }
} }
foreach($aColumns[$sAlias] as $sAttCode => $aData) foreach($aColumns[$sAlias] as $sAttCode => $aData)
@@ -565,7 +565,7 @@ EOF;
<<<EOF <<<EOF
var oTable = $('#{$this->iListId} table.listResults'); var oTable = $('#{$this->iListId} table.listResults');
oTable.tableHover(); oTable.tableHover();
oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount}); oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, table_id: '{$this->iListId}', columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
EOF EOF
); );
if ($sFakeSortList != '') if ($sFakeSortList != '')

4
js/jquery.tablesorter.pager.js
View File

@@ -202,7 +202,8 @@ function sprintf(format, etc) {
end: end, end: end,
sort_col: s_col, sort_col: s_col,
sort_order: s_order, sort_order: s_order,
select_mode: c.select_mode, select_mode: c.select_mode,
list_id: c.table_id,
display_key: c.displayKey, display_key: c.displayKey,
columns: c.columns, columns: c.columns,
class_aliases: c.class_aliases class_aliases: c.class_aliases
@@ -448,6 +449,7 @@ function sprintf(format, etc) {
filter: '', filter: '',
extra_params: '', extra_params: '',
select_mode: '', select_mode: '',
table_id: 0,
totalSelected: 0, totalSelected: 0,
selectionMode: 'positive', selectionMode: 'positive',
displayKey: true, displayKey: true,