[Rt-commit] r3547 - in rtfm/branches/2.1-TESTING: . html/RTFM/Article lib/RT lib/RT/FM

[alexmv at bestpractical.com]

Author: alexmv
Date: Thu Jul 28 15:00:37 2005
New Revision: 3547

Modified:
   rtfm/branches/2.1-TESTING/   (props changed)
   rtfm/branches/2.1-TESTING/META.yml
   rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html
   rtfm/branches/2.1-TESTING/lib/RT/FM.pm
   rtfm/branches/2.1-TESTING/lib/RT/FM/ArticleCollection_Overlay.pm
   rtfm/branches/2.1-TESTING/releng.cnf
Log:
 r5452 at zoq-fot-pik:  chmrr | 2005-07-28 15:00:18 -0400
  * Make tests pass again -- make the join not wrong
  * Make it only have to select class when _nothing_ is specified
  * Bump version to 2.1.31


Modified: rtfm/branches/2.1-TESTING/META.yml
==============================================================================
--- rtfm/branches/2.1-TESTING/META.yml	(original)
+++ rtfm/branches/2.1-TESTING/META.yml	Thu Jul 28 15:00:37 2005
@@ -1,5 +1,5 @@
 name: RT-FM
-version: 2.1.30
+version: 2.1.31
 abstract: RT FM Extension
 license: GPL version 2
 distribution_type: module

Modified: rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html
==============================================================================
--- rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html	(original)
+++ rtfm/branches/2.1-TESTING/html/RTFM/Article/Search.html	Thu Jul 28 15:00:37 2005
@@ -18,7 +18,7 @@
 
 <& /RTFM/Article/Elements/Tabs, current_tab => "RTFM/Article/Search.html", Title => loc("Search for articles") &>
 
-% unless ($ARGS{'Class'} or $ARGS{'q'}) {
+% unless (%ARGS) {
 %   my $Classes=new RT::FM::ClassCollection($session{'CurrentUser'});
 %   $Classes->UnLimit;
 <table width="100%" border="0">

Modified: rtfm/branches/2.1-TESTING/lib/RT/FM.pm
==============================================================================
--- rtfm/branches/2.1-TESTING/lib/RT/FM.pm	(original)
+++ rtfm/branches/2.1-TESTING/lib/RT/FM.pm	Thu Jul 28 15:00:37 2005
@@ -22,7 +22,7 @@
 use RT::FM::System;
 
 
-our $VERSION = '2.1.30';
+our $VERSION = '2.1.31';
 
 # Create a system object for RTFM
 $RT::FM::System = RT::FM::System->new($RT::SystemUser);

Modified: rtfm/branches/2.1-TESTING/lib/RT/FM/ArticleCollection_Overlay.pm
==============================================================================
--- rtfm/branches/2.1-TESTING/lib/RT/FM/ArticleCollection_Overlay.pm	(original)
+++ rtfm/branches/2.1-TESTING/lib/RT/FM/ArticleCollection_Overlay.pm	Thu Jul 28 15:00:37 2005
@@ -229,7 +229,13 @@
         FIELD1 => 'id',
         TABLE2 => 'ObjectCustomFieldValues',
         FIELD2 => 'ObjectId',
-        EXPRESSION => 'main.id AND Disabled = 0'
+        EXPRESSION => 'main.id'
+    );
+
+    $self->Limit(
+        LEFTJOIN => $ObjectValuesAlias,
+        FIELD    => 'Disabled',
+        VALUE    => '='
     );
 
     if ( $args{'FIELD'} ) {

Modified: rtfm/branches/2.1-TESTING/releng.cnf
==============================================================================
--- rtfm/branches/2.1-TESTING/releng.cnf	(original)
+++ rtfm/branches/2.1-TESTING/releng.cnf	Thu Jul 28 15:00:37 2005
@@ -1,5 +1,5 @@
 PRODUCT			= RTFM
-TAG			= 2.1.30
+TAG			= 2.1.31
 CANONICAL_REPO		= svn+ssh://svn.bestpractical.com/svn/bps-public/rtfm/
 TAGS			= tags/
 TRUNK			= trunk/