${Language.get("wcf.style.colorPicker.new")}
@@ -356,13 +356,13 @@ class UiColorPicker implements DialogCallbackObject {
this.oldColor!.style.backgroundColor = colorString;
this.input.value = colorString;
- if (!(this.element instanceof HTMLButtonElement)) {
- const span = this.element.querySelector("span");
- if (span) {
- span.style.backgroundColor = colorString;
- } else {
- this.element.style.backgroundColor = colorString;
- }
+ const event = new CustomEvent
-
+
-
+
${Language.get("wcf.style.colorPicker.current")}
{lang}wcf.acp.menu.link.trophy.{$action}{/lang}
@@ -34,243 +17,12 @@ -{include file='shared_formNotice'} - -{if $trophyCategories|count} - -{else} -
{unsafe:$gridView->render()}
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_trophy.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_trophy.php
new file mode 100644
index 00000000000..dbd109ea315
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_trophy.php
@@ -0,0 +1,59 @@
+exportConditions("com.woltlab.wcf.condition.trophy");
+if ($exportedConditions === []) {
+ return;
+}
+
+$sql = "UPDATE wcf1_trophy
+ SET conditions = ?,
+ isLegacy = ?
+ WHERE trophyID = ?";
+$statement = WCF::getDB()->prepare($sql);
+foreach ($exportedConditions as $trophyID => $conditionData) {
+ renameObjectTypes($conditionData);
+
+ $statement->execute([
+ JSON::encode($conditionData),
+ 1,
+ $trophyID,
+ ]);
+}
+
+/**
+ * Rename the object types so that the migration functions can handle them.
+ * @see \wcf\system\condition\provider\UserConditionProvider
+ *
+ * @param array
${Language.get("wcf.style.colorPicker.new")}
@@ -282,14 +282,12 @@ define(["require", "exports", "tslib", "../../Core", "../Dialog", "../../Dom/Uti
const colorString = ColorUtil.rgbaToString(color);
this.oldColor.style.backgroundColor = colorString;
this.input.value = colorString;
- if (!(this.element instanceof HTMLButtonElement)) {
- const span = this.element.querySelector("span");
- if (span) {
- span.style.backgroundColor = colorString;
- }
- else {
- this.element.style.backgroundColor = colorString;
- }
+ const event = new CustomEvent("color-picker:submit");
+ this.input.dispatchEvent(event);
+ const span = this.element.querySelector("span");
+ if (span !== null) {
+ span.classList.add("colorPickerButton__color");
+ span.style.setProperty("background-color", colorString);
}
Dialog_1.default.close(this);
if (typeof this.options.callbackSubmit === "function") {
diff --git a/wcfsetup/install/files/lib/acp/form/TrophyAddForm.class.php b/wcfsetup/install/files/lib/acp/form/TrophyAddForm.class.php
index 5ba22be8b67..ffe034803fe 100644
--- a/wcfsetup/install/files/lib/acp/form/TrophyAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/TrophyAddForm.class.php
@@ -2,30 +2,41 @@
namespace wcf\acp\form;
-use wcf\data\object\type\ObjectType;
-use wcf\data\trophy\category\TrophyCategory;
use wcf\data\trophy\category\TrophyCategoryCache;
use wcf\data\trophy\Trophy;
use wcf\data\trophy\TrophyAction;
-use wcf\data\trophy\TrophyEditor;
-use wcf\system\condition\ConditionHandler;
-use wcf\system\exception\UserInputException;
-use wcf\system\language\I18nValue;
-use wcf\system\request\LinkHandler;
-use wcf\system\style\FontAwesomeIcon;
-use wcf\system\trophy\condition\TrophyConditionHandler;
+use wcf\data\trophy\TrophyList;
+use wcf\form\AbstractFormBuilderForm;
+use wcf\system\condition\provider\UserConditionProvider;
+use wcf\system\exception\NamedUserException;
+use wcf\system\form\builder\container\condition\ConditionFormContainer;
+use wcf\system\form\builder\container\FormContainer;
+use wcf\system\form\builder\container\RowFormContainer;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\ColorFormField;
+use wcf\system\form\builder\field\dependency\NonEmptyFormFieldDependency;
+use wcf\system\form\builder\field\dependency\ValueFormFieldDependency;
+use wcf\system\form\builder\field\DescriptionFormField;
+use wcf\system\form\builder\field\FileProcessorFormField;
+use wcf\system\form\builder\field\IconFormField;
+use wcf\system\form\builder\field\RadioButtonFormField;
+use wcf\system\form\builder\field\ShowOrderFormField;
+use wcf\system\form\builder\field\SingleSelectionFormField;
+use wcf\system\form\builder\field\TitleFormField;
use wcf\system\WCF;
-use wcf\util\StringUtil;
+use wcf\util\HtmlString;
/**
* Represents the trophy add form.
*
- * @author Joshua Ruesweg
- * @copyright 2001-2019 WoltLab GmbH
+ * @author Olaf Braun, Joshua Ruesweg
+ * @copyright 2001-2025 WoltLab GmbH
* @license GNU Lesser General Public License
-
+
-
+
${Language.get("wcf.style.colorPicker.current")}