From 45f8ff88ed4355ad828754393737b111e09fe5a0 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Tue, 18 Sep 2012 06:48:49 +0000 Subject: [PATCH] issue 1945, do not display incorrect packages git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11301 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/autoinstall.admin.view.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 1d4ac4abd..e1bdaf691 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -259,10 +259,23 @@ $res = array(); foreach($package_list as $package_srl => $package) { - $res[] = $item_list[$package_srl]; + if($item_list[$package_srl]) + { + $res[] = $item_list[$package_srl]; + } } Context::set('item_list', $res); } + + if(count($package_list) != count($res)) + { + $localPackageSrls = array_keys($package_list); + $remotePackageSrls = array_keys($item_list); + $targetPackageSrls = array_diff($localPackageSrls, $remotePackageSrls); + $countDiff = count($targetPackageSrls); + $output->page_navigation->total_count -= $countDiff; + } + Context::set('page_navigation', $output->page_navigation); $this->setTemplateFile('index');