[Rt-commit] rt branch, 4.0/hide-unset-fields-in-display, created. rt-4.0.0-277-g8001ab7
? sunnavy
sunnavy at bestpractical.com
Thu May 12 02:27:15 EDT 2011
The branch, 4.0/hide-unset-fields-in-display has been created
at 8001ab7f3a07f8986c6abb337160b145ea5fa2a8 (commit)
- Log -----------------------------------------------------------------
commit a2f08fca2410333f019e70ef8353b496c0cb21db
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu May 12 14:08:49 2011 +0800
clean very weird code, maybe typo
diff --git a/share/html/Ticket/Elements/ShowDates b/share/html/Ticket/Elements/ShowDates
index 68117e1..7d84714 100755
--- a/share/html/Ticket/Elements/ShowDates
+++ b/share/html/Ticket/Elements/ShowDates
@@ -64,11 +64,7 @@
</tr>
<tr class="date due">
<td class="label"><&|/l&>Due</&>:</td>\
-% my $due = $Ticket->DueObj;
-% if ( $due && $due->Unix > 0 && $due->Diff < 0 ) {
- <td class="value"><% $due->AsString %></span></td>
-% } else {
- <td class="value"><% $due->AsString %></td>
+ <td class="value"><% $Ticket->DueObj->AsString %></td>
% }
</tr>
<tr class="date resolved">
commit 8001ab7f3a07f8986c6abb337160b145ea5fa2a8
Author: sunnavy <sunnavy at bestpractical.com>
Date: Thu May 12 14:11:36 2011 +0800
hide possible empty fields for people|dates|links
diff --git a/share/html/Elements/ShowLinks b/share/html/Elements/ShowLinks
index c35cabc..78b9a0f 100755
--- a/share/html/Elements/ShowLinks
+++ b/share/html/Elements/ShowLinks
@@ -46,13 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<table>
- <tr>
- <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Depends on'), Relation => 'DependsOn' &>:\
-% if ($can_create) {
- <span class="create">(<a href="<%$clone->{'DependsOn-new'}%>"><% loc('Create') %></a>)</span>
-% }
- </td>
- <td class="value">
+% if ( $can_create || $Ticket->DependsOn->Count ) {
<%PERL>
my ( @active, @inactive, @not_tickets );
for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
@@ -70,6 +64,13 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
}
}
</%PERL>
+ <tr>
+ <td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Depends on'), Relation => 'DependsOn' &>:\
+% if ($can_create) {
+ <span class="create">(<a href="<%$clone->{'DependsOn-new'}%>"><% loc('Create') %></a>)</span>
+% }
+ </td>
+ <td class="value">
<ul>
% for my $Link (@not_tickets, @active, @inactive) {
<li><& ShowLink, URI => $Link &></li>
@@ -77,6 +78,9 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
</ul>
</td>
</tr>
+% }
+
+% if ( $can_create || $Ticket->DependedOnBy->Count ) {
<tr>
<td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Depended on by'), Relation => 'DependedOnBy' &>:\
% if ($can_create) {
@@ -91,6 +95,9 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
</ul>
</td>
</tr>
+% }
+
+% if ( $can_create || $Ticket->MemberOf->Count ) {
<tr>
<td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Parents'), Relation => 'Parents' &>:\
% if ($can_create) {
@@ -99,6 +106,9 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
</td>
<td class="value"><& /Ticket/Elements/ShowParents, Ticket => $Ticket &></td>
</tr>
+% }
+
+% if ( $can_create || $Ticket->Members->Count ) {
<tr>
<td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Children'), Relation => 'Children' &>:\
% if ($can_create) {
@@ -107,6 +117,9 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
</td>
<td class="value"><& /Ticket/Elements/ShowMembers, Ticket => $Ticket &></td>
</tr>
+% }
+
+% if ( $can_create || $Ticket->RefersTo->Count ) {
<tr>
<td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Refers to'), Relation => 'RefersTo' &>:\
% if ($can_create) {
@@ -121,6 +134,10 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
</ul>
</td>
</tr>
+% }
+
+
+% if ( $can_create || $Ticket->ReferredToBy->Count ) {
<tr>
<td class="labeltop"><& ShowRelationLabel, id => $id, Label => loc('Referred to by'), Relation => 'ReferredToBy' &>:\
% if ($can_create) {
@@ -136,6 +153,8 @@ for my $link ( @{ $Ticket->DependsOn->ItemsArrayRef } ) {
</ul>
</td>
</tr>
+% }
+
% # Allow people to add more rows to the table
% $m->callback( %ARGS );
</table>
diff --git a/share/html/Ticket/Elements/ShowDates b/share/html/Ticket/Elements/ShowDates
index 7d84714..886b9ba 100755
--- a/share/html/Ticket/Elements/ShowDates
+++ b/share/html/Ticket/Elements/ShowDates
@@ -50,27 +50,46 @@
<td class="label"><&|/l&>Created</&>:</td>\
<td class="value"><% $Ticket->CreatedObj->AsString %></td>
</tr>
+% if ( $Ticket->StartsObj->Unix ) {
<tr class="date starts">
<td class="label"><&|/l&>Starts</&>:</td>\
<td class="value"><% $Ticket->StartsObj->AsString %></td>
</tr>
+% }
+% if ( $Ticket->StartedObj->Unix ) {
<tr class="date started">
<td class="label"><&|/l&>Started</&>:</td>\
<td class="value"><% $Ticket->StartedObj->AsString %></td>
</tr>
+% }
+
+
+% if ( $Ticket->ToldObj->Unix || $Ticket->CurrentUserHasRight('ModifyTicket') ) {
<tr class="date told">
- <td class="label"><a href="<% RT->Config->Get('WebPath') %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:</td>\
- <td class="value"><% $Ticket->ToldObj->AsString %></td>
+ <td class="label">
+% if ( $Ticket->CurrentUserHasRight('ModifyTicket' ) ) {
+<a href="<% RT->Config->Get('WebPath') %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:
+% } else {
+<&|/l&>Last Contact</&>:
+% }
+</td><td class="value"><% $Ticket->ToldObj->AsString %></td>
</tr>
+% }
+
+% if ( $Ticket->DueObj->Unix ) {
<tr class="date due">
<td class="label"><&|/l&>Due</&>:</td>\
<td class="value"><% $Ticket->DueObj->AsString %></td>
-% }
</tr>
+% }
+
+% if ( $Ticket->ResolvedObj->Unix ) {
<tr class="date resolved">
<td class="label"><&|/l&>Closed</&>:</td>\
<td class="value"><% $Ticket->ResolvedObj->AsString %></td>
</tr>
+% }
+
<tr class="date updated">
<td class="label"><&|/l&>Updated</&>:</td>\
% my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $m->scomp('/Elements/ShowUser', User => $Ticket->LastUpdatedByObj)) : loc("Never");
diff --git a/share/html/Ticket/Elements/ShowPeople b/share/html/Ticket/Elements/ShowPeople
index cb5fb32..c2cbd94 100755
--- a/share/html/Ticket/Elements/ShowPeople
+++ b/share/html/Ticket/Elements/ShowPeople
@@ -58,14 +58,18 @@
<td class="labeltop"><&|/l&>Requestors</&>:</td>
<td class="value"><& ShowGroupMembers, Group => $Ticket->Requestors, Ticket => $Ticket &></td>
</tr>
+% if ( $Ticket->Cc->MembersObj->Count ) {
<tr>
<td class="labeltop"><&|/l&>Cc</&>:</td>
<td class="value"><& ShowGroupMembers, Group => $Ticket->Cc, Ticket => $Ticket &></td>
</tr>
+% }
+% if ( $Ticket->AdminCc->MembersObj->Count ) {
<tr>
<td class="labeltop"><&|/l&>AdminCc</&>:</td>
<td class="value"><& ShowGroupMembers, Group => $Ticket->AdminCc, Ticket => $Ticket &></td>
</tr>
+% }
</table>
<%INIT>
</%INIT>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list