Simplifies code

diff --git a/wcfsetup/install/files/acp/templates/applicationManagement.tpl b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
index 8083c34877b0862e345f0d72bdc8dac927c68c0e..59724d55937e54be1c4ea08c3a23b2f6c9d9858e 100644 (file)
--- a/wcfsetup/install/files/acp/templates/applicationManagement.tpl
+++ b/wcfsetup/install/files/acp/templates/applicationManagement.tpl
@@ -116,10 +116,10 @@
                <nav>
                        <ul>
                                {content}
-                                       {if $canAddApplicationGroup}
+                                       {if $applications|count > 1}
                                                <li><a href="{link controller='ApplicationGroupAdd'}{/link}" class="button"><img src="{@RELATIVE_WCF_DIR}icon/add.svg" class="icon24" /> <span>{lang}wcf.acp.application.group.add{/lang}</span></a></li>
                                        {/if}
-
+                                       
                                        {* todo: event *}
                                {/content}
                        </ul>

diff --git a/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php b/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php
index 8c9da2497ccc75e3832e485b94970f60bb338fab..1d46ebfa5cbea818a37d91ef0a982e7c54e87f8c 100644 (file)
--- a/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ApplicationManagementPage.class.php
@@ -30,12 +30,6 @@ class ApplicationManagementPage extends AbstractPage {
         */
        public $applicationGroups = null;
        
-       /**
-        * indicates if an application group can be created
-        * @var boolean
-        */
-       public $canAddApplicationGroup = true;
-       
        /**
         * number of ungrouped applications
         * @var integer
@@ -72,8 +66,6 @@ class ApplicationManagementPage extends AbstractPage {
                                $this->applicationGroups[$application->groupID]->addApplication($application);
                        }
                }
-               
-               $this->canAddApplicationGroup = count($applicationList) > 1 && count($this->applications) > 0;
        }
        
        /**
@@ -84,8 +76,7 @@ class ApplicationManagementPage extends AbstractPage {
                
                WCF::getTPL()->assign(array(
                        'applications' => $this->applications,
-                       'applicationGroups' => $this->applicationGroups,
-                       'canAddApplicationGroup' => $this->canAddApplicationGroup
+                       'applicationGroups' => $this->applicationGroups
                ));
        }