From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 17 Apr 2014 14:57:27 +0000 (+0200)
Subject: Support undeletable ModerationQueue items
X-Git-Tag: 2.1.0_Alpha_1~873
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b91f14240ec13d0285f4a6ddb81957d573e31ddb;p=GitHub%2FWoltLab%2FWCF.git

Support undeletable ModerationQueue items
---

diff --git a/com.woltlab.wcf/templates/moderationActivation.tpl b/com.woltlab.wcf/templates/moderationActivation.tpl
index 95811ab723..0f5cd3a488 100644
--- a/com.woltlab.wcf/templates/moderationActivation.tpl
+++ b/com.woltlab.wcf/templates/moderationActivation.tpl
@@ -102,7 +102,7 @@
 	<nav>
 		<ul>
 			{if !$queue->isDone()}
-				<li class="jsOnly"><a id="enableContent" class="button"><span class="icon icon16 icon-check"></span> <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a></li>
+				{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="enableContent" class="button"><span class="icon icon16 icon-check"></span> <span>{lang}wcf.moderation.activation.enableContent{/lang}</span></a></li>{/if}
 				<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 icon-remove"></span> <span>{lang}wcf.moderation.activation.removeContent{/lang}</span></a></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/com.woltlab.wcf/templates/moderationReport.tpl b/com.woltlab.wcf/templates/moderationReport.tpl
index fb2166d4a3..96c34227e7 100644
--- a/com.woltlab.wcf/templates/moderationReport.tpl
+++ b/com.woltlab.wcf/templates/moderationReport.tpl
@@ -111,7 +111,7 @@
 	<nav>
 		<ul>
 			{if !$queue->isDone()}
-				<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 icon-remove"></span> <span>{lang}wcf.moderation.report.removeContent{/lang}</span></a></li>
+				{if $queueManager->canRemoveContent($queue->getDecoratedObject())}<li class="jsOnly"><a id="removeContent" class="button"><span class="icon icon16 icon-remove"></span> <span>{lang}wcf.moderation.report.removeContent{/lang}</span></a></li>{/if}
 				<li class="jsOnly"><a id="removeReport" class="button"><span class="icon icon16 icon-remove"></span> <span>{lang}wcf.moderation.report.removeReport{/lang}</span></a></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/com.woltlab.wcf/templates/moderationUser.tpl b/com.woltlab.wcf/templates/moderationUser.tpl
index 552bafa59f..1695d1cc78 100644
--- a/com.woltlab.wcf/templates/moderationUser.tpl
+++ b/com.woltlab.wcf/templates/moderationUser.tpl
@@ -3,11 +3,3 @@
 		{include file='userListItem'}
 	</ol>
 </div>
-
-<script data-relocate="true">
-	//<![CDATA[
-	$(function() {
-		$('#removeContent').hide();
-	});
-	//]]>
-</script>
diff --git a/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php b/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php
index 142e4fe3fc..c292be8d0d 100644
--- a/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php
+++ b/wcfsetup/install/files/lib/form/ModerationActivationForm.class.php
@@ -21,7 +21,8 @@ class ModerationActivationForm extends AbstractModerationForm {
 		parent::assignVariables();
 		
 		WCF::getTPL()->assign(array(
-			'disabledContent' => ModerationQueueActivationManager::getInstance()->getDisabledContent($this->queue)
+			'disabledContent' => ModerationQueueActivationManager::getInstance()->getDisabledContent($this->queue),
+			'queueManager' => ModerationQueueActivationManager::getInstance()
 		));
 	}
 }
