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

// Refactoring AdminProduct postProcess

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11205 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-12-14 14:29:50 +00:00
parent 940f886fd3
commit 12386a5b57
2 changed files with 851 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+66 -34
View File
@@ -561,12 +561,71 @@ class AdminControllerCore extends Controller
} }
/** /**
* Object update and creation * Call the right method for creating or updating object
* TODO: split processAdd and processUpdate *
* @param $token
* @return mixed
*/
public function processSave($token)
{
if ($this->id_object)
return $this->processUpdate($token);
else
return $this->processAdd($token);
}
/**
* Object creation
* *
* @param string $token * @param string $token
*/ */
public function processSave($token) public function processAdd($token)
{
/* Checking fields validity */
$this->validateRules();
if (!count($this->_errors))
{
$object = new $this->className();
$this->copyFromPost($object, $this->table);
$this->beforeAdd($object);
if (!$object->add())
{
$this->_errors[] = Tools::displayError('An error occurred while creating object.').
' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
}
/* voluntary do affectation here */
else if (($_POST[$this->identifier] = $object->id) && $this->postImage($object->id) && !count($this->_errors) && $this->_redirect)
{
$parent_id = (int)Tools::getValue('id_parent', 1);
$this->afterAdd($object);
$this->updateAssoShop($object->id);
// Save and stay on same form
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=3&update'.$this->table.'&token='.$token;
// Save and back to parent
if (Tools::isSubmit('submitAdd'.$this->table.'AndBackToParent'))
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$parent_id.'&conf=3&token='.$token;
// Default behavior (save and back)
if (empty($this->redirect_after))
$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=3&token='.$token;
}
}
$this->_errors = array_unique($this->_errors);
if (count($this->_errors) > 0)
return;
return $object;
}
/**
* Object update
*
* @param string $token
*/
public function processUpdate($token)
{ {
/* Checking fields validity */ /* Checking fields validity */
$this->validateRules(); $this->validateRules();
@@ -641,35 +700,6 @@ class AdminControllerCore extends Controller
$this->_errors[] = Tools::displayError('An error occurred while updating object.'). $this->_errors[] = Tools::displayError('An error occurred while updating object.').
' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)'); ' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
} }
/* Object creation */
else
{
$object = new $this->className();
$this->copyFromPost($object, $this->table);
$this->beforeAdd($object);
if (!$object->add())
{
$this->_errors[] = Tools::displayError('An error occurred while creating object.').
' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
}
/* voluntary do affectation here */
else if (($_POST[$this->identifier] = $object->id) && $this->postImage($object->id) && !count($this->_errors) && $this->_redirect)
{
$parent_id = (int)Tools::getValue('id_parent', 1);
$this->afterAdd($object);
$this->updateAssoShop($object->id);
// Save and stay on same form
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=3&update'.$this->table.'&token='.$token;
// Save and back to parent
if (Tools::isSubmit('submitAdd'.$this->table.'AndBackToParent'))
$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$parent_id.'&conf=3&token='.$token;
// Default behavior (save and back)
if (empty($this->redirect_after))
$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=3&token='.$token;
}
}
} }
$this->_errors = array_unique($this->_errors); $this->_errors = array_unique($this->_errors);
@@ -1763,7 +1793,9 @@ class AdminControllerCore extends Controller
} }
else if ($submitted_action = Tools::getValue('submitAction'.$this->table)) else if ($submitted_action = Tools::getValue('submitAction'.$this->table))
$this->action = $submitted_action; $this->action = $submitted_action;
else if (Tools::getValue('submitAdd'.$this->table) || Tools::getValue('submitAdd'.$this->table.'AndStay')) else if (Tools::getValue('submitAdd'.$this->table)
|| Tools::getValue('submitAdd'.$this->table.'AndStay')
|| Tools::getValue('submitAdd'.$this->table.'AndPreview'))
{ {
// case 1: updating existing entry // case 1: updating existing entry
if ($this->id_object) if ($this->id_object)
@@ -2414,7 +2446,7 @@ class AdminControllerCore extends Controller
return $result; return $result;
} }
protected function processBulkaffectzone($token) protected function processBulkAffectZone($token)
{ {
if (is_array($this->boxes) && !empty($this->boxes)) if (is_array($this->boxes) && !empty($this->boxes))
{ {
controllers/admin/AdminProductsController.php
+785 -829
View File
File diff suppressed because it is too large Load Diff