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

// Fix AdminCmsControllers

Browse Source
This commit is contained in:
tDidierjean committed 2011-11-21 14:30:26 +00:00
1 parent 41fddea415
commit c44e9b8587
8 files changed
+27 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/ajax.php
+3 -3
View File
@@ -466,9 +466,9 @@ if (Tools::getValue('submitPublishCMS'))
if (Tools::getIsset('id_cms')) if (Tools::getIsset('id_cms'))
{ {
$id_cms = (int)(Tools::getValue('id_cms')); $id_cms = (int)(Tools::getValue('id_cms'));
$id_tab_cms = (int)(Tab::getIdFromClassName('AdminCMSContent')); $id_tab_cms = (int)(Tab::getIdFromClassName('AdminCmsContent'));
$token = Tools::getAdminToken('AdminCMSContent'.(int)($id_tab_cms).(int)$context->employee->id); $token = Tools::getAdminToken('AdminCmsContent'.(int)($id_tab_cms).(int)$context->employee->id);
$bo_cms_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminCMSContent&id_cms='.(int)$id_cms.'&updatecms&token='.$token; $bo_cms_url = dirname($_SERVER['PHP_SELF']).'/index.php?tab=AdminCmsContent&id_cms='.(int)$id_cms.'&updatecms&token='.$token;
if (Tools::getValue('redirect')) if (Tools::getValue('redirect'))
die($bo_cms_url); die($bo_cms_url);
admin-dev/functions.php
+3 -3
View File
@@ -180,12 +180,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
return $path; return $path;
$name = ($highlight != NULL) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name); $name = ($highlight != NULL) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name);
$edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&addcategory&token=' . Tools::getAdminToken('AdminCMSContent'.(int)(Tab::getIdFromClassName('AdminCMSContent')).(int)$context->employee->id).'"> $edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&addcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
<img src="../img/admin/edit.gif" alt="Modify" /></a> '; <img src="../img/admin/edit.gif" alt="Modify" /></a> ';
if ($category->id == 1) if ($category->id == 1)
$edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCMSContent'.(int)(Tab::getIdFromClassName('AdminCMSContent')).(int)$context->employee->id).'"> $edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
<img src="../img/admin/home.gif" alt="Home" /></a> '; <img src="../img/admin/home.gif" alt="Home" /></a> ';
$path = $edit.'<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCMSContent'.(int)(Tab::getIdFromClassName('AdminCMSContent')).(int)$context->employee->id).'"> $path = $edit.'<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)$context->employee->id).'">
'.$name.'</a> > '.$path; '.$name.'</a> > '.$path;
if ($category->id == 1) if ($category->id == 1)
return substr($path, 0, strlen($path) - 3); return substr($path, 0, strlen($path) - 3);
classes/AdminTab.php
+2 -2
View File
@@ -189,8 +189,8 @@ abstract class AdminTabCore
public static $tabParenting = array( public static $tabParenting = array(
// 'AdminProducts' => 'AdminCatalog', // 'AdminProducts' => 'AdminCatalog',
// 'AdminCategories' => 'AdminCatalog', // 'AdminCategories' => 'AdminCatalog',
'AdminCMS' => 'AdminCMSContent', 'AdminCms' => 'AdminCmsContent',
'AdminCMSCategories' => 'AdminCMSContent', 'AdminCmsCategories' => 'AdminCmsContent',
'AdminOrdersStates' => 'AdminStatuses', 'AdminOrdersStates' => 'AdminStatuses',
'AdminAttributeGenerator' => 'AdminProducts', 'AdminAttributeGenerator' => 'AdminProducts',
'AdminAttributes' => 'AdminAttributesGroups', 'AdminAttributes' => 'AdminAttributesGroups',
controllers/admin/AdminCmsCategoriesController.php
+4 -4
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminCMSCategoriesControllerCore extends AdminController class AdminCmsCategoriesControllerCore extends AdminController
{ {
/** @var object CMSCategory() instance for navigation*/ /** @var object CMSCategory() instance for navigation*/
private $_CMSCategory; private $_CMSCategory;
@@ -47,7 +47,7 @@ class AdminCMSCategoriesControllerCore extends AdminController
'position' => array('title' => $this->l('Position'), 'width' => 40,'filter_key' => 'position', 'align' => 'center', 'position' => 'position'), 'position' => array('title' => $this->l('Position'), 'width' => 40,'filter_key' => 'position', 'align' => 'center', 'position' => 'position'),
'active' => array('title' => $this->l('Displayed'), 'width' => 25, 'active' => 'status', 'align' => 'center', 'type' => 'bool', 'orderby' => false)); 'active' => array('title' => $this->l('Displayed'), 'width' => 25, 'active' => 'status', 'align' => 'center', 'type' => 'bool', 'orderby' => false));
$this->_CMSCategory = AdminCMSContentController::getCurrentCMSCategory(); $this->_CMSCategory = AdminCmsContentController::getCurrentCMSCategory();
$this->_filter = 'AND `id_parent` = '.(int)($this->_CMSCategory->id); $this->_filter = 'AND `id_parent` = '.(int)($this->_CMSCategory->id);
$this->_select = 'position '; $this->_select = 'position ';
@@ -145,7 +145,7 @@ class AdminCMSCategoriesControllerCore extends AdminController
elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position'))))
$this->_errors[] = Tools::displayError('Failed to update the position.'); $this->_errors[] = Tools::displayError('Failed to update the position.');
else else
Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (int)(Tools::getValue($this->identifier, Tools::getValue('id_cms_category_parent', 1)))) ? ('&'.$this->identifier.'='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCMSContent')); Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (int)(Tools::getValue($this->identifier, Tools::getValue('id_cms_category_parent', 1)))) ? ('&'.$this->identifier.'='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
/* Delete multiple objects */ /* Delete multiple objects */
elseif (Tools::getValue('submitDel'.$this->table)) elseif (Tools::getValue('submitDel'.$this->table))
@@ -160,7 +160,7 @@ class AdminCMSCategoriesControllerCore extends AdminController
if ($result) if ($result)
{ {
$cms_category->cleanPositions((int)(Tools::getValue('id_cms_category'))); $cms_category->cleanPositions((int)(Tools::getValue('id_cms_category')));
Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCMSContent').'&id_category='.(int)(Tools::getValue('id_cms_category'))); Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCmsContent').'&id_category='.(int)(Tools::getValue('id_cms_category')));
} }
$this->_errors[] = Tools::displayError('An error occurred while deleting selection.'); $this->_errors[] = Tools::displayError('An error occurred while deleting selection.');
controllers/admin/AdminCmsContentController.php
+3 -3
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminCMSContentControllerCore extends AdminController class AdminCmsContentControllerCore extends AdminController
{ {
/** @var object adminCMSCategories() instance */ /** @var object adminCMSCategories() instance */
private $adminCMSCategories; private $adminCMSCategories;
@@ -45,8 +45,8 @@ class AdminCMSContentControllerCore extends AdminController
die('Category cannot be loaded'); die('Category cannot be loaded');
$this->table = array('cms_category', 'cms'); $this->table = array('cms_category', 'cms');
$this->adminCMSCategories = new AdminCMSCategoriesController(); $this->adminCMSCategories = new AdminCmsCategoriesController();
$this->adminCMS = new AdminCMSController(); $this->adminCMS = new AdminCmsController();
parent::__construct(); parent::__construct();
} }
controllers/admin/AdminCmsController.php
+7 -7
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
class AdminCMSControllerCore extends AdminController class AdminCmsControllerCore extends AdminController
{ {
private $_category; private $_category;
@@ -49,7 +49,7 @@ class AdminCMSControllerCore extends AdminController
'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false) 'active' => array('title' => $this->l('Enabled'), 'width' => 25, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false)
); );
$this->_category = AdminCMSContentController::getCurrentCMSCategory(); $this->_category = AdminCmsContentController::getCurrentCMSCategory();
$this->_join = ' $this->_join = '
LEFT JOIN `'._DB_PREFIX_.'cms_category` c ON (c.`id_cms_category` = a.`id_cms_category`)'; LEFT JOIN `'._DB_PREFIX_.'cms_category` c ON (c.`id_cms_category` = a.`id_cms_category`)';
$this->_select = 'a.position '; $this->_select = 'a.position ';
@@ -236,7 +236,7 @@ class AdminCMSControllerCore extends AdminController
if (!$cms->delete()) if (!$cms->delete())
$this->_errors[] = Tools::displayError('An error occurred while deleting object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>'; $this->_errors[] = Tools::displayError('An error occurred while deleting object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
else else
Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=1&token='.Tools::getAdminTokenLite('AdminCMSContent')); Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=1&token='.Tools::getAdminTokenLite('AdminCmsContent'));
}/* Delete multiple objects */ }/* Delete multiple objects */
elseif (Tools::getValue('submitDel'.$this->table)) elseif (Tools::getValue('submitDel'.$this->table))
{ {
@@ -250,7 +250,7 @@ class AdminCMSControllerCore extends AdminController
if ($result) if ($result)
{ {
$cms->cleanPositions((int)(Tools::getValue('id_cms_category'))); $cms->cleanPositions((int)(Tools::getValue('id_cms_category')));
Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCMSContent').'&id_category='.(int)(Tools::getValue('id_cms_category'))); Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.Tools::getAdminTokenLite('AdminCmsContent').'&id_category='.(int)(Tools::getValue('id_cms_category')));
} }
$this->_errors[] = Tools::displayError('An error occurred while deleting selection.'); $this->_errors[] = Tools::displayError('An error occurred while deleting selection.');
@@ -289,7 +289,7 @@ class AdminCMSControllerCore extends AdminController
Tools::redirectAdmin($preview_url); Tools::redirectAdmin($preview_url);
} }
else else
Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=3&token='.Tools::getAdminTokenLite('AdminCMSContent')); Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=3&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
else else
{ {
@@ -313,7 +313,7 @@ class AdminCMSControllerCore extends AdminController
Tools::redirectAdmin($preview_url); Tools::redirectAdmin($preview_url);
} }
else else
Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCMSContent')); Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
} }
} }
@@ -326,7 +326,7 @@ class AdminCMSControllerCore extends AdminController
elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position'))))
$this->_errors[] = Tools::displayError('Failed to update the position.'); $this->_errors[] = Tools::displayError('Failed to update the position.');
else else
Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=4'.(($id_category = (int)(Tools::getValue('id_cms_category'))) ? ('&id_cms_category='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCMSContent')); Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=4'.(($id_category = (int)(Tools::getValue('id_cms_category'))) ? ('&id_cms_category='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
/* Change object statuts (active, inactive) */ /* Change object statuts (active, inactive) */
elseif (Tools::isSubmit('status') AND Tools::isSubmit($this->identifier)) elseif (Tools::isSubmit('status') AND Tools::isSubmit($this->identifier))
modules/autoupgrade/AdminSelfTab.php
+2 -2
View File
@@ -152,8 +152,8 @@ abstract class AdminSelfTab
public static $tabParenting = array( public static $tabParenting = array(
'AdminProducts' => 'AdminCatalog', 'AdminProducts' => 'AdminCatalog',
'AdminCategories' => 'AdminCatalog', 'AdminCategories' => 'AdminCatalog',
'AdminCMS' => 'AdminCMSContent', 'AdminCms' => 'AdminCmsContent',
'AdminCMSCategories' => 'AdminCMSContent', 'AdminCmsCategories' => 'AdminCmsContent',
'AdminOrdersStates' => 'AdminStatuses', 'AdminOrdersStates' => 'AdminStatuses',
'AdminAttributeGenerator' => 'AdminProducts', 'AdminAttributeGenerator' => 'AdminProducts',
'AdminAttributes' => 'AdminAttributesGroups', 'AdminAttributes' => 'AdminAttributesGroups',
modules/autoupgrade/functions.php
+3 -3
View File
@@ -175,12 +175,12 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
return $path; return $path;
$name = ($highlight != NULL) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name); $name = ($highlight != NULL) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name);
$edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&addcategory&token=' . Tools::getAdminToken('AdminCMSContent'.(int)(Tab::getIdFromClassName('AdminCMSContent')).(int)($cookie->id_employee)).'"> $edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&addcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)($cookie->id_employee)).'">
<img src="../img/admin/edit.gif" alt="Modify" /></a> '; <img src="../img/admin/edit.gif" alt="Modify" /></a> ';
if ($category->id == 1) if ($category->id == 1)
$edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCMSContent'.(int)(Tab::getIdFromClassName('AdminCMSContent')).(int)($cookie->id_employee)).'"> $edit = '<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)($cookie->id_employee)).'">
<img src="../img/admin/home.gif" alt="Home" /></a> '; <img src="../img/admin/home.gif" alt="Home" /></a> ';
$path = $edit.'<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCMSContent'.(int)(Tab::getIdFromClassName('AdminCMSContent')).(int)($cookie->id_employee)).'"> $path = $edit.'<a href="'.$urlBase.'&id_cms_category='.$category->id.'&viewcategory&token=' . Tools::getAdminToken('AdminCmsContent'.(int)(Tab::getIdFromClassName('AdminCmsContent')).(int)($cookie->id_employee)).'">
'.$name.'</a> > '.$path; '.$name.'</a> > '.$path;
if ($category->id == 1) if ($category->id == 1)
return substr($path, 0, strlen($path) - 3); return substr($path, 0, strlen($path) - 3);