dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] BO : #PSFV-94 - added AdminTabsController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9765 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-01 10:32:07 +00:00
parent 10c9a90307
commit 3ffa50d1ac
7 changed files with 353 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+5 -5
View File
@@ -1154,9 +1154,9 @@ class AdminControllerCore extends Controller
if (file_exists($this->context->smarty->template_dir[0].'/'.$this->tpl_folder.'list_header.tpl'))
$helper->header_tpl = $this->tpl_folder.'list_header.tpl';
if (file_exists($this->context->smarty->template_dir[0].'/'.$this->tpl_folder.'list_content.tpl'))
$helper->header_tpl = $this->tpl_folder.'list_content.tpl';
$helper->content_tpl = $this->tpl_folder.'list_content.tpl';
if (file_exists($this->context->smarty->template_dir[0].'/'.$this->tpl_folder.'list_footer.tpl'))
$helper->header_tpl = $this->tpl_folder.'list_footer.tpl';
$helper->footer_tpl = $this->tpl_folder.'list_footer.tpl';
// For compatibility reasons, we have to check standard actions in class attributes
foreach ($this->actions_available as $action)
@@ -1538,10 +1538,10 @@ class AdminControllerCore extends Controller
$use_limit = false;
else if (empty($limit))
{
if (!isset($this->context->cookie->{$this->table.'_pagination'}))
$limit = $this->_pagination[1];
else
if (isset($this->context->cookie->{$this->table.'_pagination'}) && $this->context->cookie->{$this->table.'_pagination'})
$limit = $this->context->cookie->{$this->table.'_pagination'};
else
$limit = $this->_pagination[1];
}
if (!Validate::isTableOrIdentifier($this->table))
classes/HelperList.php
+4 -2
View File
@@ -96,7 +96,9 @@ class HelperListCore extends Helper
'id_cms_category' => 'id_cms_category_to_move',
'id_cms' => 'id_cms',
'id_attribute' => 'id_attribute',
'id_carrier' => 'id_carrier'
'id_attribute_group' => 'id_attribute_group',
'id_carrier' => 'id_carrier',
'id_tab' => 'id_tab'
);
/** @var if not null, a title will be added on that list */
@@ -422,7 +424,7 @@ class HelperListCore extends Helper
$token = $this->token;
/* Determine total page number */
if (isset($this->context->cookie->{$this->table.'_pagination'}))
if (isset($this->context->cookie->{$this->table.'_pagination'}) && $this->context->cookie->{$this->table.'_pagination'})
$default_pagination = $this->context->cookie->{$this->table.'_pagination'};
else
$default_pagination = $this->_pagination[0];
classes/Tab.php
+88 -29
View File
@@ -43,7 +43,11 @@ class TabCore extends ObjectModel
protected $fieldsRequired = array('class_name', 'position');
protected $fieldsSize = array('class_name' => 64, 'module' => 64);
protected $fieldsValidate = array('id_parent' => 'isInt', 'position' => 'isUnsignedInt', 'module' => 'isTabName');
protected $fieldsValidate = array(
'id_parent' => 'isInt',
'position' => 'isUnsignedInt',
'module' => 'isTabName'
);
protected $fieldsRequiredLang = array('name');
protected $fieldsSizeLang = array('name' => 32);
@@ -104,7 +108,11 @@ class TabCore extends ObjectModel
if (!$context->employee->id_profile)
return false;
/* Profile selection */
$profiles = Db::getInstance()->executeS('SELECT `id_profile` FROM '._DB_PREFIX_.'profile where `id_profile` != 1');
$profiles = Db::getInstance()->executeS('
SELECT `id_profile`
FROM '._DB_PREFIX_.'profile
WHERE `id_profile` != 1
');
if (!$profiles || empty($profiles))
return false;
/* Query definition */
@@ -147,7 +155,10 @@ class TabCore extends ObjectModel
*/
public static function getCurrentParentId()
{
if ($result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('SELECT `id_parent` FROM `'._DB_PREFIX_.'tab` WHERE LOWER(class_name) = \''.pSQL(Tools::strtolower(Tools::getValue('controller'))).'\''))
if ($result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT `id_parent`
FROM `'._DB_PREFIX_.'tab`
WHERE LOWER(class_name) = \''.pSQL(Tools::strtolower(Tools::getValue('controller'))).'\''))
return $result['id_parent'];
return -1;
}
@@ -161,10 +172,12 @@ class TabCore extends ObjectModel
{
/* Tabs selection */
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
SELECT *
FROM `'._DB_PREFIX_.'tab` t
LEFT JOIN `'._DB_PREFIX_.'tab_lang` tl ON (t.`id_tab` = tl.`id_tab` AND tl.`id_lang` = '.(int)$id_lang.')
WHERE t.`id_tab` = '.(int)$id_tab);
SELECT *
FROM `'._DB_PREFIX_.'tab` t
LEFT JOIN `'._DB_PREFIX_.'tab_lang` tl
ON (t.`id_tab` = tl.`id_tab` AND tl.`id_lang` = '.(int)$id_lang.')
WHERE t.`id_tab` = '.(int)$id_tab
);
}
/**
@@ -179,10 +192,12 @@ class TabCore extends ObjectModel
{
self::$_cache_tabs[$id_lang] = array();
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT *
FROM `'._DB_PREFIX_.'tab` t
LEFT JOIN `'._DB_PREFIX_.'tab_lang` tl ON (t.`id_tab` = tl.`id_tab` AND tl.`id_lang` = '.(int)$id_lang.')
ORDER BY t.`position` ASC');
SELECT *
FROM `'._DB_PREFIX_.'tab` t
LEFT JOIN `'._DB_PREFIX_.'tab_lang` tl
ON (t.`id_tab` = tl.`id_tab` AND tl.`id_lang` = '.(int)$id_lang.')
ORDER BY t.`position` ASC
');
foreach ($result as $row)
{
if (!isset(self::$_cache_tabs[$id_lang][$row['id_parent']]))
@@ -221,9 +236,10 @@ class TabCore extends ObjectModel
public static function getNbTabs($id_parent = null)
{
return (int)Db::getInstance()->getValue('
SELECT COUNT(*)
FROM `'._DB_PREFIX_.'tab` t
'.(!is_null($id_parent) ? 'WHERE t.`id_parent` = '.(int)$id_parent : ''));
SELECT COUNT(*)
FROM `'._DB_PREFIX_.'tab` t
'.(!is_null($id_parent) ? 'WHERE t.`id_parent` = '.(int)$id_parent : '')
);
}
/**
@@ -234,7 +250,11 @@ class TabCore extends ObjectModel
*/
public static function getNewLastPosition($id_parent)
{
return (Db::getInstance()->getValue('SELECT MAX(position)+1 FROM `'._DB_PREFIX_.'tab` WHERE `id_parent` = '.(int)($id_parent)));
return (Db::getInstance()->getValue('
SELECT MAX(position)+1
FROM `'._DB_PREFIX_.'tab`
WHERE `id_parent` = '.(int)$id_parent
));
}
public function move($direction)
@@ -250,9 +270,12 @@ class TabCore extends ObjectModel
return false;
$new_position = ($direction == 'l') ? $this->position - 1 : $this->position + 1;
Db::getInstance()->execute('UPDATE `'._DB_PREFIX_.'tab` t
SET position = '.(int)$this->position.'
WHERE id_parent = '.(int)$this->id_parent.' AND position = '.(int)$new_position);
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'tab` t
SET position = '.(int)$this->position.'
WHERE id_parent = '.(int)$this->id_parent.'
AND position = '.(int)$new_position
);
$this->position = $new_position;
return $this->update();
}
@@ -260,28 +283,64 @@ class TabCore extends ObjectModel
public function cleanPositions($id_parent)
{
$result = Db::getInstance()->executeS('
SELECT `id_tab`
FROM `'._DB_PREFIX_.'tab`
WHERE `id_parent` = '.(int)$id_parent.'
ORDER BY `position`');
SELECT `id_tab`
FROM `'._DB_PREFIX_.'tab`
WHERE `id_parent` = '.(int)$id_parent.'
ORDER BY `position`
');
$sizeof = count($result);
for ($i = 0; $i < $sizeof; ++$i)
Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'tab`
SET `position` = '.($i + 1).'
WHERE `id_tab` = '.(int)$result[$i]['id_tab']);
UPDATE `'._DB_PREFIX_.'tab`
SET `position` = '.($i + 1).'
WHERE `id_tab` = '.(int)$result[$i]['id_tab']
);
return true;
}
public function updatePosition($way, $position)
{
if (!$res = Db::getInstance()->executeS('
SELECT t.`id_tab`, t.`position`, t.`id_parent`
FROM `'._DB_PREFIX_.'tab` t
WHERE t.`id_parent` = '.(int)$this->id_parent.'
ORDER BY t.`position` ASC'
))
return false;
foreach ($res as $tab)
if ((int)$tab['id_tab'] == (int)$this->id)
$moved_tab = $tab;
if (!isset($moved_tab) || !isset($position))
return false;
// < and > statements rather than BETWEEN operator
// since BETWEEN is treated differently according to databases
$result = (Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'tab`
SET `position`= `position` '.($way ? '- 1' : '+ 1').'
WHERE `position`
'.($way
? '> '.(int)$moved_tab['position'].' AND `position` <= '.(int)$position
: '< '.(int)$moved_tab['position'].' AND `position` >= '.(int)$position).'
AND `id_parent`='.(int)$moved_tab['id_parent'])
&& Db::getInstance()->execute('
UPDATE `'._DB_PREFIX_.'tab`
SET `position` = '.(int)$position.'
WHERE `id_parent` = '.(int)$moved_tab['id_parent'].'
AND `id_tab`='.(int)$moved_tab['id_tab']));
return $result;
}
public static function checkTabRights($id_tab)
{
static $tabAccesses = NULL;
static $tabAccesses = null;
if ($tabAccesses === NULL)
if ($tabAccesses === null)
$tabAccesses = Profile::getProfileAccesses(Context::getContext()->employee->id_profile);
if (isset($tabAccesses[(int)($id_tab)]['view']))
return ($tabAccesses[(int)($id_tab)]['view'] === '1');
if (isset($tabAccesses[(int)$id_tab]['view']))
return ($tabAccesses[(int)$id_tab]['view'] === '1');
return false;
}