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

// norm fix

Browse Source
This commit is contained in:
vChabot
2012-01-31 15:29:35 +00:00
parent 5ea0aeed01
commit 4511b4d2f2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminShopController.php
+4 -4
View File
@@ -96,7 +96,7 @@ class AdminShopControllerCore extends AdminController
if ((bool)$shop->id) if ((bool)$shop->id)
{ {
// adding button for delete this shop // adding button for delete this shop
if ($this->tabAccess['delete'] && $this->display != 'add' && !Shop::has_dependency($shop->id)) if ($this->tabAccess['delete'] && $this->display != 'add' && !Shop::hasDependency($shop->id))
$this->toolbar_btn['delete'] = array( $this->toolbar_btn['delete'] = array(
'short' => 'Delete', 'short' => 'Delete',
'href' => $this->context->link->getAdminLink('AdminShop').'&id_shop='.$shop->id.'&deleteshop', 'href' => $this->context->link->getAdminLink('AdminShop').'&id_shop='.$shop->id.'&deleteshop',
@@ -209,14 +209,14 @@ class AdminShopControllerCore extends AdminController
{ {
if (!Validate::isLoadedObject($object = $this->loadObject())) if (!Validate::isLoadedObject($object = $this->loadObject()))
$this->errors[] = Tools::displayError('Unable to load this shop.'); $this->errors[] = Tools::displayError('Unable to load this shop.');
else if (!Shop::has_dependency($object->id)) else if (!Shop::hasDependency($object->id))
return Category::deleteCategoriesFromShop($object->id) && parent::processDelete($token); return Category::deleteCategoriesFromShop($object->id) && parent::processDelete($token);
else else
$this->errors[] = Tools::displayError('You can\'t delete this shop (customer and/or order dependency)'); $this->errors[] = Tools::displayError('You can\'t delete this shop (customer and/or order dependency)');
return false; return false;
} }
public function afterAdd($new_shop) public function afterAdd($new_shop)
{ {
if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data)) if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data))
@@ -240,7 +240,7 @@ class AdminShopControllerCore extends AdminController
// don't allow to remove shop which have dependencies (customers / orders / ... ) // don't allow to remove shop which have dependencies (customers / orders / ... )
foreach ($this->_list as $shop) foreach ($this->_list as $shop)
{ {
if (Shop::has_dependency($shop['id_shop'])) if (Shop::hasDependency($shop['id_shop']))
$shop_delete_list[] = $shop['id_shop']; $shop_delete_list[] = $shop['id_shop'];
} }
$this->addRowActionSkipList('delete', $shop_delete_list); $this->addRowActionSkipList('delete', $shop_delete_list);