Author: SvenDowideit
Date: 2012-07-15 03:12:20 +0000 (Sun, 15 Jul 2012)
New Revision: 15145
Trac url: http://trac.foswiki.org/changeset/15145
Log:
http://foswiki.org/Tasks/Item11764 : if you nest sectional includes at different levels, you cannot use INCLUDINGTOPIC
Modified:
trunk/core/data/System/WikiApplications.txt
Modified: trunk/core/data/System/WikiApplications.txt
===================================================================
--- trunk/core/data/System/WikiApplications.txt 2012-07-14 21:16:26 UTC (rev 15144)
+++ trunk/core/data/System/WikiApplications.txt 2012-07-15 03:12:20 UTC (rev 15145)
@@ -50,7 +50,8 @@
---+++ listitems
<verbatim class="tml">
-%STARTSECTION{"listitems" PREFIX="Prefix" }%
+%STARTSECTION{"listitems" PREFIX="Prefix" FUNNIN="%INCLUDINGTOPIC%"}%
+---++ %FUNNIN% - %INCLUDINGTOPIC%
%SEARCH{
"form.name = '%INCLUDINGWEB%.%INCLUDINGTOPIC%'"
web="%INCLUDINGWEB%"
@@ -58,7 +59,7 @@
type="query"
pager="on"
nonoise="on"
- format=" 1 $formfield(Description) - $percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotcreatepopup$quot ITEMWEB=$quot$web$quot ITEMTOPIC=$quot$topic$quot}$percnt"
+ format=" 1 $formfield(Description) - $percntINCLUDE{$quot%WEB%.%TOPIC%$quot section=$quotcreatepopup$quot ITEMWEB=$quot$web$quot ITEMTOPIC=$quot$topic$quot FORMTEMPLATE=$quot$formname$quot}$percnt"
pager="on"
pagesize="5"
}%
@@ -69,11 +70,11 @@
* ITEMWEB - (defaults to This web)
* ITEMTOPIC - (defaults to %PREFIX%AUTOINC001)
<verbatim class="tml">
-%STARTSECTION{"createpopup" PREFIX="Prefix" ITEMWEB="%BASEWEB%" ITEMTOPIC="%PREFIX%AUTOINC001"}%%JQREQUIRE{
+%STARTSECTION{"createpopup" PREFIX="Prefix" ITEMWEB="%BASEWEB%" ITEMTOPIC="%PREFIX%AUTOINC001" FORMTEMPLATE="%INCLUDINGWEB%.%INCLUDINGTOPIC%"}%%JQREQUIRE{
"ui::dialog, ui::button"
}% %BUTTON{
text="%IF{"istopic '%ITEMWEB%.%ITEMTOPIC%'" then="edit %ITEMTOPIC%" else="add New %PREFIX%"}%"
- href="%SCRIPTURL{edit}%/%ITEMWEB%/%ITEMTOPIC%?template=System.WikiApplicationsViewSectionTemplate&formtemplate=%INCLUDINGWEB%.%INCLUDINGTOPIC%&_t=%GMTIME{"$day$mon$hour$min$sec"}%&redirectto=%BASEWEB%.%BASETOPIC%"
+ href="%SCRIPTURL{edit}%/%ITEMWEB%/%ITEMTOPIC%?template=System.WikiApplicationsViewSectionTemplate&formtemplate=%FORMTEMPLATE%&_t=%GMTIME{"$day$mon$hour$min$sec"}%&redirectto=%BASEWEB%.%BASETOPIC%"
class="foswikiClear jqUIDialogLink {cache:false}"
icon="create"
}% %ENDSECTION{"createpopup"}%
|