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

[? sunnavy]

The branch, 4.0/hide-unset-fields-in-display has been updated
       via  1c362ab9dd83d0312afbb8285e75ae58b5fda9b8 (commit)
      from  ffbf65302b7ba94976727abe22ac96a6e1850899 (commit)

Summary of changes:
 share/html/Elements/ShowLinks          |   30 ++++++++++++------------------
 share/html/Ticket/Elements/ShowMembers |   14 ++------------
 share/html/Ticket/Elements/ShowParents |   14 ++------------
 3 files changed, 16 insertions(+), 42 deletions(-)

- Log -----------------------------------------------------------------
commit 1c362ab9dd83d0312afbb8285e75ae58b5fda9b8
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri May 13 23:31:32 2011 +0800

    Revert "to decrease the sql query: each time we run ->DependsOn, etc, we get new Links obj"
    
    don't forget we have cache in Record.pm
    This reverts commit ffbf65302b7ba94976727abe22ac96a6e1850899.

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

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