Prevents cached Search album to be proposed when changing default alb…

…um, moving an album and choosing an album before upload
Piwigo · Jun 24, 2019 · d36a3c8 · d36a3c8
1 parent d10a52b
commit d36a3c8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/piwigo/Albums/Album Move/MoveCategoryViewController.m b/piwigo/Albums/Album Move/MoveCategoryViewController.m
@@ -499,6 +499,11 @@ -(void)buildCategoryArray
     // Look for categories which are not already displayed
     for(PiwigoAlbumData *category in allCategories)
     {
+        // Search album should not be proposed
+        if (category.albumId == kPiwigoSearchCategoryId) {
+            continue;
+        }
+
         // Non-admin Community users can only upload in specific albums
         if (![Model sharedInstance].hasAdminRights && !category.hasUploadRights) {
             continue;

diff --git a/piwigo/Settings/Views/DefaultCategoryViewController.m b/piwigo/Settings/Views/DefaultCategoryViewController.m
@@ -471,6 +471,11 @@ -(void)buildCategoryArray
     // Look for categories which are not already displayed
     for(PiwigoAlbumData *category in allCategories)
     {
+        // Search album should not be proposed
+        if (category.albumId == kPiwigoSearchCategoryId) {
+            continue;
+        }
+
         // Non-admin Community users can only upload in specific albums
         if (![Model sharedInstance].hasAdminRights && !category.hasUploadRights) {
             continue;

diff --git a/piwigo/Upload/Pick Piwigo Album/CategoryPickViewController.m b/piwigo/Upload/Pick Piwigo Album/CategoryPickViewController.m
@@ -958,6 +958,11 @@ -(void)buildCategoryArray
     // Look for categories which are not already displayed
     for(PiwigoAlbumData *category in allCategories)
     {
+        // Search album should not be proposed
+        if (category.albumId == kPiwigoSearchCategoryId) {
+            continue;
+        }
+
         // Non-admin Community users can only upload in specific albums
         if (![Model sharedInstance].hasAdminRights && !category.hasUploadRights) {
             continue;