archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 2089: report feature:1845 in the new Batch Manager.

Browse source 
+ once the photos are deleted, redirect the page to reset the current photo set
and avoid being on an empty 2nd page.


git-svn-id: http://piwigo.org/svn/trunk@8398 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2010-12-30 15:54:43 +00:00
commit 71ca43c5d4
2 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
admin/batch_manager_global.php
View file

@ -151,6 +151,8 @@ DELETE
// we remove the dissociated images if we are currently displaying the
// category to dissociate from.
//
// TODO we can display the photo of a given album without the $_GET['cat']
if (is_numeric($_GET['cat']) and $_POST['dissociate'] == $_GET['cat'])
{
$page['cat_elements_id'] = array_diff(
@ -269,35 +271,22 @@ DELETE
{
if (isset($_POST['confirm_deletion']) and 1 == $_POST['confirm_deletion'])
{
// filter selection on photos that have no storage_category_id (ie
// that were added via pLoader)
$query = '
SELECT id
FROM '.IMAGES_TABLE.'
WHERE id IN ('.implode(',', $collection).')
AND storage_category_id IS NULL
;';
$deletables = array_from_query($query, 'id');
if (count($deletables) > 0)
$deleted_count = delete_elements($collection, true);
if ($deleted_count > 0)
{
$physical_deletion = true;
delete_elements($deletables, $physical_deletion);
array_push(
$page['infos'],
$_SESSION['page_infos'] = array(
sprintf(
l10n_dec(
'%d photo was deleted',
'%d photos were deleted',
count($deletables)
$deleted_count
),
count($deletables)
$deleted_count
)
);
// we have to remove the deleted photos from the current set
$page['cat_elements_id'] = array_diff($page['cat_elements_id'], $deletables);
$redirect_url = get_root_url().'admin.php?page='.$_GET['page'];
redirect($redirect_url);
}
else
{