Merge branch '6.2' into 6.3

Author: BurntimeX

ts/WoltLabSuite/Core/Component/Confirmation.ts

@@ -150,6 +150,20 @@ class ConfirmationPrefab {
 
     dialog.content.append(dl);
 
+    if (!isOptional) {
+      dialog.addEventListener("validate", (event) => {
+        if (reason.value.trim() === "") {
+          event.preventDefault();
+
+          dl.classList.add("formError");
+          DomUtil.innerError(reason, getPhrase("wcf.global.form.error.empty"));
+        } else {
+          dl.classList.remove("formError");
+          DomUtil.innerError(reason, false);
+        }
+      });
+    }
+
     dialog.show(question);
 
     return new Promise<ResultConfirmationWithReason>((resolve) => {

wcfsetup/install/files/js/WoltLabSuite/Core/Component/Confirmation.js

@@ -23,6 +23,7 @@
 use wcf\system\form\builder\data\processor\CustomFormDataProcessor;
 use wcf\system\form\builder\field\acl\AclFormField;
 use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\IntegerFormField;
 use wcf\system\form\builder\field\MultilineTextFormField;
 use wcf\system\form\builder\field\SelectFormField;
 use wcf\system\form\builder\field\ShowOrderFormField;
@@ -243,6 +244,23 @@ protected function getPositionFormFields(): array
             $categoryNodeTree->setMaxDepth($maximumNestingLevel - 1);
         }
 
+        $positionFormField = null;
+        if ($maximumNestingLevel === 0) {
+            $positionFormField = ShowOrderFormField::create()
+                ->description($processor->getLanguageVariable('showOrder.description', true))
+                ->options($categoryNodeTree, true)
+                ->nullable()
+                ->required();
+        } else {
+            // Provide a simple integer input instead because we cannot
+            // dynamically filter the list of categories in the position field.
+            $positionFormField = IntegerFormField::create('showOrder')
+                ->label('wcf.form.field.showOrder')
+                ->description($processor->getLanguageVariable('showOrder.description', true))
+                ->minimum(0)
+                ->required();
+        }
+
         return [
             SelectFormField::create('parentCategoryID')
                 ->label($processor->getLanguageVariable('parentCategoryID'))
@@ -336,11 +354,7 @@ static function (SelectFormField $formField) use ($processor) {
                         }
                     )
                 ),
-            ShowOrderFormField::create()
-                ->description($processor->getLanguageVariable('showOrder.description', true))
-                ->options($categoryNodeTree, true)
-                ->nullable()
-                ->required(),
+            $positionFormField,
         ];
     }
 

wcfsetup/install/files/lib/acp/form/CategoryAddFormBuilderForm.class.php

@@ -63,7 +63,7 @@ public function supportsNestedOptions()
     public function validate()
     {
         if ($this->isRequired() || $this->getValue() !== '') {
-            if (!isset($this->getOptions()[$this->getValue()])) {
+            if ($this->getValue() === null || !isset($this->getOptions()[$this->getValue()])) {
                 $this->addValidationError(
                     new FormFieldValidationError(
                         'invalidValue',

wcfsetup/install/files/lib/system/form/builder/field/RadioButtonFormField.class.php

@@ -143,6 +143,20 @@ public function populate(array $queues)
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function canRemoveContent(ModerationQueue $queue)
+    {
+        if ($this->isValid($queue->objectID)) {
+            $comment = $this->getComment($queue->objectID);
+
+            return $this->getCommentManager($comment)->canDeleteComment($comment);
+        }
+
+        return false;
+    }
+
     /**
      * @inheritDoc
      */

wcfsetup/install/files/lib/system/moderation/queue/AbstractCommentCommentModerationQueueHandler.class.php

@@ -187,4 +187,18 @@ public function isAffectedUser(ModerationQueue $queue, $userID)
             UserProfileRuntimeCache::getInstance()->getObject($userID)
         );
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function canRemoveContent(ModerationQueue $queue)
+    {
+        if ($this->isValid($queue->objectID)) {
+            $response = $this->getResponse($queue->objectID);
+
+            return $this->getCommentManager($response->getComment())->canDeleteResponse($response);
+        }
+
+        return false;
+    }
 }