From f3574368cee7d4e2b0714816a2dc451e4bc7d47b Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 13 Mar 2007 07:31:58 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@394 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.model.php | 9 +++++++-- modules/module/tpl.admin/module_list.html | 7 +++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/admin/admin.model.php b/modules/admin/admin.model.php index ab31db73c..36dc3ede6 100644 --- a/modules/admin/admin.model.php +++ b/modules/admin/admin.model.php @@ -21,8 +21,13 @@ $output = $oDB->executeQuery('admin.getShortCutList'); if(!$output->toBool()) return $output; - if(!is_array($output->data)) return array($output->data); - return $output->data; + if(!is_array($output->data)) $list = array($output->data); + else $list = $output->data; + + foreach($list as $val) { + $shortcut_list[$val->module] = $val; + } + return $shortcut_list; } } diff --git a/modules/module/tpl.admin/module_list.html b/modules/module/tpl.admin/module_list.html index cb4d85943..9424ca48f 100644 --- a/modules/module/tpl.admin/module_list.html +++ b/modules/module/tpl.admin/module_list.html @@ -41,7 +41,11 @@ {$val->path} - {$lang->cmd_add_shortcut} + + + {$lang->cmd_add_shortcut} + + @@ -50,4 +54,3 @@ -