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

// BugFix : Missing params multilang

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11486 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-12-21 14:07:42 +00:00
parent 7b9a76f748
commit 847883c387
5 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+3 -3
View File
@@ -572,7 +572,7 @@ class AdminControllerCore extends Controller
* @param $token
* @return mixed
*/
public function processSave($token)
public function processSave($token)
{
if ($this->id_object)
return $this->processUpdate($token);
@@ -600,13 +600,13 @@ class AdminControllerCore extends Controller
$this->_errors[] = Tools::displayError('An error occurred while creating object.').
' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
}
/* voluntary do affectation here */
/* 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);
// d($object);
// 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;
classes/Feature.php
+1
View File
@@ -37,6 +37,7 @@ class FeatureCore extends ObjectModel
public static $definition = array(
'table' => 'feature',
'primary' => 'id_feature',
'multilang' => true,
'fields' => array(
'position' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
classes/Hook.php
+2 -9
View File
@@ -28,8 +28,8 @@
class HookCore extends ObjectModel
{
/** @var string Name and Title */
public $name;
public $title;
public $name;
public $title;
/**
* @see ObjectModel::$definition
@@ -340,13 +340,6 @@ class HookCore extends ObjectModel
<a class="exclusive" href="#">Add a module</a></div>--><div id="'.$hook_name.'" class="dndHook" style="min-height:50px">' : '').$output.($live_edit ? '</div>' : '');
}
public static function updateOrderStatus($newOrderStatusId, $id_order)
{
$order = new Order((int)($id_order));
classes/ObjectModel.php
+2 -2
View File
@@ -395,8 +395,8 @@ abstract class ObjectModelCore
foreach ($fields as &$field)
{
foreach (array_keys($field) AS $key)
if (!Validate::isTableOrIdentifier($key))
throw new PrestashopException('key '.$key.' is not table or identifier, ');
if (!Validate::isTableOrIdentifier($key))
throw new PrestashopException('key '.$key.' is not table or identifier, ');
$field[$this->def['primary']] = (int)$this->id;
if (isset($assos[$this->def['table'].'_lang']) && $assos[$this->def['table'].'_lang']['type'] == 'fk_shop')
controllers/admin/AdminFeaturesController.php
+8 -8
View File
@@ -355,10 +355,10 @@ class AdminFeaturesControllerCore extends AdminController
if (Tools::isSubmit('deletefeature_value'))
{
if ($this->tabAccess['delete'] === '1')
{
if (Tools::getValue('id_feature_value'))
{
if ($this->tabAccess['delete'] === '1')
{
if (Tools::getValue('id_feature_value'))
{
$object = new FeatureValue((int)Tools::getValue('id_feature_value'));
if ($object->delete())
Tools::redirectAdmin(self::$currentIndex.'&conf=2'.'&token='.$this->token);
@@ -412,10 +412,10 @@ class AdminFeaturesControllerCore extends AdminController
if (Tools::getValue('submitDel'.$this->table))
{
if ($this->tabAccess['delete'] === '1')
{
if (isset($_POST[$this->table.'Box']))
{
if ($this->tabAccess['delete'] === '1')
{
if (isset($_POST[$this->table.'Box']))
{
$object = new $this->className();
if ($object->deleteSelection($_POST[$this->table.'Box']))
Tools::redirectAdmin(self::$currentIndex.'&conf=2'.'&token='.$this->token);