[Rt-commit] r11062 - in rt/branches/3.8-TESTING/html/Elements: .

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar 13 12:06:17 2008
New Revision: 11062

Modified:
   rt/branches/3.8-TESTING/html/Elements/RT__Ticket/ColumnMap
   rt/branches/3.8-TESTING/html/Elements/ShowSearch

Log:
* more on Bookmarks

Modified: rt/branches/3.8-TESTING/html/Elements/RT__Ticket/ColumnMap
==============================================================================
--- rt/branches/3.8-TESTING/html/Elements/RT__Ticket/ColumnMap	(original)
+++ rt/branches/3.8-TESTING/html/Elements/RT__Ticket/ColumnMap	Thu Mar 13 12:06:17 2008
@@ -303,6 +303,12 @@
             return @values;
         },
     },
+    Bookmark => {
+        title => ' ',
+        value => sub {
+            return \$m->comp( '/Ticket/Elements/Bookmark', id => $_[0]->id );
+        },
+    },
 };
 
 $TICKET_COLUMN_MAP->{'CF'} = $TICKET_COLUMN_MAP->{'CustomField'};

Modified: rt/branches/3.8-TESTING/html/Elements/ShowSearch
==============================================================================
--- rt/branches/3.8-TESTING/html/Elements/ShowSearch	(original)
+++ rt/branches/3.8-TESTING/html/Elements/ShowSearch	Thu Mar 13 12:06:17 2008
@@ -114,6 +114,15 @@
     $_->{'Query'}  =~ s/__CurrentUser__/$session{'CurrentUser'}->Id/ge;
     $_->{'Format'} =~ s/__(Web(?:Path|Base|BaseURL))__/scalar RT->Config->Get($1)/ge;
     $_->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/loc("$1")/ge;
+    if ( $_->{'Query'} =~ /__Bookmarks__/ ) {
+        $_->{'Rows'} = 999;
+
+        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';
+        $_->{'Query'} =~ s/__Bookmarks__/( $query )/g;
+    }
 }
 
 my $QueryString = '?' . $m->comp( '/Elements/QueryString', %$SearchArg );