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

[-] BO : #PSCFV-2286 : Added errors message when the CMS form isn't filled && normalize

Browse Source
This commit is contained in:
lLefevre
2012-05-10 09:38:13 +00:00
parent a9afd20abd
commit d05ca8bed8
2 changed files with 71 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCmsContentController.php
+52 -46
View File
@@ -28,25 +28,25 @@
class AdminCmsContentControllerCore extends AdminController class AdminCmsContentControllerCore extends AdminController
{ {
/** @var object adminCMSCategories() instance */ /** @var object adminCMSCategories() instance */
protected $adminCMSCategories; protected $admin_cms_categories;
/** @var object adminCMS() instance */ /** @var object adminCMS() instance */
protected $adminCMS; protected $admin_cms;
/** @var object Category() instance for navigation*/ /** @var object Category() instance for navigation*/
protected static $_category = null; protected static $category = null;
public function __construct() public function __construct()
{ {
/* Get current category */ /* Get current category */
$id_cms_category = (int)(Tools::getValue('id_cms_category', Tools::getValue('id_cms_category_parent', 1))); $id_cms_category = (int)Tools::getValue('id_cms_category', Tools::getValue('id_cms_category_parent', 1));
self::$_category = new CMSCategory($id_cms_category); self::$category = new CMSCategory($id_cms_category);
if (!Validate::isLoadedObject(self::$_category)) if (!Validate::isLoadedObject(self::$category))
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->admin_cms_categories = new AdminCmsCategoriesController();
$this->adminCMS = new AdminCmsController(); $this->admin_cms = new AdminCmsController();
parent::__construct(); parent::__construct();
} }
@@ -58,47 +58,47 @@ class AdminCmsContentControllerCore extends AdminController
*/ */
public static function getCurrentCMSCategory() public static function getCurrentCMSCategory()
{ {
return self::$_category; return self::$category;
} }
public function viewAccess($disable = false) public function viewAccess($disable = false)
{ {
$result = parent::viewAccess($disable); $result = parent::viewAccess($disable);
$this->adminCMSCategories->tabAccess = $this->tabAccess; $this->admin_cms_categories->tabAccess = $this->tabAccess;
$this->adminCMS->tabAccess = $this->tabAccess; $this->admin_cms->tabAccess = $this->tabAccess;
return $result; return $result;
} }
public function initContent() public function initContent()
{ {
$this->adminCMSCategories->token = $this->token; $this->admin_cms_categories->token = $this->token;
$this->adminCMS->token = $this->token; $this->admin_cms->token = $this->token;
if ($this->display == 'edit_category') if ($this->display == 'edit_category')
$this->content .= $this->adminCMSCategories->renderForm(); $this->content .= $this->admin_cms_categories->renderForm();
else if ($this->display == 'edit_page') else if ($this->display == 'edit_page')
$this->content .= $this->adminCMS->renderForm(); $this->content .= $this->admin_cms->renderForm();
else if ($this->display == 'view_page') else if ($this->display == 'view_page')
$fixme = 'fixme';// @FIXME $fixme = 'fixme';// @FIXME
else else
{ {
$id_cms_category = (int)(Tools::getValue('id_cms_category')); $id_cms_category = (int)Tools::getValue('id_cms_category');
if (!$id_cms_category) if (!$id_cms_category)
$id_cms_category = 1; $id_cms_category = 1;
// CMS categories breadcrumb // CMS categories breadcrumb
$cms_tabs = array('cms_category', 'cms'); $cms_tabs = array('cms_category', 'cms');
// Cleaning links // Cleaning links
$catBarIndex = self::$currentIndex; $cat_bar_index = self::$currentIndex;
foreach ($cms_tabs as $tab) foreach ($cms_tabs as $tab)
if (Tools::getValue($tab.'Orderby') && Tools::getValue($tab.'Orderway')) if (Tools::getValue($tab.'Orderby') && Tools::getValue($tab.'Orderway'))
$catBarIndex = preg_replace('/&'.$tab.'Orderby=([a-z _]*)&'.$tab.'Orderway=([a-z]*)/i', '', self::$currentIndex); $cat_bar_index = preg_replace('/&'.$tab.'Orderby=([a-z _]*)&'.$tab.'Orderway=([a-z]*)/i', '', self::$currentIndex);
$this->content .= $this->adminCMSCategories->renderList(); $this->content .= $this->admin_cms_categories->renderList();
$this->adminCMS->id_cms_category = $id_cms_category; $this->admin_cms->id_cms_category = $id_cms_category;
$this->content .= $this->adminCMS->renderList(); $this->content .= $this->admin_cms->renderList();
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'cms_breadcrumb' => getPath($catBarIndex, $id_cms_category, '', '', 'cms'), 'cms_breadcrumb' => getPath($cat_bar_index, $id_cms_category, '', '', 'cms'),
)); ));
} }
@@ -109,11 +109,27 @@ class AdminCmsContentControllerCore extends AdminController
public function postProcess() public function postProcess()
{ {
if (((Tools::isSubmit('submitAddcms_category') || Tools::isSubmit('submitAddcms_categoryAndStay')) && count($this->adminCMSCategories->errors)) if (Tools::isSubmit('submitDelcms')
|| Tools::isSubmit('previewSubmitAddcmsAndPreview')
|| Tools::isSubmit('submitAddcms')
|| isset($_GET['deletecms'])
|| Tools::isSubmit('viewcms')
|| (Tools::isSubmit('statuscms') && Tools::isSubmit('id_cms'))
|| (Tools::isSubmit('way') && Tools::isSubmit('id_cms')) && (Tools::isSubmit('position')))
$this->admin_cms->postProcess();
else if (Tools::isSubmit('submitDelcms_category')
|| Tools::isSubmit('submitAddcms_categoryAndBackToParent')
|| Tools::isSubmit('submitAddcms_category')
|| isset($_GET['deletecms_category'])
|| (Tools::isSubmit('statuscms_category') && Tools::isSubmit('id_cms_category'))
|| (Tools::isSubmit('position') && Tools::isSubmit('id_cms_category_to_move')))
$this->admin_cms_categories->postProcess();
if (((Tools::isSubmit('submitAddcms_category') || Tools::isSubmit('submitAddcms_categoryAndStay')) && count($this->admin_cms_categories->errors))
|| isset($_GET['updatecms_category']) || isset($_GET['updatecms_category'])
|| isset($_GET['addcms_category'])) || isset($_GET['addcms_category']))
$this->display = 'edit_category'; $this->display = 'edit_category';
else if (((Tools::isSubmit('submitAddcms') || Tools::isSubmit('submitAddcmsAndStay')) && count($this->adminCMS->errors)) else if (((Tools::isSubmit('submitAddcms') || Tools::isSubmit('submitAddcmsAndStay')) && count($this->admin_cms->errors))
|| isset($_GET['updatecms']) || isset($_GET['updatecms'])
|| isset($_GET['addcms'])) || isset($_GET['addcms']))
$this->display = 'edit_page'; $this->display = 'edit_page';
@@ -123,25 +139,15 @@ class AdminCmsContentControllerCore extends AdminController
$this->id_cms_category = (int)Tools::getValue('id_cms_category'); $this->id_cms_category = (int)Tools::getValue('id_cms_category');
} }
if (Tools::isSubmit('submitDelcms') if (isset($this->admin_cms->errors))
|| Tools::isSubmit('previewSubmitAddcmsAndPreview') $this->errors = array_merge($this->errors, $this->admin_cms->errors);
|| Tools::isSubmit('submitAddcms')
|| isset($_GET['deletecms']) if (isset($this->admin_cms_categories->errors))
|| Tools::isSubmit('viewcms') $this->errors = array_merge($this->errors, $this->admin_cms_categories->errors);
|| (Tools::isSubmit('statuscms') && Tools::isSubmit('id_cms'))
|| (Tools::isSubmit('way') && Tools::isSubmit('id_cms')) && (Tools::isSubmit('position')))
$this->adminCMS->postProcess();
else if (Tools::isSubmit('submitDelcms_category')
|| Tools::isSubmit('submitAddcms_categoryAndBackToParent')
|| Tools::isSubmit('submitAddcms_category')
|| isset($_GET['deletecms_category'])
|| (Tools::isSubmit('statuscms_category') && Tools::isSubmit('id_cms_category'))
|| (Tools::isSubmit('position') && Tools::isSubmit('id_cms_category_to_move')))
$this->adminCMSCategories->postProcess();
parent::postProcess(); parent::postProcess();
} }
public function setMedia() public function setMedia()
{ {
parent::setMedia(); parent::setMedia();
@@ -151,9 +157,9 @@ class AdminCmsContentControllerCore extends AdminController
public function ajaxProcessUpdateCmsPositions() public function ajaxProcessUpdateCmsPositions()
{ {
$id_cms = (int)(Tools::getValue('id_cms')); $id_cms = (int)Tools::getValue('id_cms');
$id_category = (int)(Tools::getValue('id_cms_category')); $id_category = (int)Tools::getValue('id_cms_category');
$way = (int)(Tools::getValue('way')); $way = (int)Tools::getValue('way');
$positions = Tools::getValue('cms'); $positions = Tools::getValue('cms');
if (is_array($positions)) if (is_array($positions))
foreach ($positions as $key => $value) foreach ($positions as $key => $value)
@@ -179,9 +185,9 @@ class AdminCmsContentControllerCore extends AdminController
public function ajaxProcessUpdateCmsCategoriesPositions() public function ajaxProcessUpdateCmsCategoriesPositions()
{ {
$id_cms_category_to_move = (int)(Tools::getValue('id_cms_category_to_move')); $id_cms_category_to_move = (int)Tools::getValue('id_cms_category_to_move');
$id_cms_category_parent = (int)(Tools::getValue('id_cms_category_parent')); $id_cms_category_parent = (int)Tools::getValue('id_cms_category_parent');
$way = (int)(Tools::getValue('way')); $way = (int)Tools::getValue('way');
$positions = Tools::getValue('cms_category'); $positions = Tools::getValue('cms_category');
if (is_array($positions)) if (is_array($positions))
foreach ($positions as $key => $value) foreach ($positions as $key => $value)
controllers/admin/AdminCmsController.php
+19 -13
View File
@@ -27,7 +27,7 @@
class AdminCmsControllerCore extends AdminController class AdminCmsControllerCore extends AdminController
{ {
protected $_category; protected $category;
public $id_cms_category; public $id_cms_category;
@@ -239,7 +239,8 @@ class AdminCmsControllerCore extends AdminController
$cms = new CMS((int)Tools::getValue('id_cms')); $cms = new CMS((int)Tools::getValue('id_cms'));
$cms->cleanPositions($cms->id_cms_category); $cms->cleanPositions($cms->id_cms_category);
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 */
@@ -254,8 +255,9 @@ class AdminCmsControllerCore extends AdminController
$result = $cms->deleteSelection(Tools::getValue($this->table.'Box')); $result = $cms->deleteSelection(Tools::getValue($this->table.'Box'));
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'))); $token = Tools::getAdminTokenLite('AdminCmsContent');
Tools::redirectAdmin(self::$currentIndex.'&conf=2&token='.$token.'&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.');
@@ -271,12 +273,13 @@ class AdminCmsControllerCore extends AdminController
parent::validateRules(); parent::validateRules();
if (!count($this->errors)) if (!count($this->errors))
{ {
if (!$id_cms = (int)(Tools::getValue('id_cms'))) if (!$id_cms = (int)Tools::getValue('id_cms'))
{ {
$cms = new CMS(); $cms = new CMS();
$this->copyFromPost($cms, 'cms'); $this->copyFromPost($cms, 'cms');
if (!$cms->add()) if (!$cms->add())
$this->errors[] = Tools::displayError('An error occurred while creating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>'; $this->errors[] = Tools::displayError('An error occurred while creating object.')
.' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
else else
$this->updateAssoShop($cms->id); $this->updateAssoShop($cms->id);
} }
@@ -285,7 +288,8 @@ class AdminCmsControllerCore extends AdminController
$cms = new CMS($id_cms); $cms = new CMS($id_cms);
$this->copyFromPost($cms, 'cms'); $this->copyFromPost($cms, 'cms');
if (!$cms->update()) if (!$cms->update())
$this->errors[] = Tools::displayError('An error occurred while updating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>'; $this->errors[] = Tools::displayError('An error occurred while updating object.')
.' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
else else
$this->updateAssoShop($cms->id); $this->updateAssoShop($cms->id);
@@ -301,12 +305,12 @@ class AdminCmsControllerCore extends AdminController
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1); $admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
$token = Tools::encrypt('PreviewCMS'.$cms->id); $token = Tools::encrypt('PreviewCMS'.$cms->id);
$preview_url .= $object->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir; $preview_url .= $cms->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
} }
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'));
} }
} }
elseif (Tools::getValue('position')) elseif (Tools::getValue('position'))
@@ -314,11 +318,12 @@ class AdminCmsControllerCore extends AdminController
if ($this->tabAccess['edit'] !== '1') if ($this->tabAccess['edit'] !== '1')
$this->errors[] = Tools::displayError('You do not have permission to edit here.'); $this->errors[] = Tools::displayError('You do not have permission to edit here.');
elseif (!Validate::isLoadedObject($object = $this->loadObject())) elseif (!Validate::isLoadedObject($object = $this->loadObject()))
$this->errors[] = Tools::displayError('An error occurred while updating status for object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)'); $this->errors[] = Tools::displayError('An error occurred while updating status for object.')
elseif (!$object->updatePosition((int)(Tools::getValue('way')), (int)(Tools::getValue('position')))) .' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
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('statuscms') && Tools::isSubmit($this->identifier)) elseif (Tools::isSubmit('statuscms') && Tools::isSubmit($this->identifier))
@@ -333,7 +338,8 @@ class AdminCmsControllerCore extends AdminController
$this->errors[] = Tools::displayError('An error occurred while updating status.'); $this->errors[] = Tools::displayError('An error occurred while updating status.');
} }
else else
$this->errors[] = Tools::displayError('An error occurred while updating status for object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)'); $this->errors[] = Tools::displayError('An error occurred while updating status for object.')
.' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
} }
else else
$this->errors[] = Tools::displayError('You do not have permission to edit here.'); $this->errors[] = Tools::displayError('You do not have permission to edit here.');