iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-01 19:12:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 3077 : factorize code for categories cache (TODO for other collections) + fix incorrect categories list for dissociation

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@28542 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100
2014-05-26 22:03:57 +00:00
parent b97c45b941
commit a5b2cf8200
8 changed files with 187 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
admin/batch_manager_global.php
View File

@@ -519,30 +519,8 @@ SELECT
}
}
$template->assign( 'filter_category_selected', $selected_category);
$template->assign('filter_category_selected', $selected_category);
// Dissociate from a category : categories listed for dissociation can only
// represent virtual links. We can't create orphans. Links to physical
// categories can't be broken.
if (count($page['cat_elements_id']) > 0)
{
$query = '
SELECT
DISTINCT(category_id) AS id,
c.name,
c.uppercats,
c.global_rank
FROM '.IMAGE_CATEGORY_TABLE.' AS ic
JOIN '.CATEGORIES_TABLE.' AS c ON c.id = ic.category_id
JOIN '.IMAGES_TABLE.' AS i ON i.id = ic.image_id
WHERE ic.image_id IN ('.implode(',', $page['cat_elements_id']).')
AND (
ic.category_id != i.storage_category_id
OR i.storage_category_id IS NULL
)
;';
display_select_cat_wrapper($query, array(), 'dissociate_options', true);
}
if (count($page['cat_elements_id']) > 0)
{