From: <de...@de...> - 2007-01-05 08:47:32
|
Author: PeterThoeny Date: 2007-01-05 02:47:16 -0600 (Fri, 05 Jan 2007) New Revision: 12440 Modified: twiki/branches/MAIN/lib/TWiki/UI/ChangeForm.pm twiki/branches/MAIN/lib/TWiki/UI/Edit.pm twiki/branches/MAIN/lib/TWiki/UI/Preview.pm twiki/branches/MAIN/templates/changeform.tmpl twiki/branches/MAIN/templates/edit.tmpl twiki/branches/MAIN/templates/editform.tmpl twiki/branches/MAIN/templates/edittext.tmpl twiki/branches/MAIN/templates/preview.tmpl twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/changeform.classic.tmpl twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edit.classic.tmpl twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/editform.classic.tmpl twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edittext.classic.tmpl twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/preview.classic.tmpl twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl twiki/branches/MAIN/twikiplugins/PatternSkin/templates/editform.pattern.tmpl twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl Log: Item3316: Pass redirectto parameter from edit to preview to change form to save Modified: twiki/branches/MAIN/lib/TWiki/UI/ChangeForm.pm =================================================================== --- twiki/branches/MAIN/lib/TWiki/UI/ChangeForm.pm 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/lib/TWiki/UI/ChangeForm.pm 2007-01-05 08:47:16 UTC (rev 12440) @@ -90,6 +90,9 @@ my $parent = $q->param( 'topicparent' ) || ''; $page =~ s/%TOPICPARENT%/$parent/go; + my $redirectTo = $q->param( 'redirectto' ) || ''; + $page =~ s/%REDIRECTTO%/$redirectTo/go; + $page = $session->handleCommonTags( $page, $web, $topic ); $page = $session->{renderer}->getRenderedVersion( $page, $web, $topic ); Modified: twiki/branches/MAIN/lib/TWiki/UI/Edit.pm =================================================================== --- twiki/branches/MAIN/lib/TWiki/UI/Edit.pm 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/lib/TWiki/UI/Edit.pm 2007-01-05 08:47:16 UTC (rev 12440) @@ -87,6 +87,7 @@ my $editaction = lc($query->param( 'action' )) || ""; my $saveCmd = $query->param( 'cmd' ) || ''; + my $redirectTo = $query->param( 'redirectto' ) || ''; my $onlyWikiName = TWiki::isTrue( $query->param( 'onlywikiname' )); my $onlyNewTopic = TWiki::isTrue( $query->param( 'onlynewtopic' )); my $formTemplate = $query->param( 'formtemplate' ) || ''; @@ -251,6 +252,8 @@ } $tmpl =~ s/%TEMPLATETOPIC%/$templateTopic/; + $tmpl =~ s/%REDIRECTTO%/$redirectTo/; + # override with parameter if set $text = $ptext if defined $ptext; Modified: twiki/branches/MAIN/lib/TWiki/UI/Preview.pm =================================================================== --- twiki/branches/MAIN/lib/TWiki/UI/Preview.pm 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/lib/TWiki/UI/Preview.pm 2007-01-05 08:47:16 UTC (rev 12440) @@ -72,6 +72,9 @@ my $saveCmd = $query->param( 'cmd' ) || ''; $tmpl =~ s/%CMD%/$saveCmd/go; + my $redirectTo = $query->param( 'redirectto' ) || ''; + $tmpl =~ s/%REDIRECTTO%/$redirectTo/go; + $tmpl =~ s/%FORMTEMPLATE%/$form/g; my $parent = $meta->get('TOPICPARENT'); Modified: twiki/branches/MAIN/templates/changeform.tmpl =================================================================== --- twiki/branches/MAIN/templates/changeform.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/templates/changeform.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -28,6 +28,7 @@ %TEXT% %EDITACTION% <input type="hidden" name="topicparent" value="%URLPARAM{"topicparent"}%" /> +<input type="hidden" name="redirectto" value="%URLPARAM{"redirectto"}%" /> <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" /> <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" /> %TMPL:P{"topicinfo"}%</form>%TMPL:END% Modified: twiki/branches/MAIN/templates/edit.tmpl =================================================================== --- twiki/branches/MAIN/templates/edit.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/templates/edit.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -13,6 +13,7 @@ <textarea id='topic' name='text' rows='%EDITBOXHEIGHT%' cols='%EDITBOXWIDTH%' style='%EDITBOXSTYLE%' onkeydown='handleKeyDown(event)'>%TEXT%</textarea> </div> <input type="hidden" name="originalrev" value="%ORIGINALREV%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="templatetopic" value="%TEMPLATETOPIC%" /> Modified: twiki/branches/MAIN/templates/editform.tmpl =================================================================== --- twiki/branches/MAIN/templates/editform.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/templates/editform.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -9,8 +9,9 @@ <input type="hidden" id="topic" name="text" value="%TEXT%" /> <input type="hidden" name="editaction" value="form" /> <input type="hidden" name="originalrev" value="%ORIGINALREV%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> <input type="hidden" name="cmd" value="%CMD%" /> %FORMFIELDS% -%TMPL:P{"topicinfo"}%</form>%TMPL:END% \ No newline at end of file +%TMPL:P{"topicinfo"}%</form>%TMPL:END% Modified: twiki/branches/MAIN/templates/edittext.tmpl =================================================================== --- twiki/branches/MAIN/templates/edittext.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/templates/edittext.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -11,6 +11,7 @@ </div> <input type="hidden" name="editaction" value="text" /> <input type="hidden" name="originalrev" value="%ORIGINALREV%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> <input type="hidden" name="cmd" value="%CMD%" /> Modified: twiki/branches/MAIN/templates/preview.tmpl =================================================================== --- twiki/branches/MAIN/templates/preview.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/templates/preview.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -26,9 +26,9 @@ %META{"attachments"}% <form name="main" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%" method="post"> <input type="hidden" name="originalrev" value="%URLPARAM{"originalrev"}%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO" /> <input type="hidden" name="text" value="%HIDDENTEXT%"/> <input type="hidden" name="cmd" value="%CMD%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> %TMPL:P{"topicinfo"}%</form>%TMPL:END% - Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/changeform.classic.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/changeform.classic.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/changeform.classic.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -27,6 +27,7 @@ %TEXT% %EDITACTION% <input type="hidden" name="topicparent" value="%URLPARAM{"topicparent"}%" /> +<input type="hidden" name="redirectto" value="%URLPARAM{"redirectto"}%" /> <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" /> <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" /> %TMPL:P{"topicinfo"}%</form>%TMPL:END% Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edit.classic.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edit.classic.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edit.classic.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -28,6 +28,7 @@ </div> <input type="hidden" name="originalrev" value="%ORIGINALREV%" /> <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="templatetopic" value="%TEMPLATETOPIC%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/editform.classic.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/editform.classic.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/editform.classic.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -8,6 +8,7 @@ <input type="hidden" id="topic" name="text" value="%TEXT%" /> <input type="hidden" name="editaction" value="form" /> <input type="hidden" name="originalrev" value="%ORIGINALREV%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> <input type="hidden" name="settingstopic" value="%SETTINGSTOPIC%" /> Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edittext.classic.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edittext.classic.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/edittext.classic.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -10,6 +10,7 @@ </div> <input type="hidden" name="editaction" value="text" /> <input type="hidden" name="originalrev" value="%ORIGINALREV%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> <input type="hidden" name="cmd" value="%CMD%" /> Modified: twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/preview.classic.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/preview.classic.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/ClassicSkin/templates/preview.classic.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -33,6 +33,7 @@ %META{"attachments"}% <form name="main" action="%SCRIPTURLPATH{"save"}%/%WEB%/%TOPIC%" method="post"> <input type="hidden" name="originalrev" value="%URLPARAM{"originalrev"}%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="text" value="%HIDDENTEXT%"/> <input type="hidden" name="cmd" value="%CMD%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/changeform.pattern.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -38,7 +38,8 @@ %TEXT% %EDITACTION% <input type="hidden" name="topicparent" value="%URLPARAM{"topicparent"}%" /> +<input type="hidden" name="redirectto" value="%URLPARAM{"redirectto"}%" /> <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" /> <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" /> %TMPL:P{"topicaction"}% -</form></div><!-- /patternTopic-->%TMPL:END% \ No newline at end of file +</form></div><!-- /patternTopic-->%TMPL:END% Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/edit.pattern.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -118,6 +118,7 @@ %TMPL:DEF{"formend"}%<input type="hidden" name="originalrev" value="%ORIGINALREV%" /> <input type="hidden" name="skin" value="%URLPARAM{"skin"}%" /> <input type="hidden" name="cover" value="%URLPARAM{"cover"}%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> <input type="hidden" name="templatetopic" value="%TEMPLATETOPIC%" /> <input type="hidden" name="settingstopic" value="%SETTINGSTOPIC%" /> Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/editform.pattern.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/editform.pattern.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/editform.pattern.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -14,6 +14,7 @@ %TMPL:P{"pagetitle"}% <input type="hidden" id="topic" name="text" value="%TEXT%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="topicparent" value="%TOPICPARENT%" /> <input type="hidden" name="settingstopic" value="%SETTINGSTOPIC%" /> <input type="hidden" name="templatetopic" value="%TEMPLATETOPIC%" /> Modified: twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl =================================================================== --- twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl 2007-01-05 06:13:06 UTC (rev 12439) +++ twiki/branches/MAIN/twikiplugins/PatternSkin/templates/preview.pattern.tmpl 2007-01-05 08:47:16 UTC (rev 12440) @@ -71,6 +71,7 @@ %TMPL:DEF{"formend"}%%FORMFIELDS% <input type="hidden" name="originalrev" value="%URLPARAM{"originalrev"}%" /> +<input type="hidden" name="redirectto" value="%REDIRECTTO%" /> <input type="hidden" name="text" value="%HIDDENTEXT%" /> <input type="hidden" name="cmd" value="%CMD%" /> <input type="hidden" name="formtemplate" value="%FORMTEMPLATE%" /> @@ -92,4 +93,4 @@ %TMPL:P{"topicaction"}% %TMPL:P{"formend"}% %TMPL:P{"nojavascript_pagehelp"}% -%TMPL:END% \ No newline at end of file +%TMPL:END% |