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

[-] FO : fixed bug #PSCFV-5368 - CMS pages are all blank in front but exists in admin

Browse Source
This commit is contained in:
vAugagneur
2012-11-13 15:50:31 +00:00
parent 54a93d5b2d
commit 1ed8a01f5f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/CmsController.php
+1 -1
View File
@@ -101,7 +101,7 @@ class CmsControllerCore extends FrontController
else if ($this->assignCase == 2) else if ($this->assignCase == 2)
{ {
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'category' => $this->cms_category, 'cms_category' => $this->cms_category,
'sub_category' => $this->cms_category->getSubCategories($this->context->language->id), 'sub_category' => $this->cms_category->getSubCategories($this->context->language->id),
'cms_pages' => CMS::getCMSPages($this->context->language->id, (int)($this->cms_category->id) ), 'cms_pages' => CMS::getCMSPages($this->context->language->id, (int)($this->cms_category->id) ),
'path' => ($this->cms_category->id !== 1) ? Tools::getPath($this->cms_category->id, $this->cms_category->name, false, 'CMS') : '', 'path' => ($this->cms_category->id !== 1) ? Tools::getPath($this->cms_category->id, $this->cms_category->name, false, 'CMS') : '',
themes/default/cms.tpl
+5 -5
View File
@@ -26,7 +26,7 @@
{if ($content_only == 0)} {if ($content_only == 0)}
{include file="$tpl_dir./breadcrumb.tpl"} {include file="$tpl_dir./breadcrumb.tpl"}
{/if} {/if}
{if isset($cms) && !isset($category)} {if isset($cms) && !isset($cms_category)}
{if !$cms->active} {if !$cms->active}
<br /> <br />
<div id="admin-action-cms"> <div id="admin-action-cms">
@@ -43,11 +43,11 @@
<div class="rte{if $content_only} content_only{/if}"> <div class="rte{if $content_only} content_only{/if}">
{$cms->content} {$cms->content}
</div> </div>
{elseif isset($category)} {elseif isset($cms_category)}
<div class="block-cms"> <div class="block-cms">
<h1><a href="{if $category->id eq 1}{$base_dir}{else}{$link->getCMSCategoryLink($category->id, $category->link_rewrite)}{/if}">{$category->name|escape:'htmlall':'UTF-8'}</a></h1> <h1><a href="{if $cms_category->id eq 1}{$base_dir}{else}{$link->getCMSCategoryLink($cms_category->id, $cms_category->link_rewrite)}{/if}">{$cms_category->name|escape:'htmlall':'UTF-8'}</a></h1>
{if isset($sub_category) & !empty($sub_category)} {if isset($sub_category) & !empty($sub_category)}
<h4>{l s='List of sub categories in %s:' sprintf=$category->name}</h4> <h4>{l s='List of sub categories in %s:' sprintf=$cms_category->name}</h4>
<ul class="bullet"> <ul class="bullet">
{foreach from=$sub_category item=subcategory} {foreach from=$sub_category item=subcategory}
<li> <li>
@@ -57,7 +57,7 @@
</ul> </ul>
{/if} {/if}
{if isset($cms_pages) & !empty($cms_pages)} {if isset($cms_pages) & !empty($cms_pages)}
<h4>{l s='List of pages in %s:' sprintf=$category->name}</h4> <h4>{l s='List of pages in %s:' sprintf=$cms_category->name}</h4>
<ul class="bullet"> <ul class="bullet">
{foreach from=$cms_pages item=cmspages} {foreach from=$cms_pages item=cmspages}
<li> <li>