[Rt-commit] [svn] r1613 - in rt/branches/3.2-SYBASE-TESTING: . bin
html html/Elements html/Search html/Ticket
html/Ticket/Elements lib/RT lib/RT/Interface
jesse at pallas.eruditorum.org
jesse at pallas.eruditorum.org
Mon Oct 4 15:59:56 EDT 2004
Author: jesse
Date: Mon Oct 4 15:59:55 2004
New Revision: 1613
Modified:
rt/branches/3.2-SYBASE-TESTING/ (props changed)
rt/branches/3.2-SYBASE-TESTING/bin/rt-crontool.in
rt/branches/3.2-SYBASE-TESTING/bin/rt-mailgate.in
rt/branches/3.2-SYBASE-TESTING/bin/rt.in
rt/branches/3.2-SYBASE-TESTING/html/Elements/Header
rt/branches/3.2-SYBASE-TESTING/html/Search/Bulk.html
rt/branches/3.2-SYBASE-TESTING/html/Ticket/Display.html
rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowAttachments
rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowHistory
rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowTransaction
rt/branches/3.2-SYBASE-TESTING/html/index.html
rt/branches/3.2-SYBASE-TESTING/lib/RT/Interface/Email.pm
rt/branches/3.2-SYBASE-TESTING/lib/RT/Ticket_Overlay.pm
Log:
r10337 at tinbook: jesse | 2004-09-23T07:47:24.110790Z
r8454 at Jesse-Vincents-Computer: jesse | 2004-08-28T23:42:12.276700Z
Modified: rt/branches/3.2-SYBASE-TESTING/bin/rt-crontool.in
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/bin/rt-crontool.in (original)
+++ rt/branches/3.2-SYBASE-TESTING/bin/rt-crontool.in Mon Oct 4 15:59:55 2004
@@ -224,19 +224,17 @@
)
. "\n\n";
- print " bin/rt-cron-tool \\\n";
- print
- " --search RT::Search::ActiveTicketsInQueue --search-arg general \\\n";
- print
- " --condition RT::Condition::UntouchedInHours --condition-arg 4 \\\n";
+ print " bin/rt-crontool \\\n";
+ print " --search RT::Search::ActiveTicketsInQueue --search-arg general \\\n";
+ print " --condition RT::Condition::UntouchedInHours --condition-arg 4 \\\n";
print " --action RT::Action::SetPriority --action-arg 99 \\\n";
print " --verbose\n";
print "\n";
- print loc("Escalate tickets");
- print "rt-crontool \\\n";
- print " --search RT::Search::ActiveTicketsInQueue --search-arg thequeuename \\\n";
- print " --action RT::Action::EscalatePriority \\\n";
+ print loc("Escalate tickets"). "\n";
+ print " bin/rt-crontool \\\n";
+ print " --search RT::Search::ActiveTicketsInQueue --search-arg general \\\n";
+ print " --action RT::Action::EscalatePriority\n";
Modified: rt/branches/3.2-SYBASE-TESTING/bin/rt-mailgate.in
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/bin/rt-mailgate.in (original)
+++ rt/branches/3.2-SYBASE-TESTING/bin/rt-mailgate.in Mon Oct 4 15:59:55 2004
@@ -458,6 +458,10 @@
# Read the message in from STDIN
$args{'message'} = <>;
+unless ( $args{message} =~ /\S/ ) {
+ print STDERR "$0: no message passed on STDIN!\n";
+ exit 0;
+}
if ($opts{'extension'}) {
$args{$opts{'extension'}} = $ENV{'EXTENSION'};
Modified: rt/branches/3.2-SYBASE-TESTING/bin/rt.in
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/bin/rt.in (original)
+++ rt/branches/3.2-SYBASE-TESTING/bin/rt.in Mon Oct 4 15:59:55 2004
@@ -1172,6 +1172,7 @@
sub parse_config_file {
my %cfg;
my ($file) = @_;
+ local $_; # $_ may be aliased to a constant, from line 1163
open(CFG, $file) && do {
while (<CFG>) {
Modified: rt/branches/3.2-SYBASE-TESTING/html/Elements/Header
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/Elements/Header (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/Elements/Header Mon Oct 4 15:59:55 2004
@@ -66,6 +66,7 @@
}
}
</script>
+<& /Elements/Callback, _CallbackName => 'Head', %ARGS &>
</HEAD>
<BODY BGCOLOR="<%$BgColor%>"
% if ($Focus) {
Modified: rt/branches/3.2-SYBASE-TESTING/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/Search/Bulk.html (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/Search/Bulk.html Mon Oct 4 15:59:55 2004
@@ -168,9 +168,7 @@
% if ($cf->Queue == 0) {
% $pref = "[Global]";
% } else {
-% my $queue = RT::Queue->new($session{'CurrentUser'});
-% $queue->Load($cf->Queue);
-% $pref = "[Queue: " . $queue->Name . "]";
+% $pref = "[Queue: " . $cfqnames{$_} . "]";
% }
<%$pref%> <b><% $cf->Name %></b><br>
<% $cf->FriendlyType %>
@@ -216,17 +214,20 @@
Abort(loc("No search to operate on.")) unless ($Tickets);
my %allcfs;
+my %cfqnames;
my %cfqs;
my $count = 0;
while (my $Ticket = $Tickets->Next) {
my $cfq = $Ticket->QueueObj;
+ my $cfqid = $cfq->Id;
my $cfqn = $cfq->Name;
- if (!$cfqs{$cfqn}) {
- $cfqs{$cfqn} = 1;
+ unless ( exists $cfqs{$cfqid} ) {
+ $cfqs{$cfqid} = 1;
$count++;
my $cfs = $cfq->CustomFields;
while (my $cf = $cfs->Next) {
$allcfs{$cf->Id} = $cf;
+ $cfqnames{$cf->Id} = $cfqn;
}
}
}
Modified: rt/branches/3.2-SYBASE-TESTING/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/Ticket/Display.html (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/Ticket/Display.html Mon Oct 4 15:59:55 2004
@@ -79,6 +79,9 @@
</%ARGS>
<%INIT>
+
+$m->comp('/Elements/Callback', _CallbackName => 'Initial', TicketObj => $TicketObj, ARGSRef => \%ARGS);
+
my ($linkid, $message, $tid, @Actions, $Tickets);
unless ($id || $TicketObj) {
Modified: rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowAttachments
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowAttachments (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowAttachments Mon Oct 4 15:59:55 2004
@@ -50,7 +50,6 @@
color => "#336699" &>
% foreach my $key (keys %documents) {
-% my $fontsize='size="-2"';
<%$key%><br>
<ul>
@@ -69,13 +68,12 @@
</%PERL>
-<li><font <%$fontsize | n%>>
+<li><font size="-2">
<A HREF="<%$RT::WebPath%>/Ticket/Attachment/<%$rev->TransactionId%>/<%$rev->Id%>/<%$rev->Filename | u%>">
<&|/l, $rev->CreatedAsString, $size, $rev->CreatorObj->Name &>[_1] ([_2]) by [_3]</&>
</a>
</font></li>
% }
-% $fontsize='size="-2"';
% }
</ul>
Modified: rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowHistory
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowHistory (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowHistory Mon Oct 4 15:59:55 2004
@@ -95,8 +95,6 @@
next if $skip;
$i++;
- $m->out('<a name="lasttrans"></a>') if ( $Transactions->IsLast );
-
my @trans_attachments = grep { $_->TransactionId == $Transaction->Id } @attachments;
my $trans_content = {};
@@ -116,7 +114,8 @@
RowNum => $i,
ShowTitleBarCommands => $ShowTitleBarCommands,
Attachments => \@trans_attachments,
- AttachmentContent => $trans_content
+ AttachmentContent => $trans_content,
+ LastTransaction => $Transactions->IsLast
);
}
Modified: rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowTransaction
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowTransaction (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/Ticket/Elements/ShowTransaction Mon Oct 4 15:59:55 2004
@@ -45,7 +45,7 @@
%# }}} END BPS TAGGED BLOCK
<TR class="<% $RowNum%2 ? 'oddline' : 'evenline'%>" >
-<TD rowspan="2" valign="top" bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="#txn-<%$Transaction->Id%>">#</A> </TD>
+<TD rowspan="2" valign="top" bgcolor="<%$bgcolor%>"><A NAME="txn-<%$Transaction->Id%>" href="#txn-<%$Transaction->Id%>">#</A><% $LastTransaction ? '<a name="lasttrans"> </a>' : ' ' |n %></TD>
<TD>  </TD>
<TD><font size=-2><% $transdate|n %></font> </TD>
% my $desc = $Transaction->BriefDescription;
@@ -74,6 +74,7 @@
$Attachments => undef
$AttachmentContent => undef
$ShowBody => 1
+$LastTransaction => 0
</%ARGS>
<%INIT>
@@ -155,7 +156,8 @@
}
if ( $Attachments->[0] && $ShowTitleBarCommands ) {
- if ( $Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket') ) {
+ if ( $Transaction->TicketObj->CurrentUserHasRight('ReplyToTicket')
+ or $Transaction->TicketObj->CurrentUserHasRight('ModifyTicket')) {
$titlebar_commands .=
"[<a href=\"".$UpdatePath."?id="
. $Transaction->Ticket
@@ -165,7 +167,8 @@
. loc('Reply')
. "</a>] ";
}
- if ( $Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket') ) {
+ if ( $Transaction->TicketObj->CurrentUserHasRight('CommentOnTicket')
+ or $Transaction->TicketObj->CurrentUserHasRight('ModifyTicket')) {
$titlebar_commands .=
"[<a href=\"".$UpdatePath."?id="
. $Transaction->Ticket
Modified: rt/branches/3.2-SYBASE-TESTING/html/index.html
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/html/index.html (original)
+++ rt/branches/3.2-SYBASE-TESTING/html/index.html Mon Oct 4 15:59:55 2004
@@ -87,7 +87,7 @@
<TD class="boxcontainer">
<& /Elements/Quicksearch &>
<BR>
-<form method=get action="index.html">
+<form method=get action="<%$RT::WebPath%>/index.html">
<& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session {'home_refresh_interval'} &>
<div align=right><input type=submit value="<&|/l&>Go!</&>"></div>
</form>
Modified: rt/branches/3.2-SYBASE-TESTING/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/lib/RT/Interface/Email.pm (original)
+++ rt/branches/3.2-SYBASE-TESTING/lib/RT/Interface/Email.pm Mon Oct 4 15:59:55 2004
@@ -623,10 +623,10 @@
Explanation => "RT thinks this message may be a bounce",
MIMEObj => $Message
);
-
- #Do we actually want to store it?
- return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
}
+
+ #Do we actually want to store it?
+ return ( 0, "Message Bounced", undef ) unless ($RT::StoreLoops);
}
# }}}
Modified: rt/branches/3.2-SYBASE-TESTING/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.2-SYBASE-TESTING/lib/RT/Ticket_Overlay.pm (original)
+++ rt/branches/3.2-SYBASE-TESTING/lib/RT/Ticket_Overlay.pm Mon Oct 4 15:59:55 2004
@@ -306,6 +306,7 @@
Type -- The ticket\'s type. ignore this for now
Owner -- This ticket\'s owner. either an RT::User object or this user\'s id
Subject -- A string describing the subject of the ticket
+ Priority -- an integer from 0 to 99
InitialPriority -- an integer from 0 to 99
FinalPriority -- an integer from 0 to 99
Status -- any valid status (Defined in RT::Queue)
@@ -2792,6 +2793,10 @@
}
+ # Update time fields
+ $NewTicket->SetTimeEstimated(($NewTicket->TimeEstimated || 0) + ($self->TimeEstimated || 0));
+ $NewTicket->SetTimeWorked( ($NewTicket->TimeWorked || 0) + ($self->TimeWorked || 0));
+ $NewTicket->SetTimeLeft( ($NewTicket->TimeLeft || 0) + ($self->TimeLeft || 0));
#add all of this ticket's watchers to that ticket.
my $requestors = $self->Requestors->MembersObj;
More information about the Rt-commit
mailing list