[freeside-commits] freeside/rt/html/Ticket/Elements EditCustomFields, 1.1.1.4, 1.1.1.4.2.1 PreviewScrips, 1.1.1.2, 1.1.1.2.4.1 ShowBasics, 1.1.1.3, 1.1.1.3.4.1 ShowDates, 1.1.1.5, 1.1.1.5.4.1 ShowHistory, 1.1.1.5, 1.1.1.5.4.1 ShowRequestor, 1.1.1.4, 1.1.1.4.4.1 ShowSummary, 1.4, 1.4.4.1
Ivan,,,
ivan at wavetail.420.am
Mon Mar 3 15:07:47 PST 2008
Update of /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements
In directory wavetail.420.am:/tmp/cvs-serv10370/html/Ticket/Elements
Modified Files:
Tag: FREESIDE_1_7_BRANCH
EditCustomFields PreviewScrips ShowBasics ShowDates
ShowHistory ShowRequestor ShowSummary
Log Message:
merge in rt 3.4.6. *gulp*!
Index: ShowBasics
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/ShowBasics,v
retrieving revision 1.1.1.3
retrieving revision 1.1.1.3.4.1
diff -u -d -r1.1.1.3 -r1.1.1.3.4.1
--- ShowBasics 15 Oct 2005 09:09:59 -0000 1.1.1.3
+++ ShowBasics 3 Mar 2008 23:07:44 -0000 1.1.1.3.4.1
@@ -45,36 +45,36 @@
%# END BPS TAGGED BLOCK }}}
<table>
<tr>
- <td class="label"><&|/l&>Id</&>:</td>
- <td class="value"><%$Ticket->Id %></td>
+ <td class="label id"><&|/l&>Id</&>:</td>
+ <td class="value id"><%$Ticket->Id %></td>
</tr>
<tr>
- <td class="label"><&|/l&>Status</&>:</td>
- <td class="value"><&|/l&><% $Ticket->Status%></&></td>
+ <td class="label status"><&|/l&>Status</&>:</td>
+ <td class="value status"><&|/l&><% $Ticket->Status%></&></td>
</tr>
% if ($Ticket->TimeEstimated) {
<tr>
- <td class="label"><&|/l&>Estimated</&>:</td>
- <td class="value"><&|/l, $Ticket->TimeEstimated &>[_1] min</&></td>
+ <td class="label time estimated"><&|/l&>Estimated</&>:</td>
+ <td class="value time estimated"><&|/l, $Ticket->TimeEstimated &>[_1] min</&></td>
</tr>
% }
% if ($Ticket->TimeWorked) {
<tr>
- <td class="label"><&|/l&>Worked</&>:</td>
- <td class="value"><&|/l, $Ticket->TimeWorked &>[_1] min</&></td>
+ <td class="label time worked"><&|/l&>Worked</&>:</td>
+ <td class="value time worked"><&|/l, $Ticket->TimeWorked &>[_1] min</&></td>
</tr>
% }
<tr>
- <td class="label"><&|/l&>Left</&>:</td>
- <td class="value"><&|/l, $Ticket->TimeLeft &>[_1] min</&></td>
+ <td class="label time left"><&|/l&>Left</&>:</td>
+ <td class="value time left"><&|/l, $Ticket->TimeLeft &>[_1] min</&></td>
</tr>
<tr>
- <td class="label"><&|/l&>Priority</&>:</td>
- <td class="value"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
+ <td class="label priority"><&|/l&>Priority</&>:</td>
+ <td class="value priority"><%$Ticket->Priority%>/<%$Ticket->FinalPriority %></td>
</tr>
<tr>
- <td class="label"><&|/l&>Queue</&>:</td>
- <td class="value"><%$Ticket->QueueObj->Name%></td>
+ <td class="label queue"><&|/l&>Queue</&>:</td>
+ <td class="value queue"><%$Ticket->QueueObj->Name%></td>
</tr>
<& /Elements/Callback, _CallbackName => 'EndOfList', TicketObj => $Ticket, %ARGS &>
</table>
Index: ShowHistory
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/ShowHistory,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- ShowHistory 15 Oct 2005 09:09:59 -0000 1.1.1.5
+++ ShowHistory 3 Mar 2008 23:07:45 -0000 1.1.1.5.4.1
@@ -136,8 +136,16 @@
} else {
$Transactions = $Ticket->Transactions;
}
-my $i;
+
+my $OldestFirst = $RT::OldestTransactionsFirst? 'ASC': 'DESC';
+$Transactions->OrderByCols( { FIELD => 'Created',
+ ORDER => $OldestFirst },
+ { FIELD => 'id',
+ ORDER => $OldestFirst },
+ );
+
+my $i;
$Attachments ||= $m->comp('/Ticket/Elements/FindAttachments', Ticket => $Ticket, Tickets => $Tickets || undef);
$AttachmentContent ||= $m->comp('/Ticket/Elements/LoadTextAttachments', Ticket => $Ticket);
Index: ShowRequestor
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/ShowRequestor,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.4.4.1
diff -u -d -r1.1.1.4 -r1.1.1.4.4.1
--- ShowRequestor 15 Oct 2005 09:09:59 -0000 1.1.1.4
+++ ShowRequestor 3 Mar 2008 23:07:45 -0000 1.1.1.4.4.1
@@ -47,17 +47,14 @@
my $rows = 10;
my $people = $Ticket->Requestors->UserMembersObj;
while (my $requestor=$people->Next) {
+next if $requestor->Privileged;
my $name=$requestor->RealName || $requestor->EmailAddress;
my $tickets = RT::Tickets->new($session{'CurrentUser'});
-$tickets->LimitWatcher(TYPE => 'Requestor', VALUE => $requestor->EmailAddress );
-$tickets->LimitStatus( VALUE => 'open');
-$tickets->LimitStatus( VALUE => 'new');
+$tickets->FromSQL( "Requestor.id = ". $requestor->id ." AND (Status = 'open' OR Status = 'new')" );
$tickets->RowsPerPage($rows);
-$tickets->OrderBy(FIELD => 'Priority',
- ORDER => 'DESC');
+$tickets->OrderBy(FIELD => 'Priority', ORDER => 'DESC');
</%PERL>
-% unless ($requestor->Privileged) {
<& /Elements/TitleBoxStart,
title => "<a class='inverse' href=\"$RT::WebPath/Admin/Users/Modify.html?id=".$requestor->id."\">".loc("More about [_1]", $name)."</a>" &>
@@ -80,7 +77,6 @@
<& /Elements/TitleBoxEnd &>
-% }
%}
<%ARGS>
$Ticket=>undef
Index: EditCustomFields
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/EditCustomFields,v
retrieving revision 1.1.1.4
retrieving revision 1.1.1.4.2.1
diff -u -d -r1.1.1.4 -r1.1.1.4.2.1
--- EditCustomFields 17 Oct 2006 08:49:19 -0000 1.1.1.4
+++ EditCustomFields 3 Mar 2008 23:07:44 -0000 1.1.1.4.2.1
@@ -48,8 +48,7 @@
<td valign="top" width="50%">
<table>
-% my @entry_fields;
-% my $i;
+% my $i = 0;
% my $cfcount = $CustomFields->Count;
% $cfcount++ if ($cfcount % 2) ; # if we have an odd number of
% #custom fields, fudge it so we know where to put in the table break
Index: PreviewScrips
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/PreviewScrips,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.4.1
diff -u -d -r1.1.1.2 -r1.1.1.2.4.1
--- PreviewScrips 15 Oct 2005 09:09:59 -0000 1.1.1.2
+++ PreviewScrips 3 Mar 2008 23:07:44 -0000 1.1.1.2.4.1
@@ -86,15 +86,19 @@
TimeTaken => $ARGS{'UpdateTimeWorked'},
DryRun => 1
);
+unless ( $Transaction ) {
+ $RT::Logger->error("Coulfn't fire '$action' action: $Description");
+}
my @non_recipients = $TicketObj->SquelchMailTo;
</%init>
<h2><&|/l&>This message will be sent to...</&></h2>
+% if ( $Object ) {
<i><&|/l&>(Check boxes to disable notifications to the listed recipients)</&></i><br>
% foreach my $scrip (@{$Object->Scrips->Prepared}) {
% next unless $scrip->ActionObj->Action->isa('RT::Action::SendEmail');
-<b><%$scrip->Description%></b><br>
+<b><% $scrip->Description %></b><br>
<&|/l, loc($scrip->ConditionObj->Name), loc($scrip->ActionObj->Name), loc($scrip->TemplateObj->Name)&>[_1] [_2] with template [_3]</&>
<br>
%foreach my $type qw(To Cc Bcc) {
@@ -110,8 +114,10 @@
<%$scrip->ActionObj->TemplateObj->MIMEObj->as_string%>
</textarea>
% }
-%}
-<br>
+% }
+% }
+<br />
+
<h2><&|/l&>Messages about this ticket will not be sent to...</&></h2>
<i><&|/l&>(Check boxes to enable notifications to the listed recipients)</&></i>
<br>
Index: ShowSummary
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/ShowSummary,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- ShowSummary 15 Oct 2005 09:33:53 -0000 1.4
+++ ShowSummary 3 Mar 2008 23:07:45 -0000 1.4.4.1
@@ -79,6 +79,9 @@
<& /Elements/TitleBoxEnd &>
<BR>
+
+ <& /Elements/Callback, %ARGS, _CallbackName => 'LeftColumn' &>
+
</TD>
<TD VALIGN=TOP WIDTH="50%" class="boxcontainer">
@@ -100,6 +103,7 @@
<& /Ticket/Elements/ShowRequestor, Ticket => $Ticket &>
+ <& /Elements/Callback, %ARGS, _CallbackName => 'RightColumn' &>
</TD>
</TR>
Index: ShowDates
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/html/Ticket/Elements/ShowDates,v
retrieving revision 1.1.1.5
retrieving revision 1.1.1.5.4.1
diff -u -d -r1.1.1.5 -r1.1.1.5.4.1
--- ShowDates 15 Oct 2005 09:09:59 -0000 1.1.1.5
+++ ShowDates 3 Mar 2008 23:07:45 -0000 1.1.1.5.4.1
@@ -45,36 +45,36 @@
%# END BPS TAGGED BLOCK }}}
<TABLE>
<TR>
- <TD class="label"><&|/l&>Created</&>:</TD>
- <TD class="value"><% $Ticket->CreatedObj->AsString %></TD>
+ <TD class="label date created"><&|/l&>Created</&>:</TD>
+ <TD class="value date created"><% $Ticket->CreatedObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><&|/l&>Starts</&>:</TD>
- <TD class="value"><% $Ticket->StartsObj->AsString %></TD>
+ <TD class="label date starts"><&|/l&>Starts</&>:</TD>
+ <TD class="value date starts"><% $Ticket->StartsObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><&|/l&>Started</&>:</TD>
- <TD class="value"><% $Ticket->StartedObj->AsString %></TD>
+ <TD class="label date started"><&|/l&>Started</&>:</TD>
+ <TD class="value date started"><% $Ticket->StartedObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><a href="<%$RT::WebPath%>/Ticket/Display.html?id=<%$Ticket->id%>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
- <TD class="value"><% $Ticket->ToldObj->AsString %></TD>
+ <TD class="label date told"><a href="<% $RT::WebPath %>/Ticket/Display.html?id=<% $Ticket->id %>&Action=SetTold"><&|/l&>Last Contact</&></a>:</TD>
+ <TD class="value date told"><% $Ticket->ToldObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><&|/l&>Due</&>:</TD>
- <TD class="value"><% $Ticket->DueObj->AsString %></TD>
+ <TD class="label date due"><&|/l&>Due</&>:</TD>
+ <TD class="value date due"><% $Ticket->DueObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><&|/l&>Closed</&>:</TD>
- <TD class="value"><% $Ticket->ResolvedObj->AsString %></TD>
+ <TD class="label date resolved"><&|/l&>Closed</&>:</TD>
+ <TD class="value date resolved"><% $Ticket->ResolvedObj->AsString %></TD>
</TR>
<TR>
- <TD class="label"><&|/l&>Updated</&>:</TD>
-% my $UpdatedString = $Ticket->LastUpdated ? (loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name)) : loc("Never");
+ <TD class="label date updated"><&|/l&>Updated</&>:</TD>
+% my $UpdatedString = $Ticket->LastUpdated ? loc("[_1] by [_2]", $Ticket->LastUpdatedAsString, $Ticket->LastUpdatedByObj->Name) : loc("Never");
% if ($UpdatedLink) {
- <TD class="value"><A HREF="#lasttrans"><% $UpdatedString | h %></a></TD>
+ <TD class="value date updated"><A HREF="#lasttrans"><% $UpdatedString | h %></a></TD>
% } else {
- <TD class="value"><% $UpdatedString | h %></TD>
+ <TD class="value date updated"><% $UpdatedString | h %></TD>
% }
</TR>
</TABLE>
More information about the freeside-commits
mailing list