issue 2584 added a is_sitemap value.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11758 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-17 07:01:49 +00:00
parent 61ff5e2343
commit 9a26c5dc71
2 changed files with 19 additions and 2 deletions

View file

@ -90,11 +90,15 @@
unset($extra_vars->apply_layout);
unset($extra_vars->apply_mobile_view);
$is_sitemap = $extra_vars->is_sitemap;
unset($extra_vars->is_sitemap);
$args = Context::gets('layout_srl','title');
// Get layout information
$oLayoutModel = &getModel('layout');
$oMenuAdminModel = &getAdminModel('menu');
$layout_info = $oLayoutModel->getLayout($args->layout_srl);
if($layout_info->menu) {
$menus = get_object_vars($layout_info->menu);
}
@ -184,11 +188,23 @@
$args->extra_vars = serialize($extra_vars);
$output = $this->updateLayout($args);
if(!$output->toBool()) return $output;
if(!$output->toBool())
{
return $output;
}
FileHandler::removeDir($tmpDir);
return $this->setRedirectUrl(Context::get('error_return_url'), $output);
if(!$is_sitemap)
{
return $this->setRedirectUrl(Context::get('error_return_url'), $output);
}
else
{
$context = Context::getInstance();
$context->setRequestMethod('JSON');
$this->setMessage('success');
}
}
/**

View file

@ -1,6 +1,7 @@
<form id="config_form" ruleset="updateLayout" action="./" enctype="multipart/form-data" method="post">
<input type="hidden" name="module" value="layout" />
<input type="hidden" name="act" value="procLayoutAdminUpdate" />
<input type="hidden" name="is_sitemap" value="1" />
<input type="hidden" name="layout_srl" value="{$layout_srl}" />
<input type="hidden" name="layout" value="{$selected_layout->layout}" />
<input type="hidden" name="_layout_type" value="{$selected_layout->layout_type}" />