[Rt-commit] rt branch, 4.2/bookmarks-in-lib, updated. rt-4.0.0rc6-164-gf2aa0a1

[Shawn Moore]

The branch, 4.2/bookmarks-in-lib has been updated
       via  f2aa0a1d86839d72d74ac0d2ca7de07f52a65ea5 (commit)
      from  f5db1916c99d145fd70a16dc0d3f849a0d3972a2 (commit)

Summary of changes:
 share/html/Elements/ShowSearch |    6 ++----
 share/html/m/tickets/search    |    6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit f2aa0a1d86839d72d74ac0d2ca7de07f52a65ea5
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Mar 8 15:12:36 2011 -0500

    Use User->Bookmarks in ShowSearch and m/tickets/search

diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index d019081..9d8dcf3 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -132,10 +132,8 @@ foreach ( $SearchArg, $ProcessedSearchArg ) {
         $_->{'Rows'} = 999;
 
         # DEPRECATED: will be here for a while up to 3.10/4.0
-        my $bookmarks = $session{'CurrentUser'}->UserObj->FirstAttribute('Bookmarks');
-        $bookmarks = $bookmarks->Content if $bookmarks;
-        $bookmarks ||= {};
-        my $query = join(" OR ", map " id = '$_' ", grep $bookmarks->{ $_ }, keys %$bookmarks ) || 'id=0';
+        my @bookmarks = $session{'CurrentUser'}->UserObj->Bookmarks;
+        my $query = join(" OR ", map " id = '$_' ", @bookmarks ) || 'id=0';
         $_->{'Query'} =~ s/__Bookmarks__/( $query )/g;
     }
 }
diff --git a/share/html/m/tickets/search b/share/html/m/tickets/search
index a82763a..d4d1876 100644
--- a/share/html/m/tickets/search
+++ b/share/html/m/tickets/search
@@ -91,10 +91,8 @@ my $search;
             $_->{'Rows'} = 999;
 
             # DEPRECATED: will be here for a while up to 3.10/4.0
-            my $bookmarks = $session{'CurrentUser'}->UserObj->FirstAttribute('Bookmarks');
-            $bookmarks = $bookmarks->Content if $bookmarks;
-            $bookmarks ||= {};
-            my $query = join( " OR ", map " id = '$_' ", grep $bookmarks->{$_}, keys %$bookmarks ) || 'id=0';
+            my @bookmarks = $session{'CurrentUser'}->UserObj->Bookmarks;
+            my $query = join(" OR ", map " id = '$_' ", @bookmarks ) || 'id=0';
             $_->{'Query'} =~ s/__Bookmarks__/( $query )/g;
         }
     }

-----------------------------------------------------------------------