touchups
parent
8cab4366d1
commit
b1b5860b29
|
@ -47,7 +47,7 @@ sub confirmation_form ($$) { #{{{
|
|||
$f->field(name => "page", label => "Will remove:", size => 60,
|
||||
validate => sub {
|
||||
# Validate page by checking that the page exists, and that
|
||||
# the user is allowed to edit(/delete) it.
|
||||
# the user is allowed to edit(/remove) it.
|
||||
my $page=IkiWiki::titlepage(shift);
|
||||
if (! exists $pagesources{$page}) {
|
||||
$f->field(name => "page", message => gettext("page does not exist"));
|
||||
|
@ -97,13 +97,13 @@ sub sessioncgi ($$) { #{{{
|
|||
my $session=shift;
|
||||
my ($form, $buttons)=confirmation_form($q, $session);
|
||||
IkiWiki::decode_form_utf8($form);
|
||||
|
||||
if ($form->submitted eq 'Cancel') {
|
||||
# Load saved form state and return to edit form.
|
||||
my $postremove=CGI->new($session->param("postremove"));
|
||||
$session->clear("postremove");
|
||||
IkiWiki::cgi_savesession($session);
|
||||
IkiWiki::cgi($postremove, $session);
|
||||
exit 0;
|
||||
}
|
||||
elsif ($form->submitted eq 'Remove' && $form->validate) {
|
||||
my $page=IkiWiki::titlepage($form->field("page"));
|
||||
|
@ -130,12 +130,12 @@ sub sessioncgi ($$) { #{{{
|
|||
$parent="index";
|
||||
}
|
||||
IkiWiki::redirect($q, $config{url}."/".htmlpage($parent));
|
||||
exit 0;
|
||||
}
|
||||
else {
|
||||
IkiWiki::showform($form, $buttons, $session, $q);
|
||||
exit 0;
|
||||
}
|
||||
|
||||
exit 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,6 +4,8 @@ ikiwiki (2.55) UNRELEASED; urgency=low
|
|||
converted. (Simon McVittie)
|
||||
* editpage: Don't show attachments link when attachments are disabled.
|
||||
* All rcs backends need to implement rcs_remove. (Done for svn, git).
|
||||
* remove: New plugin that adds the ability to remove pages via the web.
|
||||
(Sponsored by The TOVA Company.)
|
||||
|
||||
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
|
||||
|
||||
|
|
Loading…
Reference in New Issue