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

N°3912 - Polishing: Export - fix page webservices/export.php

Browse Source
This commit is contained in:
acognet
2021-07-29 17:59:26 +02:00
parent 619e3de5a8
commit 5a9fa2ac32
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/displayblock.class.inc.php
View File

@@ -173,6 +173,8 @@ class DisplayBlock
/**positive or negative*/
'max_height',
/** string Max. height of the list, if not specified will occupy all the available height no matter the pagination */
'localize_values',
/** param for export.php */
], DataTableUIBlockFactory::GetAllowedParams()),
'list_search' => array_merge([
'update_history',

8
js/dataTables.pipeline.js
View File

@@ -16,17 +16,17 @@ $.fn.dataTable.pipeline = function (opts) {
data: null, // function or object with parameters to send to the server
// matching how `ajax.data` works in DataTables
method: 'GET' // Ajax HTTP method
}, opts );
}, opts);
// Private variables for storing the cache
var cacheLower = -1;
var cacheUpper = null;
var cacheLastRequest = null;
var cacheLastJson = null;
var draw_number = 1;
var draw_number = 1;
return function ( request, drawCallback, settings ) {
let message = Dict.S('UI:Datatables:Language:Processing');
return function (request, drawCallback, settings) {
let message = settings["oLanguage"]["processing"];
if (this.find('tbody').find('td').length == 0) {
this.find('tbody').append('<tr class="ibo-dataTables--processing"><td>&#160;</td></tr>');
this.find('tbody').block({

2
sources/application/WebPage/NiceWebPage.php
View File

@@ -100,6 +100,7 @@ EOF
parent::InitializeLinkedScripts();
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.min.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.blockUI.js');
if (utils::IsDevelopmentEnvironment()) // Needed since many other plugins still rely on oldies like $.browser
{
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate.dev-params.js');
@@ -108,7 +109,6 @@ EOF
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-migrate.prod.min.js');
}
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery-ui.custom.min.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/utils.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/hovertip.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/table-selectable-lines.js');
$this->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/field_sorter.js');

15
webservices/export.php
View File

@@ -20,16 +20,9 @@
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__));
require_once(__DIR__.'/../approot.inc.php');
require_once(APPROOT.'/application/application.inc.php');
require_once(APPROOT.'/application/nicewebpage.class.inc.php');
require_once(APPROOT.'/application/ajaxwebpage.class.inc.php');
require_once(APPROOT.'/application/csvpage.class.inc.php');
require_once(APPROOT.'/application/xmlpage.class.inc.php');
require_once(APPROOT.'/application/clipage.class.inc.php');
require_once(APPROOT.'/application/excelexporter.class.inc.php');
require_once(APPROOT.'/application/startup.inc.php');
const EXIT_CODE_ERROR = -1;
const EXIT_CODE_FATAL = -2;
@@ -233,11 +226,11 @@ if (!empty($sExpression))
);
} else {
$aExtraParams = array(
'menu' => false,
'toolkit_menu' => false,
'display_limit' => false,
'menu' => false,
'toolkit_menu' => false,
'display_limit' => false,
'localize_values' => $bLocalize,
'zlist' => 'details',
'zlist' => 'details',
);
}