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

[-] BO : BugFix - Alert message for new CMS pages + errors

Browse Source
This commit is contained in:
François Gaillard
2012-02-29 13:43:46 +00:00
parent 84807f52d8
commit 0457a4281d
3 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/cms/helpers/form/form.tpl
+2 -2
View File
@@ -47,10 +47,10 @@
} }
} }
$('#active_on').bind('click', function(){ $('#active_on').bind('click', function(){
toggleDraftWarning(true); toggleDraftWarning(false);
}); });
$('#active_off').bind('click', function(){ $('#active_off').bind('click', function(){
toggleDraftWarning(false); toggleDraftWarning(true);
}); });
}); });
{/block} {/block}
classes/Link.php
+10 -2
View File
@@ -209,8 +209,16 @@ class LinkCore
$params = array(); $params = array();
$params['id'] = $cms->id; $params['id'] = $cms->id;
$params['rewrite'] = (!$alias) ? $cms->link_rewrite : $alias; $params['rewrite'] = (!$alias) ? $cms->link_rewrite : $alias;
$params['meta_keywords'] = Tools::str2url($cms->meta_keywords);
$params['meta_title'] = Tools::str2url($cms->meta_title); if (isset($cms->meta_keywords[$id_lang]) && !empty($cms->meta_keywords[$id_lang]))
$params['meta_keywords'] = Tools::str2url($cms->meta_keywords[$id_lang]);
else
$params['meta_keywords'] = '';
if (isset($cms->meta_title[$id_lang]) && !empty($cms->meta_title[$id_lang]))
$params['meta_title'] = Tools::str2url($cms->meta_title[$id_lang]);
else
$params['meta_title'] = '';
return $url.Dispatcher::getInstance()->createUrl('cms_rule', $params, $this->allow); return $url.Dispatcher::getInstance()->createUrl('cms_rule', $params, $this->allow);
} }
controllers/admin/AdminCmsController.php
+17 -30
View File
@@ -277,22 +277,6 @@ class AdminCmsControllerCore extends AdminController
$this->errors[] = Tools::displayError('An error occurred while creating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>'; $this->errors[] = Tools::displayError('An error occurred while creating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
else else
$this->updateAssoShop($cms->id); $this->updateAssoShop($cms->id);
if (Tools::isSubmit('submitAddcmsAndPreview'))
{
$preview_url = $this->context->link->getCMSLink($cms, $this->getFieldValue($cms, 'link_rewrite', $this->context->language->id), $this->context->language->id);
if (!$cms->active)
{
$admin_dir = dirname($_SERVER['PHP_SELF']);
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
$token = Tools::encrypt('PreviewCMS'.$cms->id);
$preview_url .= $cms->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
}
Tools::redirectAdmin($preview_url);
}
else
Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=3&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
else else
{ {
@@ -302,22 +286,25 @@ class AdminCmsControllerCore extends AdminController
$this->errors[] = Tools::displayError('An error occurred while updating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>'; $this->errors[] = Tools::displayError('An error occurred while updating object.').' <b>'.$this->table.' ('.Db::getInstance()->getMsgError().')</b>';
else else
$this->updateAssoShop($cms->id); $this->updateAssoShop($cms->id);
if (Tools::isSubmit('submitAddcmsAndPreview'))
{
$preview_url = $this->context->link->getCMSLink($cms, $this->getFieldValue($object, 'link_rewrite', $this->context->language->id), $this->context->language->id);
if (!$cms->active)
{
$admin_dir = dirname($_SERVER['PHP_SELF']);
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
$token = Tools::encrypt('PreviewCMS'.$cms->id);
$preview_url .= $object->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
}
Tools::redirectAdmin($preview_url);
}
else
Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
if (Tools::isSubmit('submitAddcmsAndPreview'))
{
$alias = $this->getFieldValue($cms, 'link_rewrite', $this->context->language->id);
$preview_url = $this->context->link->getCMSLink($cms, $alias, $this->context->language->id);
if (!$cms->active)
{
$admin_dir = dirname($_SERVER['PHP_SELF']);
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
$token = Tools::encrypt('PreviewCMS'.$cms->id);
$preview_url .= $object->active ? '' : '&adtoken='.$token.'&ad='.$admin_dir;
}
Tools::redirectAdmin($preview_url);
}
else
Tools::redirectAdmin(self::$currentIndex.'&id_cms_category='.$cms->id_cms_category.'&conf=4&token='.Tools::getAdminTokenLite('AdminCmsContent'));
} }
} }
elseif (Tools::getValue('position')) elseif (Tools::getValue('position'))