From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 18 Jun 2021 06:29:54 +0000 (+0200)
Subject: Support filtering media list in media manager for media with no category
X-Git-Tag: 5.5.0_Alpha_1~624^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=97ed2a13438581645f61f21cc441230c2fc5b0d5;p=GitHub%2FWoltLab%2FWCF.git

Support filtering media list in media manager for media with no category
---

diff --git a/com.woltlab.wcf/templates/mediaManager.tpl b/com.woltlab.wcf/templates/mediaManager.tpl
index 9fe55be085..0def8b4f96 100644
--- a/com.woltlab.wcf/templates/mediaManager.tpl
+++ b/com.woltlab.wcf/templates/mediaManager.tpl
@@ -2,6 +2,7 @@
 	<div class="mediaManagerCategoryList">
 		<select name="categoryID" class="fullWidth">
 			<option value="0">{lang}wcf.media.category.choose{/lang}</option>
+			<option value="-1">{lang}wcf.media.category.choose.noCategory{/lang}</option>
 			
 			{content}
 				{foreach from=$categoryList item=categoryItem}
diff --git a/wcfsetup/install/files/acp/templates/mediaManager.tpl b/wcfsetup/install/files/acp/templates/mediaManager.tpl
index 9fe55be085..0def8b4f96 100644
--- a/wcfsetup/install/files/acp/templates/mediaManager.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaManager.tpl
@@ -2,6 +2,7 @@
 	<div class="mediaManagerCategoryList">
 		<select name="categoryID" class="fullWidth">
 			<option value="0">{lang}wcf.media.category.choose{/lang}</option>
+			<option value="-1">{lang}wcf.media.category.choose.noCategory{/lang}</option>
 			
 			{content}
 				{foreach from=$categoryList item=categoryItem}
diff --git a/wcfsetup/install/files/lib/data/media/MediaAction.class.php b/wcfsetup/install/files/lib/data/media/MediaAction.class.php
index 78f042aa52..a5d87324f4 100644
--- a/wcfsetup/install/files/lib/data/media/MediaAction.class.php
+++ b/wcfsetup/install/files/lib/data/media/MediaAction.class.php
@@ -547,7 +547,11 @@ class MediaAction extends AbstractDatabaseObjectAction implements ISearchAction,
             $mediaList->getConditionBuilder()->add('media.isImage = ?', [1]);
         }
         if ($this->parameters['categoryID']) {
-            $mediaList->getConditionBuilder()->add('media.categoryID = ?', [$this->parameters['categoryID']]);
+            if ($this->parameters['categoryID'] == -1) {
+                $mediaList->getConditionBuilder()->add('media.categoryID IS NULL');
+            } else {
+                $mediaList->getConditionBuilder()->add('media.categoryID = ?', [$this->parameters['categoryID']]);
+            }
         }
         $mediaList->sqlOrderBy = 'media.uploadTime DESC, media.mediaID DESC';
         $mediaList->sqlLimit = static::ITEMS_PER_MANAGER_DIALOG_PAGE;