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

add message field to revert form

master
Joey Hess 2010-10-08 19:19:43 -04:00
parent 108d2ac9ae
commit 7e9ca590c7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IkiWiki/Plugin/recentchanges.pm
View File

@ -87,9 +87,11 @@ sub sessioncgi ($$) {
action => $config{cgiurl},
stylesheet => 1,
template => { template('revert.tmpl') },
fields => [qw{revertmessage do sid rev}],
);
my $buttons=["Revert", "Cancel"];
$form->field(name => "revertmessage", type => "text", size => 80);
$form->field(name => "sid", type => "hidden", value => $session->id,
force => 1);
$form->field(name => "do", type => "hidden", value => "revert",
@ -99,11 +101,16 @@ sub sessioncgi ($$) {
if ($form->submitted eq 'Revert' && $form->validate) {
IkiWiki::checksessionexpiry($q, $session, $q->param('sid'));
my $message=sprintf(gettext("This reverts commit %s"), $rev);
if (defined $form->field('revertmessage') &&
length $form->field('revertmessage')) {
$message=$form->field('revertmessage')."\n".$message;
}
my $r = $IkiWiki::hooks{rcs}{rcs_revert}{call}->($rev);
error $r if defined $r;
IkiWiki::disable_commit_hook();
rcs_commit_staged(
message => sprintf(gettext("This reverts commit %s"), $rev),
message => $message,
session => $session,
);
IkiWiki::enable_commit_hook();

2
templates/revert.tmpl
View File

@ -3,6 +3,8 @@
<TMPL_VAR FIELD-DO>
<TMPL_VAR FIELD-SID>
<TMPL_VAR FIELD-REV>
<label for="revertmessage" class="block">Optional comment about this change:</label>
<TMPL_VAR FIELD-REVERTMESSAGE>
</div>
<div class="revert buttons">
<TMPL_VAR form-submit>