From d48bcf6a6a9f7fe105433748cef44860625582b8 Mon Sep 17 00:00:00 2001 From: flyskyko Date: Fri, 26 Aug 2011 08:41:53 +0000 Subject: [PATCH] change pagenavitor code git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8919 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/autoinstall/autoinstall.admin.view.php | 2 +- modules/autoinstall/autoinstall.model.php | 8 ++++---- modules/autoinstall/tpl/list.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 420f9aec7..f3145fcc2 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -276,7 +276,7 @@ Context::set('item_list', $item_list); $array = array('total_count', 'total_page', 'cur_page', 'page_count', 'first_page', 'last_page'); $page_nav = $this->rearrange($xmlDoc->response->page_navigation, $array); - $page_navigation = new PageHandler($page_nav->total_count, $page_nav->total_page, $page_nav->cur_page, $page_nav->page_count); + $page_navigation = new PageHandler($page_nav->total_count, $page_nav->total_page, $page_nav->cur_page, 5); Context::set('page_navigation', $page_navigation); } diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php index c3bed9eb9..753f1801d 100644 --- a/modules/autoinstall/autoinstall.model.php +++ b/modules/autoinstall/autoinstall.model.php @@ -204,7 +204,7 @@ { if (!$packageSrl) return; - return getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl); + return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl); } function getRemoveUrlByPath($path) @@ -214,14 +214,14 @@ $packageSrl = $this->getPackageSrlByPath($path); if (!$packageSrl) return; - return getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl); + return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl); } function getUpdateUrlByPackageSrl($packageSrl) { if (!$packageSrl) return; - return getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl); + return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl); } function getUpdateUrlByPath($path) @@ -231,7 +231,7 @@ $packageSrl = $this->getPackageSrlByPath($path); if (!$packageSrl) return; - return getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl); + return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl); } } ?> diff --git a/modules/autoinstall/tpl/list.html b/modules/autoinstall/tpl/list.html index 54af5dcb1..a399bc347 100644 --- a/modules/autoinstall/tpl/list.html +++ b/modules/autoinstall/tpl/list.html @@ -81,7 +81,7 @@ « FIRST 1 - ... + ... {@$last_page = $page_no}