From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 31 Jul 2013 23:10:20 +0000 (+0200)
Subject: Improved UI for done queues
X-Git-Tag: 2.0.0_Beta_7~72
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=38af26d2809abdc8ad0a8a2ba683363d5ddf264f;p=GitHub%2FWoltLab%2FWCF.git

Improved UI for done queues
---

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index ee789582ae..ed1db0bed1 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -98,8 +98,10 @@
 <div class="contentNavigation">
 	<nav>
 		<ul>
-			<li class="jsOnly"><button id="enableContent">{lang}wcf.moderation.activation.enableContent{/lang}</button></li>
-			<li class="jsOnly"><button id="removeContent">{lang}wcf.moderation.activation.removeContent{/lang}</button></li>
+			{if !$queue->isDone()}
+				<li class="jsOnly"><button id="enableContent">{lang}wcf.moderation.activation.enableContent{/lang}</button></li>
+				<li class="jsOnly"><button id="removeContent">{lang}wcf.moderation.activation.removeContent{/lang}</button></li>
+			{/if}
 			<li><a href="{link controller='ModerationList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.moderation.moderation{/lang}</span></a></li>
 			
 			{event name='contentNavigationButtonsBottom'}
diff --git a/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index 985eb95e8d..8955c644ac 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -107,8 +107,8 @@
 <div class="contentNavigation">
 	<nav>
 		<ul>
-			<li class="jsOnly"><button id="removeContent">{lang}wcf.moderation.report.removeContent{/lang}</button></li>
-			{if $queue->status != 2}
+			{if !$queue->isDone()}
+				<li class="jsOnly"><button id="removeContent">{lang}wcf.moderation.report.removeContent{/lang}</button></li>
 				<li class="jsOnly"><button id="removeReport">{lang}wcf.moderation.report.removeReport{/lang}</button></li>
 			{/if}
 			<li><a href="{link controller='ModerationList'}{/link}" class="button"><span class="icon icon16 icon-list"></span> <span>{lang}wcf.moderation.moderation{/lang}</span></a></li>
diff --git a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php
index f31987756c..b2b8447fcc 100644
--- a/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php
+++ b/wcfsetup/install/files/lib/data/moderation/queue/ModerationQueue.class.php
@@ -76,4 +76,13 @@ class ModerationQueue extends DatabaseObject {
 		
 		return ($row !== false && $row['isAffected']);
 	}
+	
+	/**
+	 * Returns true, if this queue is done.
+	 * 
+	 * @return	boolean
+	 */
+	public function isDone() {
+		return ($this->status == self::STATUS_DONE);
+	}
 }