|
-
+
|
{foreach $input.values as $groupID => $groupData}
diff --git a/classes/AdminController.php b/classes/AdminController.php
index c030f16c1..8428eb36c 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -369,7 +369,6 @@ class AdminControllerCore extends Controller
// Sub included tab postProcessing
$this->includeSubTab('postProcess', array('status', 'submitAdd1', 'submitDel', 'delete', 'submitFilter', 'submitReset'));
-
if (!empty($this->action) && method_exists($this, 'process'.ucfirst(Tools::toCamelCase($this->action))))
$this->{'process'.Tools::toCamelCase($this->action)}($token);
else if (method_exists($this, $this->action))
@@ -1870,7 +1869,19 @@ class AdminControllerCore extends Controller
if (isset($fieldset['form']['input']))
foreach ($fieldset['form']['input'] as $input)
if (empty($this->fields_value[$input['name']]))
- if (isset($input['lang']) && $input['lang'])
+ if ($input['type'] == 'group_shop' || $input['type'] == 'shop')
+ {
+ if ($obj->id)
+ {
+ $assos = array();
+ $sql = 'SELECT `id_'.$input['type'].'`, `'.pSQL($this->identifier).'`
+ FROM `'._DB_PREFIX_.pSQL($this->table).'_'.$input['type'].'`
+ WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
+ foreach (Db::getInstance()->executeS($sql) as $row)
+ $this->fields_value['shop'][$row['id_'.$input['type']]][] = $row[$this->identifier];
+ }
+ }
+ else if (isset($input['lang']) && $input['lang'])
foreach ($this->_languages as $language)
$this->fields_value[$input['name']][$language['id_lang']] = $this->getFieldValue($obj, $input['name'], $language['id_lang']);
else
diff --git a/classes/HelperForm.php b/classes/HelperForm.php
index d0d7b9293..f6e4deead 100644
--- a/classes/HelperForm.php
+++ b/classes/HelperForm.php
@@ -166,10 +166,11 @@ class HelperFormCore extends Helper
*/
public function getFieldsRequired()
{
- if (isset($this->fields_form['input']))
- foreach ($this->fields_form['input'] as $input)
- if (array_key_exists('required', $input) && $input['required'])
- return true;
+ foreach ($this->fields_form as $fieldset)
+ if (isset($fieldset['form']['input']))
+ foreach ($fieldset['form']['input'] as $input)
+ if (array_key_exists('required', $input) && $input['required'])
+ return true;
return false;
}
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index c84b87e40..6b38808f3 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -231,17 +231,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
if (!($obj = $this->loadObject(true)))
return;
- //Added values of object Shop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_group_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_group_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_group_shop']][] = $row[$this->identifier];
- }
-
return parent::initForm();
}
@@ -339,17 +328,6 @@ class AdminAttributesGroupsControllerCore extends AdminController
'id_attribute' => $this->getFieldValue($obj, 'id'),
);
- // Added values of object GroupShop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_group_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_group_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_group_shop']][] = $row[$this->identifier];
- }
-
$str_attributes_groups = '';
foreach ($attributes_groups as $attribute_group)
$str_attributes_groups .= '"'.$attribute_group['id_attribute_group'].'" : '.($attribute_group['group_type'] == 'color' ? '1' : '0' ) .', ';
diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php
index ff8767355..b8adf498f 100644
--- a/controllers/admin/AdminCarriersController.php
+++ b/controllers/admin/AdminCarriersController.php
@@ -540,17 +540,6 @@ class AdminCarriersControllerCore extends AdminController
$groups = Group::getGroups($this->context->language->id);
foreach ($groups as $group)
$this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], (in_array($group['id_group'], $carrier_groups_ids)));
-
- //Added values of object Shop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier];
- }
}
public function beforeDelete($object)
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index 5674800cc..9f8d852e1 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -335,17 +335,6 @@ class AdminCountriesControllerCore extends AdminController
'name' => 'checkBoxShopAsso',
'values' => Shop::getTree()
);
-
- //Added values of object Shop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier];
- }
}
$this->fields_form['submit'] = array(
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index 54da486e1..50579f0c9 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -282,17 +282,6 @@ class AdminEmployeesControllerCore extends AdminController
$this->fields_value['passwd'] = false;
- //Added values of object Shop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier];
- }
-
return parent::initForm();
}
diff --git a/controllers/admin/AdminLanguagesController.php b/controllers/admin/AdminLanguagesController.php
index f12c3f572..12154294b 100644
--- a/controllers/admin/AdminLanguagesController.php
+++ b/controllers/admin/AdminLanguagesController.php
@@ -288,17 +288,6 @@ class AdminLanguagesControllerCore extends AdminController
'ps_version' => _PS_VERSION_
);
- //Added values of object Shop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier];
- }
-
$this->addJS(_PS_JS_DIR_.'checkLangPack.js');
return parent::initForm();
diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index d5d2a0027..672a04212 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -326,7 +326,7 @@ class AdminManufacturersControllerCore extends AdminController
{
$this->fields_form['input'][] = array(
'type' => 'group_shop',
- 'label' => $this->l('Shop association:'),
+ 'label' => $this->l('GroupShop association:'),
'name' => 'checkBoxShopAsso',
'values' => Shop::getTree()
);
@@ -359,17 +359,6 @@ class AdminManufacturersControllerCore extends AdminController
)), ENT_COMPAT, 'UTF-8');
}
- //Added values of object Shop
- if ($manufacturer->id)
- {
- $assos = array();
- $sql = 'SELECT `id_group_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_group_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$manufacturer->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_group_shop']][] = $row[$this->identifier];
- }
-
return parent::initForm();
}
diff --git a/controllers/admin/AdminReferrersController.php b/controllers/admin/AdminReferrersController.php
index 22556e66a..350beaec5 100644
--- a/controllers/admin/AdminReferrersController.php
+++ b/controllers/admin/AdminReferrersController.php
@@ -360,17 +360,6 @@ class AdminReferrersControllerCore extends AdminController
'request_uri_like_not' => str_replace('\\', '\\\\', htmlentities($this->getFieldValue($obj, 'request_uri_like_not'), ENT_COMPAT, 'UTF-8'))
);
- //Added values of object Shop
- if ($obj->id)
- {
- $assos = array();
- $sql = 'SELECT `id_shop`, `'.pSQL($this->identifier).'`
- FROM `'._DB_PREFIX_.pSQL($this->table).'_shop`
- WHERE `'.pSQL($this->identifier).'` = '.(int)$obj->id;
- foreach (Db::getInstance()->executeS($sql) as $row)
- $this->fields_value['shop'][$row['id_shop']][] = $row[$this->identifier];
- }
-
$this->tpl_form_vars = array('uri' => $uri);
return parent::initForm();
diff --git a/controllers/admin/AdminStatsTabController.php b/controllers/admin/AdminStatsTabController.php
index c305bea01..4d4c6e304 100644
--- a/controllers/admin/AdminStatsTabController.php
+++ b/controllers/admin/AdminStatsTabController.php
@@ -235,8 +235,6 @@ abstract class AdminStatsTabControllerCore extends AdminPreferencesControllerCor
else
$this->_errors[] = Tools::displayError('You do not have permission to edit here.');
}
- if (count($this->_errors))
- AdminTab::displayErrors();
}
protected function getDate()