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

[alexmv at bestpractical.com]

Author: alexmv
Date: Fri Mar 13 17:28:11 2009
New Revision: 18794

Modified:
   rtfm/branches/2.3-EXPERIMENTAL/   (props changed)
   rtfm/branches/2.3-EXPERIMENTAL/Changelog
   rtfm/branches/2.3-EXPERIMENTAL/MANIFEST
   rtfm/branches/2.3-EXPERIMENTAL/README
   rtfm/branches/2.3-EXPERIMENTAL/html/Callbacks/RTFM/Elements/MessageBox/Default
   rtfm/branches/2.3-EXPERIMENTAL/html/RTFM/Article/Elements/Preformatted
   rtfm/branches/2.3-EXPERIMENTAL/t/04interface.t

Log:
 r31628 at kohr-ah (orig r12275):  ruz | 2008-05-12 17:45:00 -0400
 * backport changes from 2.3 branch that should be here
 r31629 at kohr-ah (orig r12276):  ruz | 2008-05-12 17:50:12 -0400
 * update changelog
 r31630 at kohr-ah (orig r12277):  ruz | 2008-05-12 17:51:05 -0400
 * no more Config.pod
 r31635 at kohr-ah (orig r12282):  ruz | 2008-05-12 18:48:15 -0400
 * get rid of constant as we have no config at that point
 r31636 at kohr-ah (orig r12283):  ruz | 2008-05-12 18:53:37 -0400
 * update manifest


Modified: rtfm/branches/2.3-EXPERIMENTAL/Changelog
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/Changelog	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/Changelog	Fri Mar 13 17:28:11 2009
@@ -1,5 +1,11 @@
 2.2.2
 
+NEW
+===
+
+ * add new callback ParseContent in
+   html/RTFM/Article/Elements/Preformatted
+
 CLEANUPS
 ========
 

Modified: rtfm/branches/2.3-EXPERIMENTAL/MANIFEST
==============================================================================

Modified: rtfm/branches/2.3-EXPERIMENTAL/README
==============================================================================
--- rtfm/branches/2.3-EXPERIMENTAL/README	(original)
+++ rtfm/branches/2.3-EXPERIMENTAL/README	Fri Mar 13 17:28:11 2009
@@ -89,17 +89,7 @@
 widget that lets you search for and include RTFM articles in your reply.
 (They're editable, of course).  
 
-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.
+* lib/RT/FM/Introduction.pod - quick overview
 
 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	Fri Mar 13 17:28:11 2009
@@ -66,13 +66,14 @@
     next unless $article && $article->id;
 
     my $Ticket = $ARGS{Ticket};
-    if ( !$Ticket and $parent_args->{id} and $parent_args->{id} ne 'new' ) {
+    if ( !($Ticket and $Ticket->id) and $ARGS{id} and $ARGS{id} ne 'new' ) {
         $Ticket = RT::Ticket->new($session{'CurrentUser'});
-        $Ticket->Load($parent_args->{id});
-        unless ( $Ticket->id ) {
-            $RT::Logger->error("Couldn't load ticket ". $parent_args->{id} )
+        $Ticket->Load($ARGS{id});
+        unless ($Ticket->id) {
+            $RT::Logger->error("Couldn't load ticket #". $ARGS{id});
         }
     }
+    $Ticket = undef unless $Ticket->id;
 
 
     $m->comp('/RTFM/Article/Elements/Preformatted',

Modified: rtfm/branches/2.3-EXPERIMENTAL/html/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	Fri Mar 13 17:28:11 2009
@@ -6,7 +6,6 @@
 use Test::More tests => 39;
 BEGIN { require 't/utils.pl' }
 
-use lib "/opt/rt3/lib";
 BEGIN {
     use RT;
     RT::LoadConfig;
@@ -22,11 +21,9 @@
 use_ok 'RT::FM::Topic';
 use_ok 'RT::FM::Article';
 
-BEGIN {
 $RT::WebPort ||= '80';
 $RT::WebPath ||= ''; # Shut up a warning
-};
-use constant BaseURL => "http://localhost:".$RT::WebPort.$RT::WebPath."/";
+my $url = "http://localhost:".$RT::WebPort.$RT::WebPath."/";
 
 # Variables to test return values
 my ($ret, $msg);
@@ -156,7 +153,6 @@
 
 #### 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);