Merge branch '6.0/article-search-max-results' into 6.0-trunk

Author: cbrandtbuffalo

share/html/Helpers/Autocomplete/Articles

@@ -89,13 +89,21 @@ $articles->Limit(
     SUBCLAUSE       => 'excludeautocomplete'
 ) if @not_in;
 
+my $count = $articles->CountAll;
 my @suggestions;
-while (my $a = $articles->Next) {
-    next if $right and not $a->CurrentUserHasRight($right);
-    my $value = $a->$return;
-    my $suggestion = { label => $a->Name, value => $value };
-    $m->callback( CallbackName => "ModifySuggestion", suggestion => $suggestion, article => $a );
-    push @suggestions, $suggestion;
+# RT::Articles->AddRecord filters by ShowArticle right, so some DB records
+# may be skipped. Keep paging until we collect max visible articles.
+OUTER: while (@suggestions < $max) {
+    while (my $a = $articles->Next) {
+        next if $right and not $a->CurrentUserHasRight($right);
+        my $value = $a->$return;
+        my $suggestion = { label => $a->Name, value => $value };
+        $m->callback( CallbackName => "ModifySuggestion", suggestion => $suggestion, article => $a );
+        push @suggestions, $suggestion;
+        last OUTER if @suggestions >= $max;
+    }
+    $articles->NextPage;
+    last if $articles->FirstRow >= $count;
 }
 return @suggestions if defined wantarray;
 </%INIT>

t/web/case-sensitivity.t

@@ -182,4 +182,64 @@ my $cf;
     is_deeply( JSON::from_json( $m->content ), $result, 'Found by Content' );
 }
 
+$m->logout;
+
+# Create a user with limited rights
+my $user = RT::User->new(RT->SystemUser);
+my ($user_id, $user_msg) = $user->Create(
+    Name => 'limited_user_' . $$,
+    Password => 'password',
+    Privileged => 1,
+);
+ok($user_id, "Created limited user: $user_msg");
+$m->login($user->Name, 'password');
+
+# test articles autocomplete with rights-based filtering and max limit
+{
+    # Create a second article class
+    my $class1 = RT::Class->new(RT->SystemUser);
+    my ($class1_id, $class1_msg) = $class1->Create(
+        Name => 'Visible-' . $$,
+        Description => 'Visible class',
+    );
+    ok($class1_id, "Created visible class: $class1_msg");
+
+    my $class2 = RT::Class->new(RT->SystemUser);
+    my ($class2_id, $class2_msg) = $class2->Create(
+        Name => 'Hidden-' . $$,
+        Description => 'Hidden class',
+    );
+    ok($class2_id, "Created hidden class: $class2_msg");
+
+    # Grant ShowArticle right only on the visible class
+    my ($ok, $msg) = $user->PrincipalObj->GrantRight(
+        Right => 'ShowArticle',
+        Object => $class1,
+    );
+    ok($ok, "Granted ShowArticle on visible class: $msg");
+
+    # Create 3 articles with the same search term
+    # Article 1 is visible, article 2 is hidden, article 3 is visible
+    my @articles;
+    my @classes = ($class1, $class2, $class1);
+    for my $i (1..3) {
+        my $art = RT::Article->new(RT->SystemUser);
+        my ($id, $art_msg) = $art->Create(
+            Class   => $classes[$i-1]->Name,
+            Name    => "MaxResults Article $i " . $$,
+            Summary => "MaxResults test article $i",
+        );
+        ok($id, "Created article $i: $art_msg");
+        push @articles, $art;
+    }
+
+    # Test with max=2: should get 2 results from the 2 visible articles
+    $m->get_ok('/Helpers/Autocomplete/Articles?return=id&term=MaxResults&max=2');
+    my $results = JSON::from_json($m->content);
+
+    is(scalar @$results, 2, 'Returns 2 results when max=2 and 2 visible articles exist');
+    is($results->[0]->{value}, $articles[0]->id, 'First visible article is returned');
+    is($results->[1]->{value}, $articles[2]->id, 'Third article (second visible) is returned');
+}
+
 done_testing();