projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT 4.2.11, ticket#13852
[freeside.git]
/
rt
/
share
/
html
/
Elements
/
ShowReminders
diff --git
a/rt/share/html/Elements/ShowReminders
b/rt/share/html/Elements/ShowReminders
index
ca5b338
..
61d8040
100644
(file)
--- a/
rt/share/html/Elements/ShowReminders
+++ b/
rt/share/html/Elements/ShowReminders
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
3
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-57,7
+57,7
@@
my $i =0;
while ( my $reminder = $reminders->Next ) {
$i++;
my $dueobj = $reminder->DueObj;
while ( my $reminder = $reminders->Next ) {
$i++;
my $dueobj = $reminder->DueObj;
-my $overdue = $dueobj->
Unix > 0
&& $dueobj->Diff < 0 ? 1 : 0;
+my $overdue = $dueobj->
IsSet
&& $dueobj->Diff < 0 ? 1 : 0;
my $targets = RT::Tickets->new($session{'CurrentUser'});
$targets->{'allow_deleted_search'} = 1;
my $targets = RT::Tickets->new($session{'CurrentUser'});
$targets->{'allow_deleted_search'} = 1;
@@
-67,7
+67,7
@@
if ( my $ticket= $targets->First ) {
</%PERL>
<tr class="<% $i%2 ? 'oddline' : 'evenline' %>">
<td class="collection-as-table">
</%PERL>
<tr class="<% $i%2 ? 'oddline' : 'evenline' %>">
<td class="collection-as-table">
-<a href="<% RT->Config->Get('WebPath') %>/Ticket/Reminders.html?id=<% $ticket->id %>"><% $reminder->Subject %></a>
+<a href="<% RT->Config->Get('WebPath') %>/Ticket/Reminders.html?id=<% $ticket->id %>
#reminder-<% $reminder->id %>
"><% $reminder->Subject %></a>
</td>
<td class="collection-as-table">
<% $overdue ? '<span class="overdue">' : '' |n %><% $dueobj->AgeAsString || loc('Not set') %><% $overdue ? '</span>' : '' |n %>
</td>
<td class="collection-as-table">
<% $overdue ? '<span class="overdue">' : '' |n %><% $dueobj->AgeAsString || loc('Not set') %><% $overdue ? '</span>' : '' |n %>
@@
-76,7
+76,7
@@
if ( my $ticket= $targets->First ) {
<a href="<% RT->Config->Get( 'WebPath' ) %>/Ticket/Display.html?id=<% $ticket->id %>">#<% $ticket->Id %>: <% $ticket->Subject %></a>
</td>
% } else {
<a href="<% RT->Config->Get( 'WebPath' ) %>/Ticket/Display.html?id=<% $ticket->id %>">#<% $ticket->Id %>: <% $ticket->Subject %></a>
</td>
% } else {
-<td colspan="3" class="collection-as-table>
+<td colspan="3" class="collection-as-table
"
>
<div class="error"><div class="error">Couldn't find Ticket for reminder <% $reminder->id %>. Please contact administrator.</div></div>
</td>
% }
<div class="error"><div class="error">Couldn't find Ticket for reminder <% $reminder->id %>. Please contact administrator.</div></div>
</td>
% }
@@
-91,7
+91,7
@@
my $tsql = 'Type = "reminder"' .
' AND ( Owner = "Nobody" OR Owner ="' . $session{'CurrentUser'}->id . '")' .
' AND ( Status = "new" OR Status = "open" )';
' AND ( Owner = "Nobody" OR Owner ="' . $session{'CurrentUser'}->id . '")' .
' AND ( Status = "new" OR Status = "open" )';
-$tsql .= ' AND
Due < "now"
' if $OnlyOverdue;
+$tsql .= ' AND
( Due < "now" OR Due IS NULL )
' if $OnlyOverdue;
$reminders->FromSQL($tsql);
$reminders->OrderBy( FIELD => 'Due', ORDER => 'ASC' );
$reminders->FromSQL($tsql);
$reminders->OrderBy( FIELD => 'Due', ORDER => 'ASC' );