diff --git a/wcfsetup/install/files/lib/form/ModerationReportForm.class.php b/wcfsetup/install/files/lib/form/ModerationReportForm.class.php
index 0b58a5b36a..d86a864a51 100644
--- a/wcfsetup/install/files/lib/form/ModerationReportForm.class.php
+++ b/wcfsetup/install/files/lib/form/ModerationReportForm.class.php
@@ -21,7 +21,8 @@ class ModerationReportForm extends AbstractModerationForm {
 		parent::assignVariables();
 		
 		WCF::getTPL()->assign(array(
-			'reportedContent' => ModerationQueueReportManager::getInstance()->getReportedContent($this->queue)
+			'reportedContent' => ModerationQueueReportManager::getInstance()->getReportedContent($this->queue),
+			'queueManager' => ModerationQueueReportManager::getInstance()
 		));
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php
index 80d31f8f19..bdfca1e474 100644
--- a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueHandler.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\moderation\queue;
+use wcf\data\moderation\queue\ModerationQueue;
 use wcf\data\moderation\queue\ModerationQueueAction;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
@@ -89,4 +90,11 @@ abstract class AbstractModerationQueueHandler implements IModerationQueueHandler
 			$queueAction->executeAction();
 		}
 	}
+	
+	/**
+	 * @see	\wcf\system\moderation\queue\IModerationQueueHandler::canRemoveContent()
+	 */
+	public function canRemoveContent(ModerationQueue $queue) {
+		return true;
+	}
 }
diff --git a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueManager.class.php b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueManager.class.php
index c17fee2d36..cce6b922d0 100644
--- a/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueManager.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/AbstractModerationQueueManager.class.php
@@ -58,6 +58,13 @@ abstract class AbstractModerationQueueManager extends SingletonFactory implement
 		ModerationQueueManager::getInstance()->getProcessor($this->definitionName, null, $objectTypeID)->populate($objects);
 	}
 	
+	/**
+	 * @see	\wcf\system\moderation\queue\IModerationQueueManager::canRemoveContent()
+	 */
+	public function canRemoveContent(ModerationQueue $queue) {
+		return $this->getProcessor(null, $queue->objectTypeID)->canRemoveContent($queue);
+	}
+	
 	/**
 	 * @see	\wcf\system\moderation\queue\IModerationQueueManager::removeContent()
 	 */
diff --git a/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueHandler.class.php b/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueHandler.class.php
index d553026ac0..be46dd725f 100644
--- a/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueHandler.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueHandler.class.php
@@ -60,6 +60,13 @@ interface IModerationQueueHandler {
 	 */
 	public function removeContent(ModerationQueue $queue, $message);
 	
+	/**
+	 * Returns true if the affected content may be removed.
+	 * 
+	 * @return	boolean
+	 */
+	public function canRemoveContent(ModerationQueue $queue);
+	
 	/**
 	 * Removes queses from database, should only be called if the referenced
 	 * object is permanently deleted.
diff --git a/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueManager.class.php b/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueManager.class.php
index 7000a31d64..aa484d29d7 100644
--- a/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueManager.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/IModerationQueueManager.class.php
@@ -63,6 +63,14 @@ interface IModerationQueueManager {
 	 */
 	public function populate($objectTypeID, array $objects);
 	
+	/**
+	 * Returns whether the afftected content may be removed.
+	 * 
+	 * @param	\wcf\data\moderation\queue\ModerationQueue	$queue
+	 * @return	boolean
+	 */
+	public function canRemoveContent(ModerationQueue $queue);
+	
 	/**
 	 * Removes affected content. It is up to the processing object to use a
 	 * soft-delete or remove the content permanently.
diff --git a/wcfsetup/install/files/lib/system/moderation/queue/report/UserModerationQueueReportHandler.class.php b/wcfsetup/install/files/lib/system/moderation/queue/report/UserModerationQueueReportHandler.class.php
index 3960385c0f..add3c2ce07 100644
--- a/wcfsetup/install/files/lib/system/moderation/queue/report/UserModerationQueueReportHandler.class.php
+++ b/wcfsetup/install/files/lib/system/moderation/queue/report/UserModerationQueueReportHandler.class.php
@@ -152,6 +152,13 @@ class UserModerationQueueReportHandler extends AbstractModerationQueueHandler im
 		}
 	}
 	
+	/**
+	 * @see	\wcf\system\moderation\queue\IModerationQueueHandler::canRemoveContent()
+	 */
+	public function canRemoveContent(ModerationQueue $queue) {
+		return false;
+	}
+	
 	/**
 	 * @see	\wcf\system\moderation\queue\IModerationQueueHandler::removeContent()
 	 */