fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

fixed favorite

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9058 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2011-09-06 09:40:56 +00:00
parent 06e7fb34e5
commit cc435a01ff
2 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/admin/admin.admin.model.php
View file

@ -347,7 +347,8 @@
foreach($output->data AS $key=>$value)
{
$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
$value->admin_index_act = $moduleInfo->admin_index_act;
$output->data[$key]->admin_index_act = $moduleInfo->admin_index_act;
$output->data[$key]->title = $moduleInfo->title;
}
}

18
modules/admin/admin.admin.view.php
View file

@ -280,22 +280,6 @@
Context::set('module_list', $module_list);
Context::set('isUpdated', $isUpdated);
// favorite
$oAdminModel = &getAdminModel('admin');
$output = $oAdminModel->getFavoriteList(0);
$favorite_list = $output->get('favoriteList');
if ($favorite_list)
{
foreach($favorite_list as $no => $favorite)
{
$module_info = $oModuleModel->getModuleInfoXml($favorite->module);
if (!$module_info) continue;
$favorite_list[$no] = $module_info;
$favorite_list[$no]->module = $favorite->module;
}
}
Context::set('favorite_list', $favorite_list);
// gathering enviroment check
$path = FileHandler::getRealPath('./files/env/'.__ZBXE_VERSION__);
$isEnviromentGatheringAgreement = false;
@ -306,7 +290,7 @@
// Get list of favorite
$oAdminAdminModel = &getAdminModel('admin');
$output = $oAdminAdminModel->getFavoriteList(0, true);
Context::set('favorite_list', $output->data);
Context::set('favorite_list', $output->get('favoriteList'));
$this->setTemplateFile('index');
}