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

// Fixing bug in the form group and attribute

Browse Source
This commit is contained in:
mDeflotte committed 2012-01-09 16:51:41 +00:00
1 parent 3f602f366a
commit 54280a2da6
1 file changed
+26 -5
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminAttributesGroupsController.php
+26 -5
View File
@@ -56,7 +56,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
) )
); );
$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')));
parent::__construct(); parent::__construct();
} }
@@ -160,6 +160,8 @@ class AdminAttributesGroupsControllerCore extends AdminController
*/ */
public function renderForm() public function renderForm()
{ {
$this->table = 'attribute_group';
$group_type = array( $group_type = array(
array( array(
'id' => 'select', 'id' => 'select',
@@ -240,6 +242,8 @@ class AdminAttributesGroupsControllerCore extends AdminController
{ {
$attributes_groups = AttributeGroup::getAttributesGroups($this->context->language->id); $attributes_groups = AttributeGroup::getAttributesGroups($this->context->language->id);
$this->table = 'attribute';
$this->fields_form = array( $this->fields_form = array(
'legend' => array( 'legend' => array(
'title' => $this->l('Attribute'), 'title' => $this->l('Attribute'),
@@ -345,6 +349,10 @@ class AdminAttributesGroupsControllerCore extends AdminController
{ {
if (Tools::isSubmit('updateattribute')) if (Tools::isSubmit('updateattribute'))
$this->display = 'editAttributes'; $this->display = 'editAttributes';
else if (Tools::isSubmit('submitAddattribute'))
$this->display = 'editAttributes';
else if (Tools::isSubmit('submitAddattribute_group'))
$this->display = 'add';
parent::init(); parent::init();
} }
@@ -408,6 +416,18 @@ class AdminAttributesGroupsControllerCore extends AdminController
'desc' => $this->l('Save') 'desc' => $this->l('Save')
); );
$this->toolbar_btn['save-and-stay'] = array(
'short' => 'SaveAndStay',
'href' => '#',
'desc' => $this->l('Save and stay'),
);
$this->toolbar_btn['save-and-stay'] = array(
'short' => 'SaveAndStay',
'href' => '#',
'desc' => $this->l('Save and stay'),
);
$back = self::$currentIndex.'&token='.$this->token; $back = self::$currentIndex.'&token='.$this->token;
$this->toolbar_btn['cancel'] = array( $this->toolbar_btn['cancel'] = array(
'href' => $back, 'href' => $back,
@@ -469,7 +489,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
*/ */
public function processSave($token) public function processSave($token)
{ {
if ((int)Tools::getValue('id_attribute') <= 0) if ((int)Tools::getValue('id_attribute') <= 0 && (int)Tools::getValue('id_attribute_group') <= 0 )
return $this->processAdd($token); return $this->processAdd($token);
else else
return $this->processUpdate($token); return $this->processUpdate($token);
@@ -536,10 +556,10 @@ class AdminAttributesGroupsControllerCore extends AdminController
if (Tools::getValue('submitDel'.$this->table)) if (Tools::getValue('submitDel'.$this->table))
{ {
if ($this->tabAccess['delete'] === '1') if ($this->tabAccess['delete'] === '1')
{ {
if (isset($_POST[$this->table.'Box'])) if (isset($_POST[$this->table.'Box']))
{ {
$object = new $this->className(); $object = new $this->className();
if ($object->deleteSelection($_POST[$this->table.'Box'])) if ($object->deleteSelection($_POST[$this->table.'Box']))
Tools::redirectAdmin(self::$currentIndex.'&conf=2'.'&token='.$this->token); Tools::redirectAdmin(self::$currentIndex.'&conf=2'.'&token='.$this->token);
@@ -571,8 +591,9 @@ class AdminAttributesGroupsControllerCore extends AdminController
$_POST[$key] = str_replace ('\n', '', str_replace('\r', '', $value)); $_POST[$key] = str_replace ('\n', '', str_replace('\r', '', $value));
parent::postProcess(); parent::postProcess();
} }
else else {
parent::postProcess(); parent::postProcess();
}
} }
} }
} }