From 8a2555fdfd97ee18bc6ce135e4b964a91cea49ca Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sat, 20 Mar 2021 13:09:28 +0100 Subject: [PATCH] Use ObjectActionFunctionTemplatePlugin in more places in ACP --- ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts | 2 +- .../files/acp/templates/labelGroupList.tpl | 12 +++--------- .../install/files/acp/templates/labelList.tpl | 10 +++------- .../files/acp/templates/languageList.tpl | 10 ++++------ .../files/acp/templates/menuItemList.tpl | 8 +++----- .../install/files/acp/templates/menuList.tpl | 12 +++--------- .../files/acp/templates/noticeList.tpl | 13 ++++--------- .../acp/templates/packageUpdateServerList.tpl | 19 ++++++++----------- .../install/files/acp/templates/pageList.tpl | 15 ++++----------- .../acp/templates/paidSubscriptionList.tpl | 8 ++++---- .../files/acp/templates/reactionTypeList.tpl | 7 +++---- .../files/acp/templates/sitemapList.tpl | 16 +++++++--------- .../files/acp/templates/smileyList.tpl | 10 +++------- .../files/acp/templates/templateGroupList.tpl | 12 +++--------- .../files/acp/templates/templateList.tpl | 12 +++--------- .../files/acp/templates/trophyList.tpl | 13 ++++--------- .../acp/templates/userGroupAssignmentList.tpl | 15 ++++----------- .../files/acp/templates/userGroupList.tpl | 12 +++--------- .../install/files/acp/templates/userList.tpl | 12 ++++-------- .../acp/templates/userOptionCategoryList.tpl | 12 +++--------- .../files/acp/templates/userOptionList.tpl | 15 ++++----------- .../files/acp/templates/userRankList.tpl | 10 +++------- .../WoltLabSuite/Core/Acp/Ui/User/Editor.js | 2 +- wcfsetup/install/lang/de.xml | 19 ------------------- wcfsetup/install/lang/en.xml | 19 ------------------- 25 files changed, 82 insertions(+), 213 deletions(-) diff --git a/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts b/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts index e5c0d20f05..2d0139552d 100644 --- a/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts +++ b/ts/WoltLabSuite/Core/Acp/Ui/User/Editor.ts @@ -152,7 +152,7 @@ class AcpUiUserEditor { const items: HTMLLIElement[] = []; let deleteButton: HTMLAnchorElement | null = null; Array.from(legacyButtonContainer.children).forEach((button: HTMLAnchorElement) => { - if (button.classList.contains("jsDeleteButton")) { + if (button.classList.contains("jsObjectAction") && button.dataset.objectAction === "delete") { deleteButton = button; return; diff --git a/wcfsetup/install/files/acp/templates/labelGroupList.tpl b/wcfsetup/install/files/acp/templates/labelGroupList.tpl index c8ea67cef8..9eefef0a61 100644 --- a/wcfsetup/install/files/acp/templates/labelGroupList.tpl +++ b/wcfsetup/install/files/acp/templates/labelGroupList.tpl @@ -1,11 +1,5 @@ {include file='header' pageTitle='wcf.acp.label.group.list'} - -

{lang}wcf.acp.label.group.list{/lang}{if $items} {#$items}{/if}

@@ -67,7 +61,7 @@ {if $objects|count}
- +
@@ -82,10 +76,10 @@ {foreach from=$objects item=group} - + diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl index dd4c6ecb35..1b38acdea5 100644 --- a/wcfsetup/install/files/acp/templates/labelList.tpl +++ b/wcfsetup/install/files/acp/templates/labelList.tpl @@ -1,10 +1,6 @@ {include file='header' pageTitle='wcf.acp.label.list'} @@ -39,7 +37,7 @@ {if $objects|count}
-
{lang}wcf.global.objectID{/lang}
- + {objectAction action="delete" objectTitle=$group->getTitle()} {event name='rowButtons'}
+
@@ -54,12 +52,12 @@ {foreach from=$objects item=language} - +
{lang}wcf.global.objectID{/lang}
{if !$language->isDefault} - + {objectAction action="toggle" isDisabled=$language->isDisabled} {else} @@ -69,7 +67,7 @@ {if $language->isDeletable()} - + {objectAction action="delete" objectTitle=$language->languageName} {else} {/if} diff --git a/wcfsetup/install/files/acp/templates/menuItemList.tpl b/wcfsetup/install/files/acp/templates/menuItemList.tpl index 5158bc86eb..5f5e1c6a44 100644 --- a/wcfsetup/install/files/acp/templates/menuItemList.tpl +++ b/wcfsetup/install/files/acp/templates/menuItemList.tpl @@ -15,8 +15,6 @@ }); $(function() { - new WCF.Action.Toggle('wcf\\data\\menu\\item\\MenuItemAction', '.sortableNode', '> .sortableNodeLabel .jsToggleButton'); - var deleteAction = new WCF.Action.Delete('wcf\\data\\menu\\item\\MenuItemAction', '.sortableNode', '> .sortableNodeLabel .jsDeleteButton'); var mpTriggerEffect = deleteAction.triggerEffect; deleteAction.triggerEffect = function (objectIDs) { @@ -51,16 +49,16 @@ {hascontent}