[Rt-commit] r19381 - in rtfm/trunk: html/RTFM/Article

[falcone at bestpractical.com]

Author: falcone
Date: Thu Apr 30 17:09:56 2009
New Revision: 19381

Added:
   rtfm/trunk/t/06search_interface.t
Modified:
   rtfm/trunk/html/RTFM/Article/Search.html

Log:
Don't look at non-RTFM Custom Fields during search

If you had a Ticket CF Named 'Class' (or Topic, or any other RTFM Field)
RTFM would search for a CF named Class with an id of 1 instead of
looking for articles belonging to Class 1

Modified: rtfm/trunk/html/RTFM/Article/Search.html
==============================================================================
--- rtfm/trunk/html/RTFM/Article/Search.html	(original)
+++ rtfm/trunk/html/RTFM/Article/Search.html	Thu Apr 30 17:09:56 2009
@@ -307,11 +307,11 @@
 }
 
 my %cfs;
-my $all_cfs = RT::CustomFields->new($session{'CurrentUser'});
-$all_cfs->UnLimit();
-while ( my $cf = $all_cfs->Next ) {
+while ( my $cf = $customfields->Next ) {
     $cfs{ $cf->Name } = $cf->Id;
 }
+# reset the iterator because we use this to build the UI
+$customfields->GotoFirstItem;
 
 foreach my $field ( keys %cfs ) {
    

Added: rtfm/trunk/t/06search_interface.t
==============================================================================
--- (empty file)
+++ rtfm/trunk/t/06search_interface.t	Thu Apr 30 17:09:56 2009
@@ -0,0 +1,115 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use lib 't/lib';
+use RT::FM::Test tests => 24;
+
+use RT::CustomField;
+use RT::Queue;
+use RT::Ticket;
+use_ok 'RT::FM::Class';
+use_ok 'RT::FM::Topic';
+use_ok 'RT::FM::Article';
+
+my ($url, $m) = RT::Test->started_ok;
+
+# Variables to test return values
+my ($ret, $msg);
+
+# Create a test class
+my $class = RT::FM::Class->new($RT::SystemUser);
+($ret, $msg) = $class->Create('Name' => 'tlaTestClass-'.$$,
+			      'Description' => 'A general-purpose test class');
+ok($ret, "Test class created");
+
+
+my $questionCF = RT::CustomField->new($RT::SystemUser);
+my $answerCF = RT::CustomField->new($RT::SystemUser);
+my $ticketCF = RT::CustomField->new($RT::SystemUser);
+($ret, $msg) = $questionCF->Create('Name' => 'Question-'.$$,
+			   'Type' => 'Text',
+			   'MaxValues' => 1,
+			   'LookupType' => 'RT::FM::Class-RT::FM::Article',
+			   'Description' => 'The question to be answered',
+			   'Disabled' => 0);
+ok($ret, "Question CF created: $msg");
+($ret, $msg) = $answerCF->Create('Name' => 'Answer-'.$$,
+			 'Type' => 'Text',
+			 'MaxValues' => 1,
+			 'LookupType' => 'RT::FM::Class-RT::FM::Article',
+			 'Description' => 'The answer to the question',
+			 'Disabled' => 0);
+ok($ret, "Answer CF created: $msg");
+
+($ret, $msg) = $ticketCF->Create('Name' => 'Class',
+			 'Type' => 'Text',
+			 'MaxValues' => 1,
+			 'LookupType' => 'RT::Queue-RT::Ticket',
+			 'Disabled' => 0);
+ok($ret, "Ticket CF 'Class' created: $msg");
+
+# Attach the custom fields to our class
+($ret, $msg) = $questionCF->AddToObject($class);
+ok($ret, "Question CF added to class: $msg");
+($ret, $msg) = $answerCF->AddToObject($class);
+ok($ret, "Answer CF added to class: $msg");
+my ($qid, $aid) = ($questionCF->Id, $answerCF->Id);
+
+my $global_queue = RT::Queue->new($RT::SystemUser);
+($ret, $msg) = $ticketCF->AddToObject($global_queue);
+ok($ret, "Ticket CF added globally: $msg");
+
+my %cvals = ('article1q' => 'Some question about swallows',
+		'article1a' => 'Some answer about Europe and Africa',
+		'article2q' => 'Another question about Monty Python',
+		'article2a' => 'Romani ite domum',
+		'article3q' => 'Why should I eat my supper?',
+		'article3a' => 'There are starving children in Africa',
+		'article4q' => 'What did Brian originally write?',
+		'article4a' => 'Romanes eunt domus');
+
+# Create an article or two with our custom field values.
+
+my $article1 = RT::FM::Article->new($RT::SystemUser);
+my $article2 = RT::FM::Article->new($RT::SystemUser);
+my $article3 = RT::FM::Article->new($RT::SystemUser);
+my $article4 = RT::FM::Article->new($RT::SystemUser);
+($ret, $msg) = $article1->Create(Name => 'First article '.$$,
+				 Summary => 'blah blah 1',
+				 Class => $class->Id,
+				 "CustomField-$qid" => $cvals{'article1q'},
+				 "CustomField-$aid" => $cvals{'article1a'},
+				 );
+ok($ret, "article 1 created");
+($ret, $msg) = $article2->Create(Name => 'Second article '.$$,
+				 Summary => 'foo bar 2',
+				 Class => $class->Id,
+				 "CustomField-$qid" => $cvals{'article2q'},
+				 "CustomField-$aid" => $cvals{'article2a'},
+				 );
+ok($ret, "article 2 created");
+($ret, $msg) = $article3->Create(Name => 'Third article '.$$,
+				 Summary => 'ping pong 3',
+				 Class => $class->Id,
+				 "CustomField-$qid" => $cvals{'article3q'},
+				 "CustomField-$aid" => $cvals{'article3a'},
+				 );
+ok($ret, "article 3 created");
+($ret, $msg) = $article4->Create(Name => 'Fourth article '.$$,
+				 Summary => 'hoi polloi 4',
+				 Class => $class->Id,
+				 "CustomField-$qid" => $cvals{'article4q'},
+				 "CustomField-$aid" => $cvals{'article4a'},
+				 );
+ok($ret, "article 4 created");
+
+isa_ok($m, 'Test::WWW::Mechanize');
+ok(1, "Connecting to ".$url);
+$m->get( $url."?user=root;pass=password" );
+$m->content_like(qr/Logout/, 'we did log in');
+$m->follow_link_ok({text => 'RTFM'}, 'UI -> RTFM');
+$m->follow_link_ok( {text => 'Articles'}, 'RTFM -> Articles');
+$m->follow_link_ok( {text => 'in class '.$class->Name}, 'Articles in class '.$class->Name);
+$m->content_contains($article1->Name);