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

// Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID()

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-27 09:49:19 +00:00
parent 275ec90ef0
commit 1c2f174bdb
14 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+3 -3
View File
@@ -617,7 +617,7 @@ class ShopCore extends ObjectModel
* @param string $share If false, dont check share datas from group. Else can take a Shop::SHARE_* constant value
* @return array
*/
public function getListOfID($share = false)
public static function getContextListShopID($share = false)
{
if (Shop::getContext() == Shop::CONTEXT_SHOP)
$list = ($share) ? Shop::getSharedShops(Shop::getContextShopID(), $share) : array(Shop::getContextShopID());
@@ -713,7 +713,7 @@ class ShopCore extends ObjectModel
else
{
if (Shop::getContext() != Shop::CONTEXT_ALL)
$restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', $this->getListOfID($share)).') ';
$restriction = ' AND '.$alias.'id_shop IN ('.implode(', ', Shop::getContextListShopID($share)).') ';
//else if ($share == Shop::SHARE_STOCK)
// $restriction = ' AND '.$alias.'id_shop = '.$this->getID(true);
}
@@ -742,7 +742,7 @@ class ShopCore extends ObjectModel
$sql = (($inner_join) ? ' INNER' : ' LEFT').' JOIN '._DB_PREFIX_.$table.'_shop '.$table_alias.'
ON '.$table_alias.'.id_'.$table.' = '.$alias.'.id_'.$table.'
AND '.$table_alias.'.id_shop IN('.implode(', ', $this->getListOfID()).') ';
AND '.$table_alias.'.id_shop IN('.implode(', ', Shop::getContextListShopID()).') ';
return $sql;
}