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

remove, rename: Allow acting on attachments as a page is being created.

master
Joey Hess 2008-10-02 12:53:53 -04:00
parent c945952381
commit 3b47dae9ca
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Plugin/remove.pm
View File

@ -61,9 +61,10 @@ sub formbuilder_setup (@) { #{{{
my $form=$params{form};
my $q=$params{cgi};
if (defined $form->field("do") && $form->field("do") eq "edit") {
if (defined $form->field("do") && ($form->field("do") eq "edit" ||
$form->field("do") eq "create")) {
# Removal button for the page, and also for attachments.
push @{$params{buttons}}, "Remove";
push @{$params{buttons}}, "Remove" if $form->field("do") eq "edit";
$form->tmpl_param("field-remove" => '<input name="_submit" type="submit" value="Remove Attachments" />');
}
} #}}}
@ -135,11 +136,12 @@ sub formbuilder (@) { #{{{
my %params=@_;
my $form=$params{form};
if (defined $form->field("do") && $form->field("do") eq "edit") {
if (defined $form->field("do") && ($form->field("do") eq "edit" ||
$form->field("do") eq "create")) {
my $q=$params{cgi};
my $session=$params{session};
if ($form->submitted eq "Remove") {
if ($form->submitted eq "Remove" && $form->field("do") eq "edit") {
removal_confirm($q, $session, 0, $form->field("page"));
}
elsif ($form->submitted eq "Remove Attachments") {

10
IkiWiki/Plugin/rename.pm
View File

@ -210,11 +210,12 @@ sub formbuilder (@) { #{{{
my %params=@_;
my $form=$params{form};
if (defined $form->field("do") && $form->field("do") eq "edit") {
if (defined $form->field("do") && ($form->field("do") eq "edit" ||
$form->field("do") eq "create")) {
my $q=$params{cgi};
my $session=$params{session};
if ($form->submitted eq "Rename") {
if ($form->submitted eq "Rename" && $form->field("do") eq "edit") {
rename_start($q, $session, 0, $form->field("page"));
}
elsif ($form->submitted eq "Rename Attachment") {
@ -237,9 +238,10 @@ sub formbuilder_setup (@) { #{{{
my $form=$params{form};
my $q=$params{cgi};
if (defined $form->field("do") && $form->field("do") eq "edit") {
if (defined $form->field("do") && ($form->field("do") eq "edit" ||
$form->field("do") eq "create")) {
# Rename button for the page, and also for attachments.
push @{$params{buttons}}, "Rename";
push @{$params{buttons}}, "Rename" if $form->field("do") eq "edit";
$form->tmpl_param("field-rename" => '<input name="_submit" type="submit" value="Rename Attachment" />');
if (defined $renamesummary) {

1
debian/changelog vendored
View File

@ -35,6 +35,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low
* inline: Fix handling of rootpage that doesn't exist.
* attachment: Support adding attachments to pages even as they are being
created.
* remove, rename: Allow acting on attachments as a page is being created.
-- Joey Hess <joeyh@debian.org> Thu, 25 Sep 2008 13:45:55 -0400