[-] Installer : Fix country_to_timezone in last step

[+] BO : now AdminProducts and AdminCategories are separated from AdminCatalog
[+] FO : new method Category::getAllChildren() (the return value is an array, but can evolve to a collection
// Uses of Media:: in header.inc.php 

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9097 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-10-06 13:02:24 +00:00
parent 646eda2e4e
commit f9bcf3f84f
9 changed files with 286 additions and 278 deletions
+4 -4
View File
@@ -187,8 +187,8 @@ abstract class AdminTabCore
public $ignore_sleep = false;
public static $tabParenting = array(
'AdminProducts' => 'AdminCatalog',
'AdminCategories' => 'AdminCatalog',
// 'AdminProducts' => 'AdminCatalog',
// 'AdminCategories' => 'AdminCatalog',
'AdminCMS' => 'AdminCMSContent',
'AdminCMSCategories' => 'AdminCMSContent',
'AdminOrdersStates' => 'AdminStatuses',
@@ -222,8 +222,8 @@ abstract class AdminTabCore
if (!$this->identifier) $this->identifier = 'id_'.$this->table;
if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
$className = get_class($this);
if ($className == 'AdminCategories' OR $className == 'AdminProducts')
$className = 'AdminCatalog';
// if ($className == 'AdminCategories' OR $className == 'AdminProducts')
// $className = 'AdminCatalog';
$this->token = Tools::getAdminToken($className.(int)$this->id.(int)$this->context->employee->id);
if (!Shop::isMultiShopActivated())
+13
View File
@@ -652,6 +652,19 @@ class CategoryCore extends ObjectModel
ORDER BY `position` ASC');
}
/** return an array of all children of the current category
*
* @return array rows of table category
* @todo return hydrateCollection
*/
public function getAllChildren()
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT *
FROM `'._DB_PREFIX_.'category`
WHERE '. $this->nleft . ' < nleft AND nright < '. $this->nright);
}
/**
* This method allow to return children categories with the number of sub children selected for a product
*