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

[-] BO : #PSFV-566 : BugFix - Add new CMS block

Browse Source
This commit is contained in:
Francois Gaillard
2012-02-27 08:48:56 +00:00
parent e7aac3272f
commit 568b0d0799
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcms/BlockCMSModel.php
+5 -5
View File
@@ -157,10 +157,10 @@ class BlockCMSModel extends ObjectModel
return Db::getInstance()->Insert_ID(); return Db::getInstance()->Insert_ID();
} }
public static function insertCMSBlockShop($id_cms_block, $id_group_shop, $id_shop) public static function insertCMSBlockShop($id_cms_block, $id_shop)
{ {
$sql = 'INSERT INTO `'._DB_PREFIX_.'cms_block_shop` (`id_cms_block`, `id_group_shop`, `id_shop`) $sql = 'INSERT INTO `'._DB_PREFIX_.'cms_block_shop` (`id_cms_block`, `id_shop`)
VALUES('.(int)$id_cms_block.', '.(int)$id_group_shop.', '.(int)$id_shop.')'; VALUES('.(int)$id_cms_block.', '.(int)$id_shop.')';
Db::getInstance()->execute($sql); Db::getInstance()->execute($sql);
@@ -521,11 +521,11 @@ class BlockCMSModel extends ObjectModel
return $titles; return $titles;
} }
public static function getCMSTitles($location, $id_group_shop = false, $id_shop = false) public static function getCMSTitles($location, $id_shop = false)
{ {
$content = array(); $content = array();
$context = Context::getContext(); $context = Context::getContext();
$cmsCategories = BlockCMSModel::getCMSCategoriesByLocation($location, $id_group_shop, $id_shop); $cmsCategories = BlockCMSModel::getCMSCategoriesByLocation($location, $id_shop);
if (is_array($cmsCategories) && count($cmsCategories)) if (is_array($cmsCategories) && count($cmsCategories))
{ {
modules/blockcms/blockcms.php
+3 -2
View File
@@ -178,11 +178,12 @@ class BlockCms extends Module
'label' => $this->l('CMS Blocks :'), 'label' => $this->l('CMS Blocks :'),
'name' => 'cms_blocks', 'name' => 'cms_blocks',
'values' => array( 'values' => array(
0 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::LEFT_COLUMN), 0 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::LEFT_COLUMN, Shop::getContextShopID()),
1 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::RIGHT_COLUMN)) 1 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::RIGHT_COLUMN, Shop::getContextShopID()))
) )
) )
); );
$this->fields_form[1]['form'] = array( $this->fields_form[1]['form'] = array(
'tinymce' => true, 'tinymce' => true,
'legend' => array( 'legend' => array(