[Rt-commit] r4105 - in rtir/branches/1.9-EXPERIMENTAL: . html/RTIR
html/RTIR/Elements html/RTIR/Incident html/RTIR/Search
html/RTIR/Search/Elements html/RTIR/Tools html/RTIR/Tools/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Tue Nov 15 23:43:13 EST 2005
Author: ruz
Date: Tue Nov 15 23:43:11 2005
New Revision: 4105
Modified:
rtir/branches/1.9-EXPERIMENTAL/ (props changed)
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ProcessQuery
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Refine.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Split.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Elements/MakeClicky
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
Log:
r281 at cubic-pc: cubic | 2005-11-16 07:46:07 +0300
r272 at cubic-pc: cubic | 2005-11-16 06:08:46 +0300
* get rid of unused variables
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html Tue Nov 15 23:43:11 2005
@@ -383,8 +383,6 @@
}
}
-my $CFs = $QueueObj->CustomFields();
-
# {{{ deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html Tue Nov 15 23:43:11 2005
@@ -217,7 +217,7 @@
if ($ARGS{'Action'} && $ARGS{'Action'} =~ /^(Steal|Kill|Take|SetTold)$/) {
my $action = $1;
- my ($res, $msg)=$Ticket->$action();
+ my (undef, $msg) = $Ticket->$action();
push(@results, $msg);
}
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html Tue Nov 15 23:43:11 2005
@@ -185,7 +185,7 @@
<%INIT>
my $Ticket = LoadTicket($id);
-my ($Type, undef) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
+my ($Type) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
my $name;
if ($Type eq 'Report') {
@@ -235,10 +235,6 @@
Abort("No permission to view ticket");
}
-#It's hard to do this inline, so we'll preload the html of the selectstatus in here.
-my $SelectStatus = $m->scomp("/Elements/SelectStatus", Name => 'Status', Default=> $Ticket->Status);
-my $SelectQueue = $m->scomp("/Elements/SelectQueue", Name => 'Queue', Default =>$Ticket->QueueObj->Id);
-
my $Title = loc("Edit [_1] #[_2]: [_3]", $name, $Ticket->Id, $Ticket->Subject);
</%INIT>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/ChildSummary Tue Nov 15 23:43:11 2005
@@ -34,7 +34,7 @@
%while (my $Ticket = $session{'tickets'}->Next) {
% next unless ($Ticket->QueueObj->Name eq $Queue);
% $i++;
-% my ($t, undef) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
+% my ($t) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
<TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >
<td><b><A HREF="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
<td><b><A HREF="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/IncidentSummary Tue Nov 15 23:43:11 2005
@@ -34,7 +34,7 @@
% foreach my $incident (sort keys %{$incidents}) {
% my $Ticket = $incidents->{$incident}->{'Ticket'};
% $i++;
-% my ($t, undef) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
+% my ($t) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
<TR class="<% $i%2 ? 'oddline' : 'evenline'%>" >
<td><b><A HREF="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Id%></a></b></td>
<td><b><A HREF="<%$RT::WebPath%>/RTIR/Display.html?id=<%$Ticket->Id%>"><%$Ticket->Subject%></a></b></td>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs Tue Nov 15 23:43:11 2005
@@ -40,7 +40,7 @@
Carp::cluck("queue string had leading &");
}
-my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Queue => $QueueName);
+my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => $QueueName);
my $EscapedQueueName = $m->comp('/Elements/QueryString', Queue => $QueueName );
@@ -222,7 +222,7 @@
}
elsif ( $Type eq 'Incident' && $Ticket && $Ticket->QueueObj->Name ne 'Incidents') {
my $childq = $Ticket->QueueObj->Name;
- my ($childtype, undef) = $m->comp('/RTIR/Elements/Type', Queue => $childq);
+ my ($childtype) = $m->comp('/RTIR/Elements/Type', Queue => $childq);
$tabs->{'h'} = { title => loc( 'Link [_1] #[_2]', $childtype, $Ticket->Id ),
path => "RTIR/Incident/LinkToIncident.html?id=". $Ticket->Id,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/BulkAbandon.html Tue Nov 15 23:43:11 2005
@@ -91,7 +91,6 @@
if ( $ARGS{'BulkAbandon'} ) {
my @tempresults;
- my @incidents;
foreach my $id ( @SelectedTickets ) {
$m->out('<!-- Processing <%$t->id%> -->'); $m->flush_buffer;
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html Tue Nov 15 23:43:11 2005
@@ -50,8 +50,7 @@
<& /Widgets/TitleBoxStart, contentbg => "#cccccc", title => $Title &>
<TABLE border=0 cellpadding=0 cellspacing=2>
% if ($link) {
-% my ($Type, undef) = $m->comp("/RTIR/Elements/Type", Ticket => $link->Id);
-% $Type =~ s/\s*$//;
+% my ($Type) = $m->comp("/RTIR/Elements/Type", Ticket => $link->Id);
<TR>
<TD class="label"><%$label%>:</TD>
<TD><% loc("[_1] #[_2]: [_3]", $Type, $link->Id, $link->Subject) %></TD>
@@ -187,7 +186,6 @@
my $QueueObj = new RT::Queue($session{'CurrentUser'});
$QueueObj->Load("Incidents") || Abort(loc("Queue could not be loaded."));
-my $CFs = $QueueObj->CustomFields();
my $TicketObj = $ARGS{TicketObj};
# {{{ deal with deleting uploaded attachments
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html Tue Nov 15 23:43:11 2005
@@ -219,7 +219,7 @@
my $Target = shift;
my @linkresults;
- my ($Type, undef) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
+ my ($Type) = $m->comp("/RTIR/Elements/Type", Ticket => $Ticket->Id);
$ARGS{$Ticket->Id.'-MemberOf'} = $Target->Id;
# Blocks can have multiple incidents
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkChildren.html Tue Nov 15 23:43:11 2005
@@ -58,9 +58,7 @@
my $TicketObj = new RT::Ticket($session{'CurrentUser'});
$TicketObj->Load($id);
-my ($Type, @states) = $m->comp('/RTIR/Elements/Type', Queue => $Queue);
-
-my ($LinkType, @linkstates) = $m->comp('/RTIR/Elements/Type', Queue => $Queue);
+my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => $Queue);
my ($title, $ticketcount);
$session{'i'}++;
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/LinkToIncident.html Tue Nov 15 23:43:11 2005
@@ -59,7 +59,7 @@
<%INIT>
$Format = $RT::RTIRSearchResultFormats->{'LinkIncident'};
-my ($Type, undef) = $m->comp('/RTIR/Elements/Type', Queue => 'Incidents');
+my ($Type) = $m->comp('/RTIR/Elements/Type', Queue => 'Incidents');
my $ChildObj = LoadTicket($id);
my $Queue = $ChildObj->QueueObj->Name;
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Merge.html Tue Nov 15 23:43:11 2005
@@ -69,7 +69,7 @@
my $Ticket = LoadTicket($id);
my $Queue = $Ticket->QueueObj->Name;
-my ($Type, @states) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
+my ($Type) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
my $merge = $ARGS{'SelectedTicket'};
my ($MergeTicket, @results);
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ProcessQuery
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ProcessQuery (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Elements/ProcessQuery Tue Nov 15 23:43:11 2005
@@ -2,7 +2,6 @@
use Tree::Simple;
my $search;
-my $title = loc("Query Builder");
# {{{ Clear out unwanted data
if ($NewQuery or $ARGS{'Delete'}) {
@@ -454,8 +453,6 @@
}
# State Machine:
- my $parentdepth = $depth;
-
# Parens are highest priority
if ( $current & PAREN ) {
if ( $val eq "(" ) {
@@ -606,7 +603,7 @@
}
if ($container_object->id ) {
- # If we got one or the other, add the saerch
+ # If we got one or the other, add the search
my ( $search_id, $search_msg ) = $container_object->AddAttribute(
Name => 'SavedSearch',
Description => $Description,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Refine.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Refine.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Refine.html Tue Nov 15 23:43:11 2005
@@ -139,8 +139,6 @@
id => $id,
%ARGS);
-my ($Type, @states) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
-
# {{{ Build a querystring for the tabs
$QueryString = $m->comp('/Elements/QueryString',
Query => $Query,
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Search/Results.html Tue Nov 15 23:43:11 2005
@@ -66,7 +66,7 @@
&>
<%INIT>
-my ($Type, undef) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
+my ($Type) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
$Format ||= $RT::RTIRSearchResultFormats->{$Type . 'Default'};
my $title = loc("Results");
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Split.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Split.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Split.html Tue Nov 15 23:43:11 2005
@@ -40,7 +40,7 @@
<%INIT>
my $TicketObj = LoadTicket($Ticket);
-my ($Type, undef) = $m->comp('Elements/Type', Ticket => $TicketObj->Id);
+my ($Type) = $m->comp('Elements/Type', Ticket => $TicketObj->Id);
my $Incident;
if ($Type ne 'Incident') {
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Elements/MakeClicky
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Elements/MakeClicky (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Elements/MakeClicky Tue Nov 15 23:43:11 2005
@@ -1,7 +1,7 @@
<%$Value|n%>
<%init>
use Regexp::Common 'RE_ALL';
-my $domain_pat = $RE{net}{domain}{-keep};
+my $domain_pat = $RE{net}{domain}{-keep}; # XXX: why don't we this?
$Value =~ s/(\s|^)([A-Z]([A-Z0-9]+)(?:-[A-Z]+)?-([A-Z]+))($|\s)/$1$2 [Handle: <a href="Lookup.html?server=$server&q=$2">$2<\/a>]\n/gxi;;
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/Lookup.html Tue Nov 15 23:43:11 2005
@@ -242,7 +242,7 @@
$current_subtab = 'RTIR/Tools/Lookup.html?q='.$q."&server=".$server;
my ( $val, $msg ) =
$session{'tickets'}->FromSQL(
- "( ContentType = 'text/plain' "
+ "( ContentType = 'text/plain' "
. "OR ContentType = 'text' "
. "OR ContentType = 'text/html' )"
. " AND Content LIKE '$q' "
@@ -250,8 +250,9 @@
. $now->ISO
. "'" );
+ $RT::Logger->warning( $msg ) unless $val;
}
-
+
if ($ticket) {
($TicketType, undef) = $m->comp("/RTIR/Elements/Type", Ticket => $ticket);
$TicketObj = LoadTicket($ticket);
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Tools/ScriptedAction.html Tue Nov 15 23:43:11 2005
@@ -40,7 +40,7 @@
<INPUT TYPE=HIDDEN NAME=id Value="new">
<INPUT TYPE=HIDDEN NAME=Status Value="<%$ARGS{Status}||'open'%>">
<A NAME="top">
-
+
% if (exists $ARGS{'TestAddresses'}) {
<& /Widgets/TitleBoxStart, contentbg => "#cccccc",
title => 'Address test results' &>
@@ -242,19 +242,19 @@
}
# Load the Incidents Queue
-my $incidentq = new RT::Queue($session{'CurrentUser'});
+my $incidentq = new RT::Queue($session{'CurrentUser'});
unless ($incidentq->Load('Incidents')) {
Abort('Queue not found');
}
# Load the Investigations Queue
-my $investigationq = new RT::Queue($session{'CurrentUser'});
+my $investigationq = new RT::Queue($session{'CurrentUser'});
unless ($investigationq->Load('Investigations')) {
Abort('Queue not found');
}
# Load the Incident Reports Queue
-my $reportq = new RT::Queue($session{'CurrentUser'});
+my $reportq = new RT::Queue($session{'CurrentUser'});
unless ($reportq->Load('Incident Reports')) {
Abort('Queue not found');
}
@@ -321,13 +321,13 @@
# {{{ deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ delete $session{'Attachments'}{$1};
}
$session{'Attachments'} = { %{$session{'Attachments'} || {}} };
}
# {{{ store the uploaded attachment in session
- if ($ARGS{'Attach'}) { # attachment?
+ if ($ARGS{'Attach'}) { # attachment?
$session{'Attachments'} = {} unless defined $session{'Attachments'};
# strip leading directories
@@ -340,7 +340,7 @@
AttachmentFieldName => 'Attach'
);
$session{'Attachments'} = { %{$session{'Attachments'} || {}},
- $ARGS{'Attach'} => $attachment };
+ $ARGS{'Attach'} => $attachment };
}
# }}}
@@ -361,13 +361,13 @@
if ($addr ne loc("ADDRESS_UNKNOWN")) {
# create the Incident
unless ($incidentq->CurrentUserHasRight('CreateTicket')) {
- Abort('You have no permission to create tickets in that queue.');
+ Abort('You have no permission to create tickets in that queue.');
}
$ARGS{'Queue'} = $incidentq->Id;
if (!$Incident) {
($Incident, @IncidentActions) =
- CreateTicket(Attachments => $session{'Attachments'}, %ARGS);
+ CreateTicket(Attachments => $session{'Attachments'}, %ARGS);
unless ($Incident->CurrentUserHasRight('ShowTicket')) {
Abort("No permission to view newly created ticket #".$Incident->id.".");
}
@@ -376,7 +376,7 @@
# create the linked investigation
unless ($investigationq->CurrentUserHasRight('CreateTicket')) {
- Abort('You have no permission to create tickets in that queue.');
+ Abort('You have no permission to create tickets in that queue.');
}
$ARGS{'new-MemberOf'} = $Incident->Id;
$ARGS{'Queue'} = $investigationq->Id;
@@ -397,7 +397,7 @@
# find the Create transaction, so we can pass it to the template
my $transaction;
while ($transaction = $Ticket->Transactions->Next) {
- last if ($transaction->Type eq 'Create');
+ last if ($transaction->Type eq 'Create');
}
# if the template's argument contains _ADDR_ or _IP_
@@ -409,16 +409,17 @@
# load the selected template
my $TemplateObj = new RT::Template($session{'CurrentUser'});
$TemplateObj->Load($ARGS{'Template'});
+ # XXX: why don't we handle return values?
my ( $result, $message ) = $TemplateObj->Parse(
Argument => $arg,
TicketObj => $Ticket,
- TransactionObj => $transaction,
+ TransactionObj => $transaction,
);
# add the template's MIMEObj to the Attachments list
$session{'Attachments'} = { _Body => $TemplateObj->MIMEObj,
- %{$session{'Attachments'} || {}} };
+ %{$session{'Attachments'} || {}} };
# the content will be part of the template, if desired
$ARGS{'UpdateContent'} = " ";
@@ -433,7 +434,7 @@
# create an unlinked incident report
unless ($reportq->CurrentUserHasRight('CreateTicket')) {
- Abort('You have no permission to create tickets in that queue.');
+ Abort('You have no permission to create tickets in that queue.');
}
$ARGS{'Queue'} = $reportq->Id;
# Create the investigation without attachments, and send them later
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html Tue Nov 15 23:43:11 2005
@@ -105,7 +105,7 @@
my $title;
my $Ticket = LoadTicket($id);
-my ($Type, undef) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
+my ($Type) = $m->comp('Elements/Type', Ticket => $Ticket->Id);
my $name;
if ($Type eq 'Report') {
More information about the Rt-commit
mailing list