Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
best-practical
rt
Commits
f170ce08
Commit
f170ce08
authored
Sep 02, 2014
by
Alex Vandiver
Browse files
Merge branch '4.2/overdue-class' into 4.2-trunk
parents
651c9c59
5a51e2ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
share/html/Elements/RT__Ticket/ColumnMap
View file @
f170ce08
...
...
@@ -237,7 +237,15 @@ $COLUMN_MAP = {
Due => {
title => 'Due', # loc
attribute => 'Due',
value => sub { return $_[0]->DueObj->AsString }
value => sub {
my $date = $_[0]->DueObj;
# Highlight the date if it was due in the past, and it's still active
if ( $date && $date->IsSet && $date->Diff < 0 && $_[0]->QueueObj->IsActiveStatus($_[0]->Status)) {
return (\'<span class="overdue">' , $date->AsString , \'</span>');
} else {
return $date->AsString;
}
}
},
Resolved => {
title => 'Resolved', # loc
...
...
share/html/Ticket/Elements/ShowDates
View file @
f170ce08
...
...
@@ -65,7 +65,7 @@
<tr class="date due">
<td class="label"><&|/l&>Due</&>:</td>\
% my $due = $Ticket->DueObj;
% if ( $due && $due->IsSet && $due->Diff < 0 ) {
% if ( $due && $due->IsSet && $due->Diff < 0
&& $Ticket->QueueObj->IsActiveStatus($Ticket->Status)
) {
<td class="value"><span class="overdue"><% $due->AsString %></span></td>
% } else {
<td class="value"><% $due->AsString %></td>
...
...
share/html/m/ticket/show
View file @
f170ce08
...
...
@@ -365,7 +365,7 @@ my $print_value = sub {
<div class="entry">
<div class="label date due"><&|/l&>Due</&>:</div>
% my $due = $Ticket->DueObj;
% if ( $due && $due->IsSet && $due->Diff < 0 ) {
% if ( $due && $due->IsSet && $due->Diff < 0
&& $Ticket->QueueObj->IsActiveStatus($Ticket->Status)
) {
<div class="value date due"><span class="overdue"><% $due->AsString %></span></div>
% } else {
<div class="value date due"><% $due->AsString %></div>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment