[Rt-commit] rt branch, 4.0/hide-unset-fields-in-display, updated. rt-4.0.0-280-gffbf653

? sunnavy sunnavy at bestpractical.com
Thu May 12 23:33:44 EDT 2011


The branch, 4.0/hide-unset-fields-in-display has been updated
       via  ffbf65302b7ba94976727abe22ac96a6e1850899 (commit)
       via  ed3acb933727e86134abe0d63b77246ded86d673 (commit)
       via  59c5e2c1251211ab12ff654b0733d05ac25083bc (commit)
      from  8001ab7f3a07f8986c6abb337160b145ea5fa2a8 (commit)

Summary of changes:
 share/html/Elements/ShowLinks          |   30 ++++++++++++++++++------------
 share/html/NoAuth/css/base/misc.css    |    4 ++++
 share/html/Ticket/Elements/ShowDates   |    8 +++++++-
 share/html/Ticket/Elements/ShowMembers |   14 ++++++++++++--
 share/html/Ticket/Elements/ShowParents |   14 ++++++++++++--
 5 files changed, 53 insertions(+), 17 deletions(-)

- Log -----------------------------------------------------------------
commit 59c5e2c1251211ab12ff654b0733d05ac25083bc
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri May 13 10:40:01 2011 +0800

    we want to alert people if it is overdue

diff --git a/share/html/Ticket/Elements/ShowDates b/share/html/Ticket/Elements/ShowDates
index 886b9ba..24892e8 100755
--- a/share/html/Ticket/Elements/ShowDates
+++ b/share/html/Ticket/Elements/ShowDates
@@ -79,7 +79,13 @@
 % if ( $Ticket->DueObj->Unix ) {
   <tr class="date due">
     <td class="label"><&|/l&>Due</&>:</td>\
-    <td class="value"><% $Ticket->DueObj->AsString  %></td>
+% my $due = $Ticket->DueObj;
+% if ( $due && $due->Diff < 0 ) {
+   <td class="value"><span class="overdue"><% $due->AsString %></span></td>
+% } else {
+   <td class="value"><% $due->AsString  %></td>
+% }
+
   </tr>
 % }
 

commit ed3acb933727e86134abe0d63b77246ded86d673
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri May 13 10:56:18 2011 +0800

    we missed .overdue css before

diff --git a/share/html/NoAuth/css/base/misc.css b/share/html/NoAuth/css/base/misc.css
index ea03202..1e48abd 100644
--- a/share/html/NoAuth/css/base/misc.css
+++ b/share/html/NoAuth/css/base/misc.css
@@ -108,3 +108,7 @@ fieldset.cfedit {
     font-family: arial,helvetica,sans-serif !important;
 }
 
+.overdue {
+    color: red;
+}
+

commit ffbf65302b7ba94976727abe22ac96a6e1850899
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri May 13 11:21:47 2011 +0800

    to decrease the sql query: each time we run ->DependsOn, etc, we get new Links obj

