form tweaks; use title
parent
b286ce04cb
commit
a204f86786
|
@ -44,8 +44,11 @@ sub confirmation_form ($$) { #{{{
|
||||||
);
|
);
|
||||||
|
|
||||||
$f->field(name => "do", type => "hidden", value => "remove", force => 1);
|
$f->field(name => "do", type => "hidden", value => "remove", force => 1);
|
||||||
$f->field(name => "page", label => "Will remove:", validate => sub {
|
$f->field(name => "page", label => "Will remove:", size => 60,
|
||||||
my $page=shift;
|
validate => sub {
|
||||||
|
# Validate page by checking that the page exists, and that
|
||||||
|
# the user is allowed to edit(/delete) it.
|
||||||
|
my $page=IkiWiki::titlepage(shift);
|
||||||
if (! exists $pagesources{$page}) {
|
if (! exists $pagesources{$page}) {
|
||||||
$f->field(name => "page", message => gettext("page does not exist"));
|
$f->field(name => "page", message => gettext("page does not exist"));
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -67,16 +70,20 @@ sub formbuilder (@) { #{{{
|
||||||
$form->submitted eq "Remove") {
|
$form->submitted eq "Remove") {
|
||||||
my $q=$params{cgi};
|
my $q=$params{cgi};
|
||||||
my $session=$params{session};
|
my $session=$params{session};
|
||||||
|
|
||||||
# Save current form state to allow returning to it later
|
# Save current form state to allow returning to it later
|
||||||
# without losing any edits.
|
# without losing any edits.
|
||||||
# (But don't save what button was submitted.)
|
# (But don't save what button was submitted, to avoid
|
||||||
|
# looping back to here.)
|
||||||
|
# Note: "_submit" is CGI::FormBuilder internals.
|
||||||
$q->param(-name => "_submit", -value => "");
|
$q->param(-name => "_submit", -value => "");
|
||||||
$session->param(postremove => scalar $q->Vars);
|
$session->param(postremove => scalar $q->Vars);
|
||||||
IkiWiki::cgi_savesession($session);
|
IkiWiki::cgi_savesession($session);
|
||||||
|
|
||||||
# Display a small confirmation form.
|
# Display a small confirmation form.
|
||||||
my ($f, $buttons)=confirmation_form($q, $session);
|
my ($f, $buttons)=confirmation_form($q, $session);
|
||||||
$f->field(name => "page", value => $form->field("page"),
|
$f->field(name => "page",
|
||||||
|
value => IkiWiki::pagetitle($form->field("page")),
|
||||||
force => 1);
|
force => 1);
|
||||||
IkiWiki::showform($f, $buttons, $session, $q);
|
IkiWiki::showform($f, $buttons, $session, $q);
|
||||||
exit 0;
|
exit 0;
|
||||||
|
|
Loading…
Reference in New Issue