inline: Force an absolute page location when the inline postform is used.

There seems no need to allow selecting a location when creating a page this
way; the user should always want it to appear in the inline whose form they
submitted.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e8e71e552848ccc422af5c3b0a0685c075ad9483..7c5da7343907d9d0f41ed65e2573942e3b6cbb9b 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -128,7 +128,7 @@ sub sessioncgi ($$) {
                        $add=1 unless length $add;
                        $add++;
                }
                        $add=1 unless length $add;
                        $add++;
                }

-               $q->param('page', $page.$add);
+               $q->param('page', "/$from/$page$add");

                # now go create the page
                $q->param('do', 'create');
                # make sure the editpage plugin is loaded
                # now go create the page
                $q->param('do', 'create');
                # make sure the editpage plugin is loaded

diff --git a/debian/changelog b/debian/changelog
index 4e9a92eabd02ea924bf6b1fa08a9a3f45910f001..630a4498a18b79a435ae17717d9e56b4c73bb2c9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low
   * Set HTML::Template's parent_global_vars option to allow using parameters
     like title_overridden that do not appear on the template. (intrigeri)
     (See https://rt.cpan.org/Public/Bug/Display.html?id=64158)
   * Set HTML::Template's parent_global_vars option to allow using parameters
     like title_overridden that do not appear on the template. (intrigeri)
     (See https://rt.cpan.org/Public/Bug/Display.html?id=64158)

+  * inline: Force an absolute page location when the inline postform is used.

 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 29 Nov 2010 14:44:13 -0400
 

diff --git a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
index 45481bf21b60d52b3dcf82ffde4172231109cc00..2e2d3538162a36a0a3d435a1dd507afac80d9f01 100644 (file)
--- a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
+++ b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn
@@ -11,3 +11,5 @@ However, if I use an inline directive like the following
     !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes
 
 every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. 
     !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes
 
 every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. 

+
+> [[fixed|done]] --[[Joey]]