Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed title CMS page KO #6665

Merged
merged 2 commits into from
Oct 12, 2016
Merged

Fixed title CMS page KO #6665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
647260c
BO: refacto AdminCmsContent for title KO
aleeks Oct 12, 2016
b8595bc
BO: Fix update category cms link
aleeks Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/Tools.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3528,7 +3528,7 @@ public static function getPath($url_base, $id_category, $path = '', $highlight =
return $path;
}
$name = ($highlight != null) ? str_ireplace($highlight, '<span class="highlight">'.$highlight.'</span>', CMSCategory::hideCMSCategoryPosition($category->name)) : CMSCategory::hideCMSCategoryPosition($category->name);
$edit = '<a href="'.Tools::safeOutput($url_base.'&id_cms_category='.$category->id.'&addcategory&token='.Tools::getAdminToken('AdminCmsContent'.(int)Tab::getIdFromClassName('AdminCmsContent').(int)$context->employee->id)).'">
$edit = '<a href="'.Tools::safeOutput($url_base.'&id_cms_category='.$category->id.'&updatecms_category&token='.Tools::getAdminToken('AdminCmsContent'.(int)Tab::getIdFromClassName('AdminCmsContent').(int)$context->employee->id)).'">
<i class="icon-pencil"></i></a> ';
if ($category->id == 1) {
$edit = '<li><a href="'.Tools::safeOutput($url_base.'&id_cms_category='.$category->id.'&viewcategory&token='.Tools::getAdminToken('AdminCmsContent'.(int)Tab::getIdFromClassName('AdminCmsContent').(int)$context->employee->id)).'">
Expand Down
130 changes: 62 additions & 68 deletions controllers/admin/AdminCmsContentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,49 @@ public static function getCurrentCMSCategory()
return self::$category;
}

public function initProcess()
{
if (((Tools::isSubmit('submitAddcms_category') || Tools::isSubmit('submitAddcms_categoryAndStay')) && count($this->admin_cms_categories->errors))
|| Tools::isSubmit('updatecms_category')
|| Tools::isSubmit('addcms_category')) {
$this->display = 'edit_category';
} elseif (((Tools::isSubmit('submitAddcms') || Tools::isSubmit('submitAddcmsAndStay')) && count($this->admin_cms->errors))
|| Tools::isSubmit('updatecms')
|| Tools::isSubmit('addcms')) {
$this->display = 'edit_page';
} else {
$this->display = 'list';
}
}

public function initContent()
{
$this->renderPageHeaderToolbar();
$id_cms_category = (int)Tools::getValue('id_cms_category');

if (!$id_cms_category) {
$id_cms_category = 1;
}

if ($this->display == 'list') {
$this->page_header_toolbar_btn['new_cms_category'] = array(
'href' => self::$currentIndex.'&addcms_category&token='.$this->token,
'desc' => $this->trans('Add new CMS category', array(), 'Admin.Design.Help'),
'icon' => 'process-icon-new'
);
$this->page_header_toolbar_btn['new_cms_page'] = array(
'href' => self::$currentIndex.'&addcms&id_cms_category='.(int)$id_cms_category.'&token='.$this->token,
'desc' => $this->trans('Add new CMS page', array(), 'Admin.Design.Help'),
'icon' => 'process-icon-new'
);
}

$this->page_header_toolbar_title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);

if (is_array($this->page_header_toolbar_btn)
&& $this->page_header_toolbar_btn instanceof Traversable
|| trim($this->page_header_toolbar_title) != '') {
$this->show_page_header_toolbar = true;
}

$this->admin_cms_categories->token = $this->token;
$this->admin_cms->token = $this->token;
Expand All @@ -90,10 +130,7 @@ public function initContent()
$this->content .= $this->admin_cms_categories->renderForm();
} elseif ($this->display == 'edit_page') {
$this->content .= $this->admin_cms->renderForm();
} elseif ($this->display == 'view_page') {
$fixme = 'fixme';
}// @FIXME
else {
} elseif ($this->display == 'list') {
$id_cms_category = (int)Tools::getValue('id_cms_category');
if (!$id_cms_category) {
$id_cms_category = 1;
Expand All @@ -110,8 +147,6 @@ public function initContent()
}
$this->context->smarty->assign(array(
'cms_breadcrumb' => Tools::getPath($cat_bar_index, $id_cms_category, '', '', 'cms'),
'page_header_toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_title' => $this->toolbar_title,
));

$this->content .= $this->admin_cms_categories->renderList();
Expand All @@ -120,72 +155,44 @@ public function initContent()
}

$this->context->smarty->assign(array(
'content' => $this->content
'content' => $this->content,
'show_page_header_toolbar' => $this->show_page_header_toolbar,
'title' => $this->page_header_toolbar_title,
'toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_title' => $this->toolbar_title,
));
}

