summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2007-12-12 03:35:23 -0500
committerJoey Hess <joey@kitenet.net>2007-12-12 03:35:23 -0500
commit3922ba15ba04d5519e77eae3cdc760e5853687d4 (patch)
tree15b19134d34b7de7fdf93b0b1444f3f653706795
parent4745391360cf0843e376676479fee306d0a8312d (diff)
don't duplicate code from editpage, just pull the values it sets out of the
formbuilder object
-rw-r--r--IkiWiki/Plugin/edittemplate.pm25
1 files changed, 8 insertions, 17 deletions
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 6689b9a5c..aa72b0845 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -52,29 +52,20 @@ sub preprocess (@) { #{{{
sub formbuilder (@) { #{{{
my %params=@_;
my $form=$params{form};
-
- return if $form->title ne "editpage"
- || $form->field("do") ne "create";
-
+
+ return if $form->field("do") ne "create";
my $page=$form->field("page");
- my $from=$form->field("from");
# The tricky bit here is that $page is probably just the base
# page name, without any subdir, but the pagespec for a template
# probably does include the subdir (ie, "bugs/*"). We don't know
- # what subdir the user will pick to put the page in. So, generate
- # an ordered list and the first template to match will be used.
- #
- # This code corresponds to the code in editpage() that generates
- # the list of possible page names, unfortunatly, that code runs
- # later, so that list can't be simply reused.
+ # what subdir the user will pick to put the page in. So, try them
+ # all, starting with the one that was made default.
my @page_locs=$page;
- if (defined $from) {
- push @page_locs, "$from/$page";
- my $dir=$from.="/";
- while (length $dir) {
- $dir=~s![^/]+/+$!!;
- push @page_locs, $dir.$page;
+ foreach my $field ($form->field) {
+ if ($field eq 'page') {
+ @page_locs=$field->def_value;
+ push @page_locs, $field->options;
}
}