include temp file for attachment change too

[git.ikiwiki.info.git] / IkiWiki / Plugin / edittemplate.pm

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index b7651ce02b3c71ac96b4a561f3ef5e22738a6a5b..846b4e7c832c499a0755860b2c277b282a2b2f1d 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -8,6 +8,8 @@ use HTML::Template;
 use Encode;
 
 sub import { #{{{
 use Encode;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "edittemplate",
+               call => \&getsetup);

        hook(type => "needsbuild", id => "edittemplate",
                call => \&needsbuild);
        hook(type => "preprocess", id => "edittemplate",
        hook(type => "needsbuild", id => "edittemplate",
                call => \&needsbuild);
        hook(type => "preprocess", id => "edittemplate",


@@ -16,6 +18,14 @@ sub import { #{{{
                call => \&formbuilder);
 } #}}}
 
                call => \&formbuilder);
 } #}}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 
 sub needsbuild (@) { #{{{
        my $needsbuild=shift;
 


@@ -38,23 +48,29 @@ sub preprocess (@) { #{{{
        return "" if $params{page} ne $params{destpage};
 
        if (! exists $params{template} || ! length($params{template})) {
        return "" if $params{page} ne $params{destpage};
 
        if (! exists $params{template} || ! length($params{template})) {

-               return return "[[meta ".gettext("template not specified")."]]";
+               error gettext("template not specified")

        }
        if (! exists $params{match} || ! length($params{match})) {
        }
        if (! exists $params{match} || ! length($params{match})) {

-               return return "[[meta ".gettext("match not specified")."]]";
+               error gettext("match not specified")

        }
 
        }
 

-       $pagestate{$params{page}}{edittemplate}{$params{match}}=$params{template};
+       my $link=linkpage($params{template});
+       $pagestate{$params{page}}{edittemplate}{$params{match}}=$link;

 
 

+       return "" if ($params{silent} && IkiWiki::yesno($params{silent}));
+       add_depends($params{page}, $link);

        return sprintf(gettext("edittemplate %s registered for %s"),
        return sprintf(gettext("edittemplate %s registered for %s"),

-               $params{template}, $params{match});
+               htmllink($params{page}, $params{destpage}, $link),
+               $params{match});

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

-       return if $form->field("do") ne "create";
+       return if $form->field("do") ne "create" ||
+               (defined $form->field("editcontent") && length $form->field("editcontent"));
+       

        my $page=$form->field("page");
        
        # The tricky bit here is that $page is probably just the base
        my $page=$form->field("page");
        
        # The tricky bit here is that $page is probably just the base


@@ -75,8 +91,12 @@ sub formbuilder (@) { #{{{
                        if (exists $pagestate{$registering_page}{edittemplate}) {
                                foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
                                        if (pagespec_match($p, $pagespec, location => $registering_page)) {
                        if (exists $pagestate{$registering_page}{edittemplate}) {
                                foreach my $pagespec (sort keys %{$pagestate{$registering_page}{edittemplate}}) {
                                        if (pagespec_match($p, $pagespec, location => $registering_page)) {

+                                               my $template=$pagestate{$registering_page}{edittemplate}{$pagespec};

                                                $form->field(name => "editcontent",
                                                $form->field(name => "editcontent",

-                                                        value => filltemplate($pagestate{$registering_page}{edittemplate}{$pagespec}, $page));
+                                                        value =>  filltemplate($template, $page));
+                                               $form->field(name => "type",
+                                                        value => pagetype($pagesources{$template}))
+                                                               if $pagesources{$template};

                                                return;
                                        }
                                }
                                                return;
                                        }
                                }


@@ -108,7 +128,9 @@ sub filltemplate ($$) { #{{{
                );
        };
        if ($@) {
                );
        };
        if ($@) {

-               return "[[pagetemplate ".gettext("failed to process")." $@]]";
+               # Indicate that the earlier preprocessor directive set 
+               # up a template that doesn't work.
+               return "[[!pagetemplate ".gettext("failed to process")." $@]]";

        }
 
        $template->param(name => $page);
        }
 
        $template->param(name => $page);