add a rename summary

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 287b1f5aa65a573990fc910ee22a4d9dc6106982..4cb45895b964c8872be96104f88ceda78e5efb85 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -365,7 +365,6 @@ sub cgi_editpage ($$) { #{{{
                htmllink($page, $page, "ikiwiki/formatting",
                        noimageinline => 1,
                        linktext => "FormattingHelp"));
                htmllink($page, $page, "ikiwiki/formatting",
                        noimageinline => 1,
                        linktext => "FormattingHelp"));

-       $form->tmpl_param("message", "");

        
        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {
        
        if ($form->submitted eq "Cancel") {
                if ($form->field("do") eq "create" && defined $from) {

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 9fa3f6a8532341f4555484805f94bfe73f8dbd6b..fdd9dc71c83dba820e4f5249918f3391f189ddd7 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -74,18 +74,6 @@ sub check_canrename ($$$$$$$) { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

-sub formbuilder_setup (@) { #{{{
-       my %params=@_;
-       my $form=$params{form};
-       my $q=$params{cgi};
-
-       if (defined $form->field("do") && $form->field("do") eq "edit") {
-               # Rename button for the page, and also for attachments.
-               push @{$params{buttons}}, "Rename";
-               $form->tmpl_param("field-rename" => '<input name="_submit" type="submit" value="Rename Attachment" />');
-       }
-} #}}}
-

 sub rename_form ($$$) { #{{{ 
        my $q=shift;
        my $session=shift;
 sub rename_form ($$$) { #{{{ 
        my $q=shift;
        my $session=shift;


@@ -141,8 +129,10 @@ sub rename_start ($$$$) {
        exit 0;
 }
 
        exit 0;
 }
 

-sub postrename ($;$$) {
+my $renamesummary;
+sub postrename ($;$$$) {

        my $session=shift;
        my $session=shift;

+       my $src=shift;

        my $dest=shift;
        my $attachment=shift;
 
        my $dest=shift;
        my $attachment=shift;
 


@@ -151,6 +141,15 @@ sub postrename ($;$$) {
        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
 
        $session->clear("postrename");
        IkiWiki::cgi_savesession($session);
 

+       if (defined $src) {
+               # Generate a rename summary, that will be shown at the top
+               # of the edit template.
+               my $template=template("renamesummary.tmpl");
+               $template->param(src => $src);
+               $template->param(dest => $dest);
+               $renamesummary=$template->output;
+       }
+

        if (defined $dest && ! $attachment) {
                # They renamed the page they were editing. This requires
                # fixups to the edit form state.
        if (defined $dest && ! $attachment) {
                # They renamed the page they were editing. This requires
                # fixups to the edit form state.


@@ -164,6 +163,22 @@ sub postrename ($;$$) {
        IkiWiki::cgi_editpage($postrename, $session);
 }
 
        IkiWiki::cgi_editpage($postrename, $session);
 }
 

+sub formbuilder_setup (@) { #{{{
+       my %params=@_;
+       my $form=$params{form};
+       my $q=$params{cgi};
+
+       if (defined $form->field("do") && $form->field("do") eq "edit") {
+               # Rename button for the page, and also for attachments.
+               push @{$params{buttons}}, "Rename";
+               $form->tmpl_param("field-rename" => '<input name="_submit" type="submit" value="Rename Attachment" />');
+
+               if (defined $renamesummary) {
+                       $form->tmpl_param(message => $renamesummary);
+               }
+       }
+} #}}}
+

 sub formbuilder (@) { #{{{
        my %params=@_;
        my $form=$params{form};
 sub formbuilder (@) { #{{{
        my %params=@_;
        my $form=$params{form};


@@ -226,7 +241,8 @@ sub sessioncgi ($$) { #{{{
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_rename($srcfile, $destfile);
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_rename($srcfile, $destfile);

-                               IkiWiki::rcs_commit_staged(sprintf(gettext("rename %s to %s", $src, $dest)),
+                               IkiWiki::rcs_commit_staged(
+                                       sprintf(gettext("rename %s to %s"), $src, $dest),

                                        $session->param("name"), $ENV{REMOTE_ADDR});
                                IkiWiki::enable_commit_hook();
                                IkiWiki::rcs_update();
                                        $session->param("name"), $ENV{REMOTE_ADDR});
                                IkiWiki::enable_commit_hook();
                                IkiWiki::rcs_update();


@@ -239,7 +255,7 @@ sub sessioncgi ($$) { #{{{
                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 
                        IkiWiki::refresh();
                        IkiWiki::saveindex();
 

-                       postrename($session, $dest, $q->param("attachment"));
+                       postrename($session, $src, $dest, $q->param("attachment"));

                }
                else {
                        IkiWiki::showform($form, $buttons, $session, $q);
                }
                else {
                        IkiWiki::showform($form, $buttons, $session, $q);

diff --git a/templates/renamesummary.tmpl b/templates/renamesummary.tmpl
new file mode 100644 (file)
index 0000000..1d5e159
--- /dev/null
+++ b/templates/renamesummary.tmpl
@@ -0,0 +1,6 @@
+<p>
+<b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b>
+</p>
+<p>
+Summary of links: TODO
+</p>