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

don't duplicate code from editpage, just pull the values it sets out of the 

formbuilder object
master
Joey Hess 2007-12-12 03:35:23 -05:00
parent 4745391360
commit 3922ba15ba
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
IkiWiki/Plugin/edittemplate.pm
View File

@ -52,29 +52,20 @@ sub preprocess (@) { #{{{
sub formbuilder (@) { #{{{ sub formbuilder (@) { #{{{
my %params=@_; my %params=@_;
my $form=$params{form}; my $form=$params{form};
return if $form->title ne "editpage" return if $form->field("do") ne "create";
|| $form->field("do") ne "create";
my $page=$form->field("page"); my $page=$form->field("page");
my $from=$form->field("from");
# The tricky bit here is that $page is probably just the base # The tricky bit here is that $page is probably just the base
# page name, without any subdir, but the pagespec for a template # page name, without any subdir, but the pagespec for a template
# probably does include the subdir (ie, "bugs/*"). We don't know # probably does include the subdir (ie, "bugs/*"). We don't know
# what subdir the user will pick to put the page in. So, generate # what subdir the user will pick to put the page in. So, try them
# an ordered list and the first template to match will be used. # all, starting with the one that was made default.
#
# 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.
my @page_locs=$page; my @page_locs=$page;
if (defined $from) { foreach my $field ($form->field) {
push @page_locs, "$from/$page"; if ($field eq 'page') {
my $dir=$from.="/"; @page_locs=$field->def_value;
while (length $dir) { push @page_locs, $field->options;
$dir=~s![^/]+/+$!!;
push @page_locs, $dir.$page;
} }
} }