public function renderPageHeaderToolbar()
public function initToolbarTitle()
{
$id_cms_category = (int)Tools::getValue('id_cms_category');
$id_cms_page = Tools::getValue('id_cms');
$this->toolbar_title = is_array($this->breadcrumbs) ? array_unique($this->breadcrumbs) : array($this->breadcrumbs);

if (!$id_cms_category) {
$id_cms_category = 1;
$id_cms_category = (int)Tools::getValue('id_cms_category');
if ($id_cms_category && $id_cms_category !==1) {
$cms_category = new CMSCategory($id_cms_category);
}
$id_cms_page = Tools::getValue('id_cms');

$cms_category = new CMSCategory($id_cms_category);

if ($this->display == 'edit_category') {
if (Tools::getValue('addcms_category') !== false) {
$this->toolbar_title[] = $this->trans('Add new', array(), 'Admin.Actions');
$this->toolbar_title[] = $this->trans('Add new category', array(), 'Admin.Design.Feature');
} else {
$this->toolbar_title[] = $this->trans('Edit: %name%', array('%name' => $cms_category->name[$this->context->employee->id_lang]), 'Admin.Design.Feature');
if (isset($cms_category)) {
$this->toolbar_title[] = $this->trans('Edit category: %name%', array('%name%' => $cms_category->name[$this->context->employee->id_lang]), 'Admin.Design.Feature');
}
}
} elseif ($this->display == 'edit_page') {
$this->toolbar_title[] = $cms_category->name[$this->context->employee->id_lang];

if (Tools::getValue('addcms') !== false) {
$this->toolbar_title[] = $this->trans('Add new', array(), 'Admin.Actions');
$this->toolbar_title[] = $this->trans('Add new page', array(), 'Admin.Design.Feature');
} elseif ($id_cms_page) {
$cms_page = new CMS($id_cms_page);
$this->toolbar_title[] = $this->trans('Edit: %meta_title%', array('%meta_title%' => $cms_page->meta_title[$this->context->employee->id_lang]), 'Admin.Design.Feature');
$this->toolbar_title[] = $this->trans('Edit page: %meta_title%', array('%meta_title%' => $cms_page->meta_title[$this->context->employee->id_lang]), 'Admin.Design.Feature');
}
} else {
$this->toolbar_title[] = $this->trans('CMS', array(), 'Admin.Design.Feature');
}

if ($this->display == 'list') {
$this->page_header_toolbar_btn['new_cms_category'] = array(
'href' => self::$currentIndex.'&addcms_category&token='.$this->token,
'desc' => $this->trans('Add new CMS category', array(), 'Admin.Design.Help'),
'icon' => 'process-icon-new'
);
$this->page_header_toolbar_btn['new_cms_page'] = array(
'href' => self::$currentIndex.'&addcms&id_cms_category='.(int)$id_cms_category.'&token='.$this->token,
'desc' => $this->trans('Add new CMS page', array(), 'Admin.Design.Help'),
'icon' => 'process-icon-new'
);
}

$this->page_header_toolbar_title = implode(' '.Configuration::get('PS_NAVIGATION_PIPE').' ', $this->toolbar_title);

if (is_array($this->page_header_toolbar_btn)
&& $this->page_header_toolbar_btn instanceof Traversable
|| trim($this->page_header_toolbar_title) != '') {
$this->show_page_header_toolbar = true;
} elseif ($this->display == 'list' && isset($cms_category)) {
$this->toolbar_title[] = $this->trans('Category: %category%', array('%category%' => $cms_category->name[$this->context->employee->id_lang]), 'Admin.Design.Feature');
}

$template = $this->context->smarty->createTemplate(
$this->context->smarty->getTemplateDir(0).DIRECTORY_SEPARATOR
.'page_header_toolbar.tpl', $this->context->smarty);

$this->context->smarty->assign(array(
'show_page_header_toolbar' => $this->show_page_header_toolbar,
'title' => $this->page_header_toolbar_title,
'toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_btn' => $this->page_header_toolbar_btn,
'page_header_toolbar_title' => $this->toolbar_title,
));
}

public function postProcess()
Expand All @@ -195,19 +202,6 @@ public function postProcess()

parent::postProcess();

if (((Tools::isSubmit('submitAddcms_category') || Tools::isSubmit('submitAddcms_categoryAndStay')) && count($this->admin_cms_categories->errors))
|| Tools::isSubmit('updatecms_category')
|| Tools::isSubmit('addcms_category')) {
$this->display = 'edit_category';
} elseif (((Tools::isSubmit('submitAddcms') || Tools::isSubmit('submitAddcmsAndStay')) && count($this->admin_cms->errors))
|| Tools::isSubmit('updatecms')
|| Tools::isSubmit('addcms')) {
$this->display = 'edit_page';
} else {
$this->display = 'list';
$this->id_cms_category = (int)Tools::getValue('id_cms_category');
}

if (isset($this->admin_cms->errors)) {
$this->errors = array_merge($this->errors, $this->admin_cms->errors);
}
Expand Down