Use page identifier for the label

Author: Cyperghost

ts/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.ts

@@ -10,19 +10,21 @@ import * as UiPageSearchHandler from "../../../../Ui/Page/Search/Handler";
 import { getPhrase } from "WoltLabSuite/Core/Language";
 
 export class AcpUiMenuItemHandler {
-  private readonly handlers: Map<number, boolean>;
-  private readonly pageId: HTMLSelectElement;
-  private readonly pageObjectId: HTMLInputElement;
+  readonly #handlers: Map<number, boolean>;
+  readonly #identifiers: Map<number, string>;
+  readonly #pageId: HTMLSelectElement;
+  readonly #pageObjectId: HTMLInputElement;
 
   /**
    * Initializes the interface logic.
    */
-  constructor(fieldPrefix: string, handlers: Map<number, boolean>) {
-    this.handlers = handlers;
+  constructor(fieldPrefix: string, handlers: Map<number, boolean>, identifiers: Map<number, string>) {
+    this.#handlers = handlers;
+    this.#identifiers = identifiers;
 
-    if (this.handlers.size) {
-      this.pageId = document.getElementById("pageID") as HTMLSelectElement;
-      this.pageObjectId = document.getElementById(fieldPrefix) as HTMLInputElement;
+    if (this.#handlers.size) {
+      this.#pageId = document.getElementById("pageID") as HTMLSelectElement;
+      this.#pageObjectId = document.getElementById(fieldPrefix) as HTMLInputElement;
 
       const searchButton = document.getElementById(fieldPrefix + "Search")!;
       searchButton.addEventListener("click", () => this.openSearch());
@@ -33,8 +35,8 @@ export class AcpUiMenuItemHandler {
    * Opens the handler lookup dialog.
    */
   private openSearch(): void {
-    const selectedOption = this.pageId.options[this.pageId.selectedIndex];
-    const pageIdentifier = selectedOption.dataset.identifier!;
+    const selectedOption = this.#pageId.options[this.#pageId.selectedIndex];
+    const pageIdentifier = this.#identifiers.get(parseInt(selectedOption.value));
     const languageItem = `wcf.page.pageObjectID.search.${pageIdentifier}`;
 
     let labelLanguageItem;
@@ -46,7 +48,7 @@ export class AcpUiMenuItemHandler {
       parseInt(selectedOption.value),
       selectedOption.textContent!.trim(),
       (objectId) => {
-        this.pageObjectId.value = objectId.toString();
+        this.#pageObjectId.value = objectId.toString();
       },
       labelLanguageItem,
     );

wcfsetup/install/files/acp/templates/__pageObjectIDFormField.tpl

@@ -27,9 +27,26 @@
 	{jsphrase name='wcf.page.pageObjectID.search.results'}
 	{jsphrase name='wcf.page.pageObjectID.search.terms'}
 
-	require(['WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler'], ({ AcpUiMenuItemHandler }) => {
+	require(['Language', 'WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler'], (Language, { AcpUiMenuItemHandler }) => {
+		Language.addObject({
+			{foreach from=$pageNodeList item=pageNode}
+			{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.{@$pageNode->identifier}{/lang}{/capture}
+			{if $pageObjectIDLanguageItem}
+				'wcf.page.pageObjectID.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
+			{/if}
+			{capture assign='pageObjectIDLanguageItem'}{lang __optional=true}wcf.page.pageObjectID.search.{@$pageNode->identifier}{/lang}{/capture}
+			{if $pageObjectIDLanguageItem}
+				'wcf.page.pageObjectID.search.{@$pageNode->identifier}': '{@$pageObjectIDLanguageItem|encodeJS}',
+			{/if}
+			{/foreach}
+		});
+
 		new AcpUiMenuItemHandler('{unsafe:$field->getPrefixedId()|encodeJS}', new Map([
 			{implode from=$pageHandlers key=handlerPageID item=requireObjectID glue=', '}[{$handlerPageID}, {if $requireObjectID}true{else}false{/if}]{/implode}
+		]), new Map([
+			{foreach from=$pageNodeList item=pageNode}
+				[{$pageNode->pageID}, '{unsafe:$pageNode->identifier|encodeJS}'],
+			{/foreach}
 		]));
 	});
 </script>

wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Menu/Item/Handler.js

@@ -153,7 +153,7 @@ protected function createForm()
                                 ->fieldId('isInternalLink')
                                 ->values([1])
                         ),
-                    $this->getPageObjectIDFormField($pageHandlers)
+                    $this->getPageObjectIDFormField($pageNodeList, $pageHandlers)
                         ->id('pageObjectID')
                         ->label('wcf.page.pageObjectID')
                         ->addFieldClass('short')
@@ -292,23 +292,28 @@ protected function setFormAction()
         );
     }
 
-    protected function getPageObjectIDFormField(array $pageHandlers): IntegerFormField
-    {
-        return new class($pageHandlers) extends IntegerFormField {
+    protected function getPageObjectIDFormField(
+        \RecursiveIteratorIterator $pageNodeList,
+        array $pageHandlers
+    ): IntegerFormField {
+        return new class($pageNodeList, $pageHandlers) extends IntegerFormField {
             protected $templateName = '__pageObjectIDFormField';
             protected array $pageHandlers;
+            protected \RecursiveIteratorIterator $pageNodeList;
 
-            public function __construct(array $pageHandlers)
+            public function __construct(\RecursiveIteratorIterator $pageNodeList, array $pageHandlers)
             {
                 parent::__construct();
                 $this->pageHandlers = $pageHandlers;
+                $this->pageNodeList = $pageNodeList;
             }
 
             #[\Override]
             public function getHtmlVariables()
             {
                 return array_merge(parent::getHtmlVariables(), [
-                    'pageHandlers' => $this->pageHandlers
+                    'pageHandlers' => $this->pageHandlers,
+                    'pageNodeList' => $this->pageNodeList,
                 ]);
             }
         };