Changeset 6247

Timestamp:

02/08/10 10:36:26 (2 years ago)

Author:

AndrewJones

Message:

Item8480: Fix for setting the parent

Location:

trunk/TopicCreatePlugin

Files:

• data/System/TopicCreatePlugin.txt (modified) (1 diff)
• lib/Foswiki/Plugins/TopicCreatePlugin.pm (modified) (1 diff)
• lib/Foswiki/Plugins/TopicCreatePlugin/Func.pm (modified) (2 diffs)
• test/unit/TopicCreatePlugin/TopicCreateTests.pm (modified) (3 diffs)

trunk/TopicCreatePlugin/data/System/TopicCreatePlugin.txt

@@ -68 +68 @@
 |  Plugin Version: | %$VERSION% |
 |  Change&nbsp;History: | <!-- versions below in reverse order -->&nbsp; |
+|  08 Feb 2010: | v1.3: Foswikitask:Item8480 - Fix for setting the parent; Fix for using Macros as the parent in =%<nop>TOPICCREATE%= -- Foswiki:Main.AndrewJones |
 |  28 Jan 2010: | v1.2: Foswikitask:Item8438 - =%<nop>TOPICCREATE%= now allows you to define a parent for the new topic -- Foswiki:Main.AndrewJones |
 |  29 Sep 2009: | v1.1: Foswikitask:Item4757 - Fixed warning when using =%<nop>TOPICATTACH%= -- Foswiki:Main.AndrewJones |

trunk/TopicCreatePlugin/lib/Foswiki/Plugins/TopicCreatePlugin.pm

@@ -26 +26 @@
 
 our $VERSION = '$Rev$';
-our $RELEASE = '1.2';
+our $RELEASE = '1.3';
 our $SHORTDESCRIPTION =
   'Automatically create a set of topics and attachments at topic save time';

trunk/TopicCreatePlugin/lib/Foswiki/Plugins/TopicCreatePlugin/Func.pm

@@ -78 +78 @@
     $topicName =
       Foswiki::Func::expandCommonVariables( $topicName, $theTopic, $theWeb );
+    $parent =
+      Foswiki::Func::expandCommonVariables( $parent, $theTopic, $theWeb );
     $template =
       Foswiki::Func::expandCommonVariables( $template, $theTopic, $theWeb );
@@ -109 +111 @@
 
     # Set topic parent
-    $meta->putKeyed( 'TOPICPARENT', { name => $parent } );
+    $meta->putAll( 'TOPICPARENT', { name => $parent } );
 
     # SMELL: replace with expandVariablesOnTopicCreation( $text );

trunk/TopicCreatePlugin/test/unit/TopicCreatePlugin/TopicCreateTests.pm

@@ -71 +71 @@
 }
 
-# test the use of %TOPICCREATE{ parent="WebHome" }%
+# test the use of %TOPICCREATE{ parent="FooBar" }%
 sub test_parent {
     my $this = shift;
@@ -81 +81 @@
 %META:TOPICPARENT{name="WebHome"}%
 
-%TOPICCREATE{template="$simpleTemplate" topic="$testTopic" parent="WebHome"}%
+%TOPICCREATE{template="$simpleTemplate" topic="$testTopic" parent="FooBar"}%
+
+HERE
+
+    Foswiki::Plugins::TopicCreatePlugin::beforeSaveHandler( $sampleText,
+        $this->{test_topic}, $this->{test_web} );
+
+    # child topic should now exist
+    $this->assert( Foswiki::Func::topicExists( $this->{test_web}, $testTopic ),
+        "$testTopic was not created" );
+
+    # parent of newly created topic should be WebHome
+    my ( $meta, undef ) =
+      Foswiki::Func::readTopic( $this->{test_web}, $testTopic );
+    $this->assert_equals( "FooBar", $meta->getParent(),
+        "Parent of new child topic is incorrect" );
+}
+
+# test the use of %TOPICCREATE{ parent="%HOMETOPIC%" }%
+sub test_parent_as_macro {
+    my $this = shift;
+
+    my $testTopic = "ParentTest2";
+
+    my $sampleText = <<"HERE";
+%META:TOPICINFO{author="guest" date="1053267450" format="1.0" version="1.35"}%
+%META:TOPICPARENT{name="WebHome"}%
+
+%TOPICCREATE{template="$simpleTemplate" topic="$testTopic" parent="%HOMETOPIC%"}%
 
 HERE
@@ -96 +124 @@
       Foswiki::Func::readTopic( $this->{test_web}, $testTopic );
     $this->assert_equals( "WebHome", $meta->getParent(),
-        "Parent of new child topic is incorrect" );
+"Parent of new child topic is incorrect. Should be the same as the current topic."
+    );
 }