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

[-] BO : fixed bug #PSCFV-3806 - fixed bug when unchecked all shop asso you can't access to item any more.

Browse Source
This commit is contained in:
vAugagneur
2012-08-30 13:44:56 +00:00
parent 1698e14153
commit 4746660bad
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+3 -4
View File
@@ -2011,16 +2011,15 @@ class AdminControllerCore extends Controller
if ($this->multishop_context && Shop::isTableAssociated($this->table) && !empty($this->className))
{
if (Shop::getContext() != Shop::CONTEXT_ALL || Shop::isTableAssociated($this->table) || !$this->context->employee->isSuperAdmin())
if (Shop::getContext() != Shop::CONTEXT_ALL || !$this->context->employee->isSuperAdmin())
{
$identifier_shop = Shop::getContextListShopID();
$test_join = !preg_match('#`?'.preg_quote(_DB_PREFIX_.$this->table.'_shop').'`? *sa#', $this->_join);
if (Shop::isFeatureActive() && $test_join)
if (Shop::isFeatureActive() && $test_join && Shop::isTableAssociated($this->table))
{
$this->_where .= ' AND a.'.$this->identifier.' IN (
SELECT sa.'.$this->identifier.'
FROM `'._DB_PREFIX_.$this->table.'_shop` sa
WHERE sa.id_shop IN ('.implode(', ', $identifier_shop).')
WHERE sa.id_shop IN ('.implode(', ', Shop::getContextListShopID()).')
)';
}
}