Merge pull request #6479 from WoltLab/6.2-bootstrap-acp-menu-items

Create ACP menu items via bootstrap file

Author: BurntimeX

com.woltlab.wcf/acpMenu.xml

@@ -185,13 +185,6 @@
 				<admindefaultvalue>1</admindefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
-			<option name="admin.configuration.package.canUninstallPackage">
-				<categoryname>admin.configuration.package</categoryname>
-				<optiontype>boolean</optiontype>
-				<defaultvalue>0</defaultvalue>
-				<admindefaultvalue>1</admindefaultvalue>
-				<usersonly>1</usersonly>
-			</option>
 			<option name="admin.configuration.package.canEditServer">
 				<categoryname>admin.configuration.package</categoryname>
 				<optiontype>boolean</optiontype>
@@ -1081,5 +1074,6 @@ webp</defaultvalue>
 	</import>
 	<delete>
 		<option name="user.profile.avatar.maxSize"/>
+		<option name="admin.configuration.package.canUninstallPackage"/>
 	</delete>
 </data>

com.woltlab.wcf/userGroupOption.xml

@@ -8,7 +8,7 @@
 			'wcf.acp.package.uninstallation.title': '{jslang}wcf.acp.package.uninstallation.title{/jslang}',
 		});
 		
-		{if $__wcf->session->getPermission('admin.configuration.package.canUninstallPackage')}
+		{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage')}
 			new WCF.ACP.Package.Uninstallation($('.jsPackageRow .jsUninstallButton'));
 		{/if}
 		

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

@@ -28,22 +28,15 @@
 								{if $_subMenuItems|empty}
 									<li{if $_menuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_menuItem->getLink()}" class="acpPageSubMenuLink">{$_menuItem}</a></li>
 								{else}
-									{if $_menuItem->menuItem === 'wcf.acp.menu.link.option.category'}
-										{* handle special option categories *}
+									<li class="acpPageSubMenuLinkWrapper">
+										<a href="{$_menuItem->getLink()}" class="acpPageSubMenuLink{if $_menuItem->menuItem|in_array:$_activeMenuItems && $_activeMenuItems[0] === $_menuItem->menuItem} active{/if}">{$_menuItem}</a>
+										
 										{foreach from=$_subMenuItems item=_subMenuItem}
-											<li{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} class="active"{/if}><a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuLink">{$_subMenuItem}</a></li>
+											<a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuIcon jsTooltip{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" title="{$_subMenuItem}">
+												{unsafe:$_subMenuItem->getIcon()->toHtml()}
+											</a>
 										{/foreach}
-									{else}
-										<li class="acpPageSubMenuLinkWrapper">
-											<a href="{$_menuItem->getLink()}" class="acpPageSubMenuLink{if $_menuItem->menuItem|in_array:$_activeMenuItems && $_activeMenuItems[0] === $_menuItem->menuItem} active{/if}">{$_menuItem}</a>
-											
-											{foreach from=$_subMenuItems item=_subMenuItem}
-												<a href="{$_subMenuItem->getLink()}" class="acpPageSubMenuIcon jsTooltip{if $_subMenuItem->menuItem|in_array:$_activeMenuItems} active{/if}" title="{$_subMenuItem}">
-													{unsafe:$_subMenuItem->getIcon()->toHtml()}
-												</a>
-											{/foreach}
-										</li>
-									{/if}
+									</li>
 								{/if}
 							{/foreach}
 						</ol>

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

@@ -30,7 +30,7 @@ final class PackageListPage extends AbstractGridViewPage
      */
     public $neededPermissions = [
         'admin.configuration.package.canUpdatePackage',
-        'admin.configuration.package.canUninstallPackage',
+        'admin.configuration.package.canInstallPackage',
     ];
 
     #[\Override]

wcfsetup/install/files/lib/acp/page/PackageListPage.class.php

@@ -31,7 +31,7 @@ class PackagePage extends AbstractPage
      */
     public $neededPermissions = [
         'admin.configuration.package.canUpdatePackage',
-        'admin.configuration.package.canUninstallPackage',
+        'admin.configuration.package.canInstallPackage',
     ];
 
     /**

wcfsetup/install/files/lib/acp/page/PackagePage.class.php

@@ -67,12 +67,6 @@ public function getLink(): string
             'application' => $this->application,
         ];
 
-        // links of top option category menu items need the id of the option
-        // category
-        if ($this->parentMenuItem == 'wcf.acp.menu.link.option.category') {
-            $linkParameters['id'] = $this->optionCategoryID;
-        }
-
         return LinkHandler::getInstance()->getLink(
             $this->controller,
             $linkParameters,
@@ -119,14 +113,6 @@ protected function parseController()
      */
     public function __toString(): string
     {
-        // This is a placeholder category that represents the dynamic menu items
-        // generated by categories in the `options.xml`. It has no title and
-        // trying to access its name causes a false-positive for missing phrases
-        // with every ACP request.
-        if ($this->menuItem === 'wcf.acp.menu.link.option.category') {
-            return 'wcf.acp.menu.link.option.category';
-        }
-
         return WCF::getLanguage()->get($this->menuItem);
     }
 

wcfsetup/install/files/lib/bootstrap/com.woltlab.wcf.php

@@ -220,7 +220,7 @@ public function getAllRequiredPackages()
      */
     public function canUninstall()
     {
-        if (!WCF::getSession()->getPermission('admin.configuration.package.canUninstallPackage')) {
+        if (!WCF::getSession()->getPermission('admin.configuration.package.canInstallPackage')) {
             return false;
         }
 

wcfsetup/install/files/lib/data/acp/menu/item/ACPMenuItem.class.php

@@ -28,7 +28,7 @@ class PackageAction extends AbstractDatabaseObjectAction
     /**
      * @inheritDoc
      */
-    protected $permissionsDelete = ['admin.configuration.package.canUninstallPackage'];
+    protected $permissionsDelete = ['admin.configuration.package.canInstallPackage'];
 
     /**
      * @inheritDoc