ruz at bestpractical
Jul 23, 2008, 7:47 PM
Post #1 of 1
(52 views)
Permalink
|
|
r14452 - rt/3.8/trunk/share/html/Ticket/Elements
|
|
Author: ruz
Date: Wed Jul 23 22:47:07 2008
New Revision: 14452
Modified:
rt/3.8/trunk/share/html/Ticket/Elements/Bookmark
Log:
* handle ticket merges in bookmarks
Modified: rt/3.8/trunk/share/html/Ticket/Elements/Bookmark
==============================================================================
--- rt/3.8/trunk/share/html/Ticket/Elements/Bookmark (original)
+++ rt/3.8/trunk/share/html/Ticket/Elements/Bookmark Wed Jul 23 22:47:07 2008
@@ -50,16 +50,31 @@
$bookmarks = $bookmarks->Content if $bookmarks;
$bookmarks ||= {};
+my $bookmarked = $bookmarks->{ $id }; # we still not sure if it's undef
+
+my @ids;
+if ( $Toggle || !$bookmarked ) {
+ my $ticket = RT::Ticket->new( $session{'CurrentUser'} );
+ $ticket->Load( $id );
+ return unless $id = $ticket->id;
+
+ @ids = ($id, $ticket->Merged);
+}
+
if ( $Toggle ) {
- if ( $bookmarks->{ $id } ) {
- delete $bookmarks->{ $id };
+ if ( grep $bookmarks->{ $_ }, @ids ) {
+ delete $bookmarks->{ $_ } foreach @ids;
+ $bookmarked = 0;
} else {
$bookmarks->{ $id } = 1;
+ $bookmarked = 1;
}
$session{'CurrentUser'}->UserObj->SetAttribute(
Name => 'Bookmarks',
Content => $bookmarks,
);
+} elsif ( !$bookmarked ) {
+ $bookmarked = grep $bookmarks->{ $_ }, @ids;
}
</%INIT>
<%ARGS>
@@ -69,7 +84,7 @@
<span id="toggle-<% $id %>">
% my $url = RT->Config->Get('WebPath') ."/Helpers/Toggle/TicketBookmark?id=". $id;
<a align="right" href="<% $url %>" onClick="ahah('<% $url |n %>', 'toggle-<% $id |n %>'); return false;" >
-% if ( $bookmarks->{ $id } ) {
+% if ( $bookmarked ) {
<img src="<% RT->Config->Get('WebPath') %>/NoAuth/images/star.gif" alt="<% loc('Remove Bookmark') %>" style="border-style: none" />
% } else {
<img src="<% RT->Config->Get('WebPath') %>/NoAuth/images/empty_star.gif" alt="<% loc('Add Bookmark') %>" style="border-style: none" />
_______________________________________________
Rt-commit mailing list
Rt-commit[at]lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit
|
