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

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

diff --git a/wcfsetup/install/files/acp/templates/mediaList.tpl b/wcfsetup/install/files/acp/templates/mediaList.tpl
index ea0e64ee3b..d00149abb9 100644
--- a/wcfsetup/install/files/acp/templates/mediaList.tpl
+++ b/wcfsetup/install/files/acp/templates/mediaList.tpl
@@ -45,6 +45,9 @@
 					<dd>
 						<select id="categoryID" name="categoryID">
 							<option value="0">{lang}wcf.media.category.choose{/lang}</option>
+							<option value="-1"{if $categoryID == -1} selected="selected"{/if}>
+								{lang}wcf.media.category.choose.noCategory{/lang}
+							</option>
 							
 							{content}
 								{foreach from=$categoryList item=categoryItem}
diff --git a/wcfsetup/install/files/lib/acp/page/MediaListPage.class.php b/wcfsetup/install/files/lib/acp/page/MediaListPage.class.php
index b6de85bda1..5343be813a 100644
--- a/wcfsetup/install/files/lib/acp/page/MediaListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/MediaListPage.class.php
@@ -118,7 +118,11 @@ class MediaListPage extends SortablePage
         }
 
         if ($this->categoryID) {
-            $this->objectList->getConditionBuilder()->add('media.categoryID = ?', [$this->categoryID]);
+            if ($this->categoryID === -1) {
+                $this->objectList->getConditionBuilder()->add('media.categoryID IS NULL');
+            } else {
+                $this->objectList->getConditionBuilder()->add('media.categoryID = ?', [$this->categoryID]);
+            }
         }
         if ($this->query) {
             $this->objectList->addSearchConditions($this->query);
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 1b7d833acd..8f4e8bf9f4 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -4141,6 +4141,7 @@ Dateianhänge:
 		<item name="wcf.media.caption"><![CDATA[Bildunterschrift]]></item>
 		<item name="wcf.media.caption.enableHtml"><![CDATA[HTML in der Bildunterschrift verwenden]]></item>
 		<item name="wcf.media.category.choose"><![CDATA[Kategorien]]></item>
+		<item name="wcf.media.category.choose.noCategory"><![CDATA[(keine Kategorie)]]></item>
 		<item name="wcf.media.categoryID"><![CDATA[Kategorie]]></item>
 		<item name="wcf.media.chooseFile"><![CDATA[Datei auswählen]]></item>
 		<item name="wcf.media.chooseImage"><![CDATA[Bild auswählen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index e12750951c..0eaa25bc1c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -4088,6 +4088,7 @@ Attachments:
 		<item name="wcf.media.caption"><![CDATA[Caption]]></item>
 		<item name="wcf.media.caption.enableHtml"><![CDATA[Enable HTML code in caption]]></item>
 		<item name="wcf.media.category.choose"><![CDATA[Categories]]></item>
+		<item name="wcf.media.category.choose.noCategory"><![CDATA[(no category)]]></item>
 		<item name="wcf.media.categoryID"><![CDATA[Category]]></item>
 		<item name="wcf.media.chooseFile"><![CDATA[Select File]]></item>
 		<item name="wcf.media.chooseImage"><![CDATA[Select Image]]></item>