urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get things right after moving to a branch.

master
Peter Gammie 2010-09-29 15:43:44 +10:00
parent acecbad0ff
commit 941755e466
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IkiWiki/Plugin/recentchanges.pm
View File

@ -13,6 +13,7 @@ sub import {
hook(type => "refresh", id => "recentchanges", call => \&refresh); hook(type => "refresh", id => "recentchanges", call => \&refresh);
hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate); hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
hook(type => "htmlize", id => "_change", call => \&htmlize); hook(type => "htmlize", id => "_change", call => \&htmlize);
hook(type => "sessioncgi", id => "recentchanges", call => \&sessioncgi);
# Load goto to fix up links from recentchanges # Load goto to fix up links from recentchanges
IkiWiki::loadplugin("goto"); IkiWiki::loadplugin("goto");
} }
@ -80,7 +81,6 @@ sub confirmation_form {
$f->field(name => "sid", type => "hidden", value => $session->id, $f->field(name => "sid", type => "hidden", value => $session->id,
force => 1); force => 1);
$f->field(name => "do", type => "hidden", value => "revert", force => 1); $f->field(name => "do", type => "hidden", value => "revert", force => 1);
$f->field(name => "rev", type => "hidden", value => $rev, force => 1);
return $f, ["Revert", "Cancel"]; return $f, ["Revert", "Cancel"];
} }
@ -110,6 +110,7 @@ sub sessioncgi ($$) {
if($r) { if($r) {
die "FIXME revert '$rev' failed."; die "FIXME revert '$rev' failed.";
} else { } else {
require IkiWiki::Render;
IkiWiki::refresh(); IkiWiki::refresh();
IkiWiki::saveindex(); IkiWiki::saveindex();
# FIXME indicate success. # FIXME indicate success.
@ -118,6 +119,7 @@ sub sessioncgi ($$) {
$form->title(sprintf(gettext("confirm reversion of %s"), $rev)); $form->title(sprintf(gettext("confirm reversion of %s"), $rev));
my $patch_contents = IkiWiki::rcs_showpatch($rev); my $patch_contents = IkiWiki::rcs_showpatch($rev);
$form->tmpl_param(patch_contents => encode_entities($patch_contents)); $form->tmpl_param(patch_contents => encode_entities($patch_contents));
$form->field(name => "rev", type => "hidden", value => $rev, force => 1);
IkiWiki::showform($form, $buttons, $session, $q); IkiWiki::showform($form, $buttons, $session, $q);
exit 0; exit 0;
} }
@ -180,6 +182,13 @@ sub store ($$$) {
]; ];
push @{$change->{pages}}, { link => '...' } if $is_excess; push @{$change->{pages}}, { link => '...' } if $is_excess;
if (length $config{cgiurl}) {
$change->{reverturl} = IkiWiki::cgiurl(
do => "revert",
rev => $change->{rev}
);
}
$change->{author}=$change->{user}; $change->{author}=$change->{user};
my $oiduser=eval { IkiWiki::openiduser($change->{user}) }; my $oiduser=eval { IkiWiki::openiduser($change->{user}) };
if (defined $oiduser) { if (defined $oiduser) {

2
templates/change.tmpl
View File

@ -28,6 +28,8 @@
<span class="committype"><TMPL_VAR COMMITTYPE></span> <span class="committype"><TMPL_VAR COMMITTYPE></span>
<span class="desc"><br />Date:</span> <span class="desc"><br />Date:</span>
<span class="changedate"><TMPL_VAR COMMITDATE></span> <span class="changedate"><TMPL_VAR COMMITDATE></span>
<span class="desc"><br /></span>
<span class="revert"><a href="<TMPL_VAR REVERTURL>" rel="nofollow">[[diff|wikiicons/revert.png]]</a></span>
</div> </div>
<div class="changelog"> <div class="changelog">
<TMPL_LOOP MESSAGE> <TMPL_LOOP MESSAGE>

1
templates/revert.tmpl
View File

@ -5,6 +5,7 @@
<div> <div>
<TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-DO>
<TMPL_VAR FIELD-SID> <TMPL_VAR FIELD-SID>
<TMPL_VAR FIELD-REV>
</div> </div>
<div class="revert buttons"> <div class="revert buttons">
<TMPL_VAR form-submit> <TMPL_VAR form-submit>