[Rt-commit] r18798 - in rtfm/branches/2.3-EXPERIMENTAL: . html/Callbacks/RTFM/Elements/MessageBox

[alexmv at bestpractical.com]

Author: alexmv
Date: Sat Mar 14 00:37:46 2009
New Revision: 18798

Modified:
   rtfm/branches/2.3-EXPERIMENTAL/Changelog
   rtfm/branches/2.3-EXPERIMENTAL/README
   rtfm/branches/2.3-EXPERIMENTAL/html/Callbacks/RTFM/Elements/MessageBox/Default
   rtfm/branches/2.3-EXPERIMENTAL/t/04interface.t

Log:
Revert mistaken merge

Modified: rtfm/branches/2.3-EXPERIMENTAL/Changelog
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/Changelog	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/Changelog	Sat Mar 14 00:37:46 2009
@@ -1,11 +1,5 @@
 2.2.2
 
-NEW
-===
-
- * add new callback ParseContent in
-   html/RTFM/Article/Elements/Preformatted
-
 CLEANUPS
 ========
 

Modified: rtfm/branches/2.3-EXPERIMENTAL/README
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/README	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/README	Sat Mar 14 00:37:46 2009
@@ -89,7 +89,17 @@
 widget that lets you search for and include RTFM articles in your reply.
 (They're editable, of course).  
 
-* lib/RT/FM/Introduction.pod - quick overview
+You can also bind articles to topics. Topics are created by administrators
+on classes using the 'Topics' submenu of the RTFM class configuration.
+The configuration screen for the class has a tab for 'topics'. Typing the
+name (and optionally description) of the topic, and then clicking the button
+at the appropriate location. This should allow you to build a tree of topics.
+This tree of topics should show up when creating or modifying articles
+in the class. These can be arbitrarily nested categories.
+
+Articles topics can be set from the 'Modify' screen for the article --
+simply select as many topics as you desire from the list at the bottom
+of the screen.
 
 Of course, RTFM integrates with RT.  You can extract the body of a
 ticket into an article. Within RT, you should now see an "Extract to

Modified: rtfm/branches/2.3-EXPERIMENTAL/html/Callbacks/RTFM/Elements/MessageBox/Default
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/html/Callbacks/RTFM/Elements/MessageBox/Default	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/html/Callbacks/RTFM/Elements/MessageBox/Default	Sat Mar 14 00:37:46 2009
@@ -66,14 +66,13 @@
     next unless $article && $article->id;
 
     my $Ticket = $ARGS{Ticket};
-    if ( !($Ticket and $Ticket->id) and $ARGS{id} and $ARGS{id} ne 'new' ) {
+    if ( !$Ticket and $parent_args->{id} and $parent_args->{id} ne 'new' ) {
         $Ticket = RT::Ticket->new($session{'CurrentUser'});
-        $Ticket->Load($ARGS{id});
-        unless ($Ticket->id) {
-            $RT::Logger->error("Couldn't load ticket #". $ARGS{id});
+        $Ticket->Load($parent_args->{id});
+        unless ( $Ticket->id ) {
+            $RT::Logger->error("Couldn't load ticket ". $parent_args->{id} )
         }
     }
-    $Ticket = undef unless $Ticket->id;
 
 
     $m->comp('/RTFM/Article/Elements/Preformatted',

Modified: rtfm/branches/2.3-EXPERIMENTAL/t/04interface.t
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/t/04interface.t	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/t/04interface.t	Sat Mar 14 00:37:46 2009
@@ -6,6 +6,7 @@
 use Test::More tests => 39;
 BEGIN { require 't/utils.pl' }
 
+use lib "/opt/rt3/lib";
 BEGIN {
     use RT;
     RT::LoadConfig;
@@ -21,9 +22,11 @@
 use_ok 'RT::FM::Topic';
 use_ok 'RT::FM::Article';
 
+BEGIN {
 $RT::WebPort ||= '80';
 $RT::WebPath ||= ''; # Shut up a warning
-my $url = "http://localhost:".$RT::WebPort.$RT::WebPath."/";
+};
+use constant BaseURL => "http://localhost:".$RT::WebPort.$RT::WebPath."/";
 
 # Variables to test return values
 my ($ret, $msg);
@@ -153,6 +156,7 @@
 
 #### Right.  That's our data.  Now begin the real testing.
 
+my $url = BaseURL;
 my $m = Test::WWW::Mechanize->new;
 isa_ok($m, 'Test::WWW::Mechanize');
 ok(1, "Connecting to ".$url);