adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-07 17:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fixed: now that WebService method pwg.images.add create image records

Browse Source 
with no storage_category_id, we allow this field to be null in the
administration code.


git-svn-id: http://piwigo.org/svn/trunk@2575 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2008-09-23 21:26:36 +00:00
parent 8ffef257e1
commit 52f0cce24f
4 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/element_set_global.php
+17 -8
View File
@@ -107,9 +107,13 @@ SELECT id
INNER JOIN '.IMAGES_TABLE.' ON image_id = id
WHERE category_id = '.$_POST['dissociate'].'
AND id IN ('.implode(',', $collection).')
AND category_id != storage_category_id
AND (
category_id != storage_category_id
OR storage_category_id IS NULL
)
;';
$dissociables = array_from_query($query, 'id');
echo '<pre>'; print_r($dissociables); echo '</pre>';
if (!empty($dissociables))
{
@@ -245,14 +249,19 @@ display_select_cat_wrapper($query, array(), 'associate_options', true);
if (count($page['cat_elements_id']) > 0)
{
$query = '
SELECT DISTINCT(category_id) AS id, c.name, uppercats, global_rank
FROM '.IMAGE_CATEGORY_TABLE.' AS ic,
'.CATEGORIES_TABLE.' AS c,
'.IMAGES_TABLE.' AS i
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 = c.id
AND ic.image_id = i.id
AND ic.category_id != i.storage_category_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);
}