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

// fix toolbar bo shop controller and process delete error message

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11442 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-12-20 22:38:04 +00:00
parent e813ea996d
commit e9f57535b5
1 changed files with 66 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminShopController.php
+66
View File
@@ -86,6 +86,61 @@ class AdminShopControllerCore extends AdminController
parent::__construct();
}
public function initToolbar()
{
if ($this->display == 'edit' || $this->display == 'add')
{
if ($shop = $this->loadObject(true))
{
if ((bool)$shop->id)
{
// adding button for delete this shop
if ($this->tabAccess['delete'] && $this->display != 'add' && !Shop::has_dependency($shop->id))
$this->toolbar_btn['delete'] = array(
'short' => 'Delete',
'href' => $this->context->link->getAdminLink('AdminShop').'&id_shop='.$shop->id.'&deleteshop',
'desc' => $this->l('Delete this shop'),
'confirm' => 1);
// adding button for preview this shop
if ($url_preview = $shop->getBaseURL())
$this->toolbar_btn['preview'] = array(
'href' => $url_preview,
'desc' => $this->l('Home page'),
'target' => true,
'class' => 'previewUrl'
);
$this->toolbar_btn['new-url'] = array(
'href' => $this->context->link->getAdminLink('AdminShopUrl').'&id_shop='.$shop->id.'&addshop_url',
'desc' => $this->l('Add url'),
'class' => 'addShopUrl'
);
}
if ($this->tabAccess['edit'])
{
$this->toolbar_btn['save'] = array(
'short' => 'Save',
'href' => '#todo'.$this->context->link->getAdminLink('AdminShops').'&id_shop='.$shop->id,
'desc' => $this->l('Save'),
);
$this->toolbar_btn['save-and-stay'] = array(
'short' => 'SaveAndStay',
'href' => '#todo'.$this->context->link->getAdminLink('AdminShops').'&id_shop='.$shop->id,
'desc' => $this->l('Save and stay'),
);
}
}
}
parent::initToolbar();
$this->context->smarty->assign('toolbar_fix', 1);
}
public function initContent()
{
$shops = Shop::getShopWithoutUrls();
@@ -133,6 +188,17 @@ class AdminShopControllerCore extends AdminController
return parent::postProcess();
}
public function processDelete($token)
{
if (!Validate::isLoadedObject($object = $this->loadObject()))
$this->_errors[] = Tools::displayError('Unable to load this shop.');
else if(!Shop::has_dependency($object->id))
return parent::processDelete($token);
else
$this->_errors[] = Tools::displayError('You can\'t delete this shop (customer and/or order dependency)');
return false;
}
public function afterAdd($new_shop)
{
if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data))