From df0b06825197c1ec356f2ba81443275de3d5f5db Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 1 Dec 2011 14:30:31 +0100 Subject: [PATCH] use acquired description from the parent if empty in the web section. --- .../portal_skins/erp5_km_theme/template_erp5_km_minimal.xml | 1 + bt5/erp5_km/bt/change_log | 3 +++ bt5/erp5_km/bt/revision | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml index 904ff98595..262a6e9bad 100644 --- a/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml +++ b/bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/template_erp5_km_minimal.xml @@ -106,6 +106,7 @@ is_front_layout python: layout_form is not None and\n layout_form.id == \'erp5_km_minimal_front_layout\';\n subject_list python:here.getSubjectList() or here.getLayoutProperty(\'subject_list\') or [];\n + description python:here.getDescription() or here.getLayoutProperty(\'description\') or \'\';\n global header_title python:\'%s | %s\' % (here.getTranslatedTitleOrId(), website.getTranslatedTitleOrId());\n global css_list_template python:[\n \'%s/erp5_listbox.css\' % portal_path,\n diff --git a/bt5/erp5_km/bt/change_log b/bt5/erp5_km/bt/change_log index 77f59c06d4..8fbd3ad1b3 100644 --- a/bt5/erp5_km/bt/change_log +++ b/bt5/erp5_km/bt/change_log @@ -1,3 +1,6 @@ +2011-12-01 Kazuhiko +* use acquired description from the parent if empty in the web section. + 2011-08-29 Kazuhiko * use acquired subject list from the parent if empty in the web section. diff --git a/bt5/erp5_km/bt/revision b/bt5/erp5_km/bt/revision index 3130583df1..cda0691f5b 100644 --- a/bt5/erp5_km/bt/revision +++ b/bt5/erp5_km/bt/revision @@ -1 +1 @@ -1843 \ No newline at end of file +1844 \ No newline at end of file -- 2.30.9