diff --git a/share/html/Elements/ShowLinks b/share/html/Elements/ShowLinks
index 78b9a0f..1a3e6ab 100755
--- a/share/html/Elements/ShowLinks
+++ b/share/html/Elements/ShowLinks
@@ -46,10 +46,11 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <table>
-% if ( $can_create || $Ticket->DependsOn->Count ) {
+% my $depends_on = $Ticket->DependsOn;
+% if ( $can_create || $depends_on->Count ) {
 <%PERL>
 my ( @active, @inactive, @not_tickets );
-for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
+for my $link ( @{ $depends_on->ItemsArrayRef } ) {
     my $target = $link->TargetObj;
     if ( $target && $target->isa('RT::Ticket') ) {
         if ( $target->QueueObj->IsInactiveStatus( $target->Status ) ) {
@@ -80,7 +81,8 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
   </tr>
 % }
 
-% if ( $can_create || $Ticket->DependedOnBy->Count ) {
+% my $depended_on_by = $Ticket->DependedOnBy;
+% if ( $can_create || $depended_on_by->Count ) {
   <tr>
     <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Depended on by'), Relation => 'DependedOnBy' &>:\
 % if ($can_create) {
@@ -89,7 +91,7 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
     </td>
     <td class="value">
 <ul>
-% while (my $Link = $Ticket->DependedOnBy->Next) {
+% while (my $Link = $depended_on_by->Next) {
 <li><& ShowLink, URI => $Link->BaseURI &></li>
 % }
 </ul>
@@ -97,29 +99,32 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
   </tr>
 % }
 
-% if ( $can_create || $Ticket->MemberOf->Count ) {
+% my $member_of = $Ticket->MemberOf;
+% if ( $can_create || $member_of->Count ) {
   <tr>
     <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Parents'), Relation => 'Parents' &>:\
 % if ($can_create) {
         <span class="create">(<a href="<%$clone->{'MemberOf-new'}%>"><% loc('Create') %></a>)</span>
 % }
     </td>
-    <td class="value"><& /Ticket/Elements/ShowParents, Ticket => $Ticket &></td>
+    <td class="value"><& /Ticket/Elements/ShowParents, Links => $member_of &></td>
   </tr>
 % }
 
-% if ( $can_create || $Ticket->Members->Count ) {
+% my $members = $Ticket->Members;
+% if ( $can_create || $members->Count ) {
   <tr>
     <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Children'), Relation => 'Children' &>:\
 % if ($can_create) {
         <span class="create">(<a href="<%$clone->{'new-MemberOf'}%>"><% loc('Create') %></a>)</span>
 % }
     </td>
-    <td class="value"><& /Ticket/Elements/ShowMembers, Ticket => $Ticket &></td>
+    <td class="value"><& /Ticket/Elements/ShowMembers, Links => $members &></td>
   </tr>
 % }
 
-% if ( $can_create || $Ticket->RefersTo->Count ) {
+% my $refers_to = $Ticket->RefersTo;
+% if ( $can_create || $refers_to->Count ) {
   <tr>
     <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Refers to'), Relation => 'RefersTo' &>:\
 % if ($can_create) {
@@ -128,7 +133,7 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
     </td>
     <td class="value">
 <ul>
-% while (my $Link = $Ticket->RefersTo->Next) {
+% while (my $Link = $refers_to->Next) {
 <li><& ShowLink, URI => $Link->TargetURI &></li>
 % }
 </ul>
@@ -137,7 +142,8 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
 % }
 
 
-% if ( $can_create || $Ticket->ReferredToBy->Count ) {
+% my $referred_to_by = $Ticket->ReferredToBy;
+% if ( $can_create || $referred_to_by->Count ) {
   <tr>
     <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Referred to by'), Relation => 'ReferredToBy' &>:\
 % if ($can_create) {
@@ -146,7 +152,7 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
     </td>
     <td class="value">
     <ul>
-% while (my $Link = $Ticket->ReferredToBy->Next) {
+% while (my $Link = $referred_to_by->Next) {
 % next if (UNIVERSAL::isa($Link->BaseObj, 'RT::Ticket')  && $Link->BaseObj->Type eq 'reminder');
 <li><& ShowLink, URI => $Link->BaseURI &></li>
 % }
diff --git a/share/html/Ticket/Elements/ShowMembers b/share/html/Ticket/Elements/ShowMembers
index 7e9ba49..54dfd5a 100755
--- a/share/html/Ticket/Elements/ShowMembers
+++ b/share/html/Ticket/Elements/ShowMembers
@@ -57,13 +57,23 @@
 
 <%INIT>
 
-return unless $Ticket;
-my $members = $Ticket->Members;
+return unless $Ticket || $Links;
+
+my $members;
+
+if ( $Ticket ) {
+    $members = $Ticket->Members;
+}
+else {
+    $members = $Links;
+}
+
 return unless $members->Count;
 
 </%INIT>
 
 <%ARGS>
 $Ticket => undef
+$Links => undef
 $depth => 1
 </%ARGS>
diff --git a/share/html/Ticket/Elements/ShowParents b/share/html/Ticket/Elements/ShowParents
index d337115..04d34f2 100644
--- a/share/html/Ticket/Elements/ShowParents
+++ b/share/html/Ticket/Elements/ShowParents
@@ -52,12 +52,22 @@
 </ul>
 <%INIT>
 
-return unless $Ticket;
-my $member_of = $Ticket->MemberOf;
+return unless $Ticket || $Links;
+
+my $member_of;
+
+if ( $Ticket ) {
+    $member_of = $Ticket->MemberOf;
+}
+else {
+    $member_of = $Links;
+}
+
 return unless $member_of->Count;
 
 </%INIT>
 
 <%ARGS>
 $Ticket => undef
+$Links => undef
 </%ARGS>

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


More information about the Rt-commit mailing list