[Rt-commit] rt branch, 4.4/limitcf-number, created. rt-4.2.10-109-g0562708
Alex Vandiver
alexmv at bestpractical.com
Thu Mar 12 18:03:23 EDT 2015
The branch, 4.4/limitcf-number has been created
at 05627081f47aafae3ea3d74ac085209b464514e3 (commit)
- Log -----------------------------------------------------------------
commit 8ff2029628a4a3af31454eafe1b6353ce0f87ef6
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Wed Apr 23 14:37:14 2014 -0400
Remove the unused DESCRIPTION argument
It is unused in LimitField, and shoddily and inconsistently localized.
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index c641cd2..deb547d 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1414,7 +1414,7 @@ sub Limit {
=head2 LimitField
-Takes a paramhash with the fields FIELD, OPERATOR, VALUE and DESCRIPTION
+Takes a paramhash with the fields FIELD, OPERATOR, and VALUE
Generally best called from LimitFoo methods
=cut
@@ -1425,15 +1425,8 @@ sub LimitField {
FIELD => undef,
OPERATOR => '=',
VALUE => undef,
- DESCRIPTION => undef,
@_
);
- $args{'DESCRIPTION'} = $self->loc(
- "[_1] [_2] [_3]", $args{'FIELD'},
- $args{'OPERATOR'}, $args{'VALUE'}
- )
- if ( !defined $args{'DESCRIPTION'} );
-
if ($self->_isLimited > 1) {
RT->Deprecated( Message => "Mixing old-style LimitFoo methods with Limit is deprecated" );
@@ -1487,9 +1480,6 @@ sub LimitQueue {
FIELD => 'Queue',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join(
- ' ', $self->loc('Queue'), $args{'OPERATOR'}, $args{'VALUE'},
- ),
);
}
@@ -1519,9 +1509,6 @@ sub LimitStatus {
FIELD => 'Status',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Status'), $args{'OPERATOR'},
- $self->loc( $args{'VALUE'} ) ),
);
}
@@ -1605,8 +1592,6 @@ sub LimitType {
FIELD => 'Type',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Type'), $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1629,8 +1614,6 @@ sub LimitSubject {
FIELD => 'Subject',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Subject'), $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1658,8 +1641,6 @@ sub LimitId {
FIELD => 'id',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION =>
- join( ' ', $self->loc('Id'), $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1680,9 +1661,6 @@ sub LimitPriority {
FIELD => 'Priority',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Priority'),
- $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1704,9 +1682,6 @@ sub LimitInitialPriority {
FIELD => 'InitialPriority',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Initial Priority'), $args{'OPERATOR'},
- $args{'VALUE'}, ),
);
}
@@ -1727,9 +1702,6 @@ sub LimitFinalPriority {
FIELD => 'FinalPriority',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Final Priority'), $args{'OPERATOR'},
- $args{'VALUE'}, ),
);
}
@@ -1750,9 +1722,6 @@ sub LimitTimeWorked {
FIELD => 'TimeWorked',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Time Worked'),
- $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1773,9 +1742,6 @@ sub LimitTimeLeft {
FIELD => 'TimeLeft',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Time Left'),
- $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1798,9 +1764,6 @@ sub LimitContent {
FIELD => 'Content',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Ticket content'), $args{'OPERATOR'},
- $args{'VALUE'}, ),
);
}
@@ -1821,9 +1784,6 @@ sub LimitFilename {
FIELD => 'Filename',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Attachment filename'), $args{'OPERATOR'},
- $args{'VALUE'}, ),
);
}
@@ -1843,9 +1803,6 @@ sub LimitContentType {
FIELD => 'ContentType',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Ticket content type'), $args{'OPERATOR'},
- $args{'VALUE'}, ),
);
}
@@ -1876,8 +1833,6 @@ sub LimitOwner {
FIELD => 'Owner',
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
- DESCRIPTION => join( ' ',
- $self->loc('Owner'), $args{'OPERATOR'}, $owner->Name(), ),
);
}
@@ -1918,9 +1873,6 @@ sub LimitWatcher {
VALUE => $args{'VALUE'},
OPERATOR => $args{'OPERATOR'},
TYPE => $args{'TYPE'},
- DESCRIPTION => join( ' ',
- $self->loc($watcher_type),
- $args{'OPERATOR'}, $args{'VALUE'}, ),
);
}
@@ -1954,11 +1906,6 @@ sub LimitLinkedTo {
BASE => undef,
TARGET => $args{'TARGET'},
TYPE => $args{'TYPE'},
- DESCRIPTION => $self->loc(
- "Tickets [_1] by [_2]",
- $self->loc( $args{'TYPE'} ),
- $args{'TARGET'}
- ),
OPERATOR => $args{'OPERATOR'},
);
}
@@ -1997,11 +1944,6 @@ sub LimitLinkedFrom {
TARGET => undef,
BASE => $args{'BASE'},
TYPE => $type,
- DESCRIPTION => $self->loc(
- "Tickets [_1] [_2]",
- $self->loc( $args{'TYPE'} ),
- $args{'BASE'},
- ),
OPERATOR => $args{'OPERATOR'},
);
}
@@ -2107,13 +2049,6 @@ sub LimitDate {
@_
);
- #Set the description if we didn't get handed it above
- unless ( $args{'DESCRIPTION'} ) {
- $args{'DESCRIPTION'} = $args{'FIELD'} . " "
- . $args{'OPERATOR'} . " "
- . $args{'VALUE'} . " GMT";
- }
-
$self->LimitField(%args);
}
@@ -2178,18 +2113,7 @@ sub LimitTransactionDate {
@_
);
- # <20021217042756.GK28744 at pallas.fsck.com>
- # "Kill It" - Jesse.
-
- #Set the description if we didn't get handed it above
- unless ( $args{'DESCRIPTION'} ) {
- $args{'DESCRIPTION'} = $args{'FIELD'} . " "
- . $args{'OPERATOR'} . " "
- . $args{'VALUE'} . " GMT";
- }
-
$self->LimitField(%args);
-
}
@@ -2217,7 +2141,6 @@ sub LimitCustomField {
VALUE => undef,
CUSTOMFIELD => undef,
OPERATOR => '=',
- DESCRIPTION => undef,
FIELD => 'CustomFieldValue',
QUOTEVALUE => 1,
@_
@@ -2236,22 +2159,6 @@ sub LimitCustomField {
$args{CUSTOMFIELD} = $CF->Id;
}
- #If we are looking to compare with a null value.
- if ( $args{'OPERATOR'} =~ /^is$/i ) {
- $args{'DESCRIPTION'}
- ||= $self->loc( "Custom field [_1] has no value.", $CF->Name );
- }
- elsif ( $args{'OPERATOR'} =~ /^is not$/i ) {
- $args{'DESCRIPTION'}
- ||= $self->loc( "Custom field [_1] has a value.", $CF->Name );
- }
-
- # if we're not looking to compare with a null value
- else {
- $args{'DESCRIPTION'} ||= $self->loc( "Custom field [_1] [_2] [_3]",
- $CF->Name, $args{OPERATOR}, $args{VALUE} );
- }
-
if ( defined $args{'QUEUE'} && $args{'QUEUE'} =~ /\D/ ) {
my $QueueObj = RT::Queue->new( $self->CurrentUser );
$QueueObj->Load( $args{'QUEUE'} );
commit 05627081f47aafae3ea3d74ac085209b464514e3
Author: Alex Vandiver <alexmv at bestpractical.com>
Date: Wed Apr 23 14:39:45 2014 -0400
Leave all CF determination logic to _CustomFieldDecipher
Previously, passing CUSTOMFIELD => 17 would result in TicketSQL
containing CF.{NameOfCF17}, which is extremely unhelpful in the case
where a number was intentionally passed soas to avoid edge cases with
duplicate CF names. As _CustomFieldDecipher has a better variant of CF
name resolution, simply pass CUSTOMFIELD through unmolested; the only
functionality lost is the auto-defaulting of ENTRYAGGREGATOR based on CF
type.
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index deb547d..75ff2b8 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -2125,11 +2125,18 @@ Takes a paramhash of key/value pairs with the following keys:
=over 4
-=item CUSTOMFIELD - CustomField name or id. If a name is passed, an additional parameter QUEUE may also be passed to distinguish the custom field.
+=item CUSTOMFIELD
-=item OPERATOR - The usual Limit operators
+CustomField name or id. If a name is passed, an additional parameter
+QUEUE may also be passed to distinguish the custom field.
-=item VALUE - The value to compare against
+=item OPERATOR
+
+The usual Limit operators
+
+=item VALUE
+
+The value to compare against
=back
@@ -2141,43 +2148,18 @@ sub LimitCustomField {
VALUE => undef,
CUSTOMFIELD => undef,
OPERATOR => '=',
- FIELD => 'CustomFieldValue',
- QUOTEVALUE => 1,
+ QUEUE => undef,
+ ENTRYAGGREGATOR => undef,
@_
);
- my $CF = RT::CustomField->new( $self->CurrentUser );
- if ( $args{CUSTOMFIELD} =~ /^\d+$/ ) {
- $CF->Load( $args{CUSTOMFIELD} );
- }
- else {
- $CF->LoadByName(
- Name => $args{CUSTOMFIELD},
- LookupType => RT::Ticket->CustomFieldLookupType,
- ObjectId => $args{QUEUE},
- );
- $args{CUSTOMFIELD} = $CF->Id;
- }
-
- if ( defined $args{'QUEUE'} && $args{'QUEUE'} =~ /\D/ ) {
- my $QueueObj = RT::Queue->new( $self->CurrentUser );
- $QueueObj->Load( $args{'QUEUE'} );
- $args{'QUEUE'} = $QueueObj->Id;
- }
- delete $args{'QUEUE'} unless defined $args{'QUEUE'} && length $args{'QUEUE'};
-
- my @rest;
- @rest = ( ENTRYAGGREGATOR => 'AND' )
- if ( $CF->Type eq 'SelectMultiple' );
-
$self->LimitField(
VALUE => $args{VALUE},
- FIELD => "CF"
- .(defined $args{'QUEUE'}? ".$args{'QUEUE'}" : '' )
- .".{" . $CF->Name . "}",
+ FIELD => "CF" . ( defined $args{'QUEUE'}? ".$args{'QUEUE'}" : '' )
+ . ".{$args{CUSTOMFIELD}}",
OPERATOR => $args{OPERATOR},
CUSTOMFIELD => 1,
- @rest,
+ ENTRYAGGREGATOR => $args{ENTRYAGGREGATOR},
);
$self->{'RecalcTicketLimits'} = 1;
-----------------------------------------------------------------------
More information about the rt-commit
mailing list