From 9ba9d769ef7c83c98668de0998a967aedf3c30e2 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 16 Dec 2011 14:16:15 +0100
Subject: [PATCH] Fixed ACP package list

---
 wcfsetup/install/files/acp/js/WCF.ACP.js                  | 2 +-
 wcfsetup/install/files/acp/templates/packageList.tpl      | 4 ++--
 .../install/files/lib/acp/page/PackageListPage.class.php  | 8 ++------
 wcfsetup/install/files/lib/data/package/Package.class.php | 3 ++-
 .../files/lib/data/package/PackageAction.class.php        | 4 ++--
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index bcc2f0c5c4..6f3c68064f 100644
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -205,7 +205,7 @@ WCF.ACP.Package.List.prototype = {
 	_loadPage: function(event, data) {
 		// update active page
 		for (var $i = 0, $size = this._pluginLists.length; $i < $size; $i++) {
-			this._pluginLists[$i].wcfPages('overridePage', data.activePage);
+			this._pluginLists[$i].wcfPages('switchPage', data.activePage);
 		}
 		
 		// load page from cache if applicable
diff --git a/wcfsetup/install/files/acp/templates/packageList.tpl b/wcfsetup/install/files/acp/templates/packageList.tpl
index ef3bc6ec6d..4923e88e3e 100644
--- a/wcfsetup/install/files/acp/templates/packageList.tpl
+++ b/wcfsetup/install/files/acp/templates/packageList.tpl
@@ -6,7 +6,7 @@
 		WCF.TabMenu.init();
 
 		WCF.Language.add('wcf.acp.package.view.button.uninstall.sure', 'wcf.acp.package.view.button.uninstall.sure');
-		new WCF.ACP.PackageUninstallation($('.package .uninstallButton'));
+		new WCF.ACP.Package.Uninstallation($('.package .uninstallButton'));
 
 		{if $pluginsCount > 1}
 			WCF.Icon.addObject({
@@ -16,7 +16,7 @@
 				'wcf.icon.previous': '{@RELATIVE_WCF_DIR}icon/previous1.svg',
 				'wcf.icon.previous.disabled': '{@RELATIVE_WCF_DIR}icon/previous1D.svg'
 			});
-			new WCF.ACP.Package.List({@($pluginsCount / 1)|ceil});
+			new WCF.ACP.Package.List({@($pluginsCount / 20)|ceil});
 		{/if}
 	});
 	//]]>
diff --git a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
index 2bc1b32424..8fa560c8e1 100755
--- a/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/PackageListPage.class.php
@@ -44,11 +44,7 @@ class PackageListPage extends AbstractPage {
 		// read applications
 		$this->applicationList = new PackageList();
 		$this->applicationList->getConditionBuilder()->add("package.standalone = ?", array(1));
-		
-		// DEBUG ONLY - remove comment to exclude WCF from display
-		//$this->applicationList->getConditionBuilder()->add("package.packageID <> ?", array(1));
-		// DEBUG ONLY
-		
+		$this->applicationList->getConditionBuilder()->add("package.packageID <> ?", array(1));
 		$this->applicationList->sqlLimit = 0;
 		$this->applicationList->readObjects();
 		
@@ -59,7 +55,7 @@ class PackageListPage extends AbstractPage {
 		$this->pluginCount = $this->pluginList->countObjects();
 		
 		// read plugins
-		$this->pluginList->sqlLimit = 1;
+		$this->pluginList->sqlLimit = 20;
 		$this->pluginList->readObjects();
 	}
 	
diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php
index 2b68950b7f..2bb34de3a2 100644
--- a/wcfsetup/install/files/lib/data/package/Package.class.php
+++ b/wcfsetup/install/files/lib/data/package/Package.class.php
@@ -4,6 +4,7 @@ use wcf\data\DatabaseObject;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\SystemException;
 use wcf\system\io\File;
+use wcf\system\package\PackageDependencyHandler;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
@@ -558,7 +559,7 @@ class Package extends DatabaseObject {
 	 */
 	public static function getPluginList() {
 		$pluginList = new PackageList();
-		//$pluginList->getConditionBuilder()->add("package.packageID IN (?)", array(PackageDependencyHandler::getDependencies()));
+		$pluginList->getConditionBuilder()->add("package.packageID IN (?)", array(PackageDependencyHandler::getDependencies()));
 		$pluginList->getConditionBuilder()->add("package.standalone = ?", array(0));
 		
 		return $pluginList;
diff --git a/wcfsetup/install/files/lib/data/package/PackageAction.class.php b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
index 300e777d4d..284e788ad1 100644
--- a/wcfsetup/install/files/lib/data/package/PackageAction.class.php
+++ b/wcfsetup/install/files/lib/data/package/PackageAction.class.php
@@ -46,8 +46,8 @@ class PackageAction extends AbstractDatabaseObjectAction {
 	 */
 	public function getPluginList() {
 		$pluginList = Package::getPluginList();
-		$pluginList->sqlLimit = 1;
-		$pluginList->sqlOffset = (($this->parameters['activePage'] - 1) * 1);
+		$pluginList->sqlLimit = 20;
+		$pluginList->sqlOffset = (($this->parameters['activePage'] - 1) * 20);
 		$pluginList->readObjects();
 		
 		WCF::getTPL()->assign(array(
-- 
2.20.1