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

// fix module tab dispatch

Browse Source
This commit is contained in:
tDidierjean
2011-11-18 14:10:23 +00:00
parent 5c47836cee
commit 54b80f48e4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Carrier.php
+4 -1
View File
@@ -50,6 +50,9 @@ class CarrierCore extends ObjectModel
/** @var int Tax id (none = 0) */ /** @var int Tax id (none = 0) */
public $id_tax_rules_group; public $id_tax_rules_group;
/** @var int common id for carrier historization */
public $id_reference;
/** @var string Name */ /** @var string Name */
public $name; public $name;
@@ -154,12 +157,12 @@ class CarrierCore extends ObjectModel
$fields['external_module_name'] = $this->external_module_name; $fields['external_module_name'] = $this->external_module_name;
$fields['need_range'] = $this->need_range; $fields['need_range'] = $this->need_range;
$fields['position'] = (int)$this->position; $fields['position'] = (int)$this->position;
$fields['id_reference'] = (int)$this->id_reference;
$fields['max_width'] = (int)$this->max_width; $fields['max_width'] = (int)$this->max_width;
$fields['max_height'] = (int)$this->max_height; $fields['max_height'] = (int)$this->max_height;
$fields['max_depth'] = (int)$this->max_depth; $fields['max_depth'] = (int)$this->max_depth;
$fields['max_weight'] = (int)$this->max_weight; $fields['max_weight'] = (int)$this->max_weight;
$fields['grade'] = (int)$this->grade; $fields['grade'] = (int)$this->grade;
return $fields; return $fields;
} }
classes/Dispatcher.php
+1 -1
View File
@@ -307,7 +307,7 @@ class DispatcherCore
$controller_type = 'tab'; $controller_type = 'tab';
} }
// For retrocompatibility with admin/tabs/ old system // For retrocompatibility with admin/tabs/ old system
if (isset($controller_type) && !$controller_type == 'tab') if (isset($controller_type) && $controller_type == 'tab')
{ {
require_once(_PS_ADMIN_DIR_.'/functions.php'); require_once(_PS_ADMIN_DIR_.'/functions.php');
$ajaxMode = !empty($_REQUEST['ajaxMode']); $ajaxMode = !empty($_REQUEST['ajaxMode']);