Added category 'application', moved 'clear cache'

diff --git a/com.woltlab.wcf/acpMenu.xml b/com.woltlab.wcf/acpMenu.xml
index a571b014ec089c9f6535f756360a7542ef13c018..8f3a4ecf0dd3754f26e1c0f3676d21b68edfd50b 100644 (file)
--- a/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@ -127,12 +127,6 @@
                        <permissions>admin.system.canViewLog</permissions>
                </acpmenuitem>
                
-               <acpmenuitem name="wcf.acp.menu.link.log.cache">
-                       <link>index.php/CacheList/</link>
-                       <parent>wcf.acp.menu.link.log</parent>
-                       <permissions>admin.system.canViewLog</permissions>
-               </acpmenuitem>
-               
                <acpmenuitem name="wcf.acp.menu.link.log.cronjob">
                        <link>index.php/CronjobLogList/</link>
                        <parent>wcf.acp.menu.link.log</parent>
@@ -140,6 +134,25 @@
                </acpmenuitem>
                <!-- /log -->
                
+               <!-- application -->
+               <acpmenuitem name="wcf.acp.menu.link.application">
+                       <parent>wcf.acp.menu.link.system</parent>
+                       <showorder>5</showorder>
+               </acpmenuitem>
+               
+               <acpmenuitem name="wcf.acp.menu.link.application.management">
+                       <link>index.php/ApplicationManagement/</link>
+                       <parent>wcf.acp.menu.link.application</parent>
+                       <permissions>admin.system.canManageApplication</permissions>
+               </acpmenuitem>
+               
+               <acpmenuitem name="wcf.acp.menu.link.application.cache">
+                       <link>index.php/CacheList/</link>
+                       <parent>wcf.acp.menu.link.log</parent>
+                       <permissions>admin.system.canManageApplication</permissions>
+               </acpmenuitem>
+               <!-- /application -->
+               
                <acpmenuitem name="wcf.acp.menu.link.user">
                        <showorder>2</showorder>
                </acpmenuitem>

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index f12522c1afe7b9b8d6e946615d37706ada8f3379..45c703cf7554e849b8eb00dba67ad7bf3072596f 100644 (file)
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -72,6 +72,12 @@
                                <defaultvalue>0</defaultvalue>
                                <admindefaultvalue>1</admindefaultvalue>
                        </option>
+                       <option name="admin.system.canManageApplication">
+                               <categoryname>admin.system</categoryname>
+                               <optiontype>boolean</optiontype>
+                               <defaultvalue>0</defaultvalue>
+                               <admindefaultvalue>1</admindefaultvalue>
+                       </option>
                        <option name="admin.system.cronjob.canAddCronjob">
                                <categoryname>admin.system.cronjob</categoryname>
                                <optiontype>boolean</optiontype>

diff --git a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
index 7dc48881501ba2592a9fa7e9470cc0f89430ae14..ee9fa388b2b6b05364df5e773b3d55d517a8b587 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CacheListPage.class.php
@@ -26,7 +26,7 @@ class CacheListPage extends AbstractPage {
        /**
         * @see wcf\page\AbstractPage::$neededPermissions
         */
-       public $neededPermissions = array('admin.system.canViewLog');
+       public $neededPermissions = array('admin.system.canManageApplication');
        
        /**
         * indicates if cache was cleared
@@ -202,7 +202,7 @@ class CacheListPage extends AbstractPage {
         */
        public function show() {
                // enable menu item
-               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.log.cache');
+               ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.application.cache');
                
                parent::show();
        }