fixes #224, batch manager, ability to configure default number of images per page

This commit is contained in:
plegall 2017-04-10 13:38:47 +02:00
parent 9f7363f12c
commit 1a348ab30b
3 changed files with 17 additions and 1 deletions

View file

@ -622,6 +622,10 @@ if (!empty($_GET['display']))
$page['nb_images'] = intval($_GET['display']);
}
}
elseif (in_array($conf['batch_manager_images_per_page_global'], array(20, 50, 100)))
{
$page['nb_images'] = $conf['batch_manager_images_per_page_global'];
}
else
{
$page['nb_images'] = 20;

View file

@ -135,6 +135,10 @@ if (!empty($_GET['display']))
{
$page['nb_images'] = intval($_GET['display']);
}
elseif (in_array($conf['batch_manager_images_per_page_unit'], array(5, 10, 50)))
{
$page['nb_images'] = $conf['batch_manager_images_per_page_unit'];
}
else
{
$page['nb_images'] = 5;
@ -254,4 +258,4 @@ trigger_notify('loc_end_element_set_unit');
// +-----------------------------------------------------------------------+
$template->assign_var_from_handle('ADMIN_CONTENT', 'batch_manager_unit');
?>
?>

View file

@ -844,6 +844,14 @@ $conf['upload_form_chunk_size'] = 500;
// the directory where "ffmpeg" executable is.
$conf['ffmpeg_dir'] = '';
// batch manager: how many images should Piwigo display by default on the
// global mode. Must be among values {20,50,100}
$conf['batch_manager_images_per_page_global'] = 20;
// batch manager: how many images should Piwigo display by default on the
// unit mode. Must be among values {5, 10, 50}
$conf['batch_manager_images_per_page_unit'] = 5;
// +-----------------------------------------------------------------------+
// | log |
// +-----------------------------------------------------------------------+