[Rt-commit] rt branch, 4.6/remove-deprecated-code, created. rt-4.4.4-721-g57d7004916
? sunnavy
sunnavy at bestpractical.com
Thu Jan 23 17:37:29 EST 2020
The branch, 4.6/remove-deprecated-code has been created
at 57d700491642c486d30462402e4696b8cab50d24 (commit)
- Log -----------------------------------------------------------------
commit 57d700491642c486d30462402e4696b8cab50d24
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri Jan 24 06:25:33 2020 +0800
Remove deprecated code that was marked to be removed in 4.6
diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index b334f22ae3..d8abe7f279 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -4449,11 +4449,6 @@ sub SetObjectSessionCache {
CallbackPage => '/Elements/Quicksearch',
ARGSRef => \%args, Collection => $collection, ObjectType => $ObjectType );
- # This is included for continuity in the 4.2 series. It will be removed in 4.6.
- $HTML::Mason::Commands::m->callback( CallbackName => 'SQLFilter',
- CallbackPage => '/Elements/QueueSummaryByLifecycle', Queues => $collection )
- if $ObjectType eq "RT::Queue";
-
$session{$cache_key}{id} = {};
while (my $object = $collection->Next) {
diff --git a/lib/RT/Interface/Web/Request.pm b/lib/RT/Interface/Web/Request.pm
index 6826710c60..f20b5ca606 100644
--- a/lib/RT/Interface/Web/Request.pm
+++ b/lib/RT/Interface/Web/Request.pm
@@ -55,11 +55,7 @@ use HTML::Mason::PSGIHandler;
use base qw(HTML::Mason::Request::PSGI);
use Params::Validate qw(:all);
-my %deprecated = (
- '/Admin/CustomFields/Modify.html' => {
- 'AfterUpdateCustomFieldValue' => { Remove => '4.6' },
- },
-);
+my %deprecated = ();
sub new {
my $class = shift;
diff --git a/lib/RT/ObjectCustomFieldValues.pm b/lib/RT/ObjectCustomFieldValues.pm
index 1f617633cd..d60219403f 100644
--- a/lib/RT/ObjectCustomFieldValues.pm
+++ b/lib/RT/ObjectCustomFieldValues.pm
@@ -208,28 +208,6 @@ sub HasEntry {
}
}
-sub _DoSearch {
- my $self = shift;
-
- if ( exists $self->{'find_expired_rows'} ) {
- RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows', Remove => '4.6' );
- $self->{'find_disabled_rows'} = $self->{'find_expired_rows'};
- }
-
- return $self->SUPER::_DoSearch(@_);
-}
-
-sub _DoCount {
- my $self = shift;
-
- if ( exists $self->{'find_expired_rows'} ) {
- RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows', Remove => '4.6' );
- $self->{'find_disabled_rows'} = $self->{'find_expired_rows'};
- }
-
- return $self->SUPER::_DoCount(@_);
-}
-
RT::Base->_ImportOverlays();
# Clear the OCVF cache on exit to release connected RT::Ticket objects.
diff --git a/lib/RT/Queue.pm b/lib/RT/Queue.pm
index dc286a756b..469242aeed 100644
--- a/lib/RT/Queue.pm
+++ b/lib/RT/Queue.pm
@@ -1263,68 +1263,6 @@ sub SetSLA {
return ($status, $self->loc("Queue's default service level has been changed"));
}
-sub InitialPriority {
- my $self = shift;
- RT->Deprecated( Instead => "DefaultValue('InitialPriority')", Remove => '4.6' );
- return $self->DefaultValue('InitialPriority');
-}
-
-sub FinalPriority {
- my $self = shift;
- RT->Deprecated( Instead => "DefaultValue('FinalPriority')", Remove => '4.6' );
- return $self->DefaultValue('FinalPriority');
-}
-
-sub DefaultDueIn {
- my $self = shift;
- RT->Deprecated( Instead => "DefaultValue('Due')", Remove => '4.6' );
-
- # DefaultDueIn used to be a number of days; so if the DefaultValue is,
- # say, "3 days" then return 3
- my $due = $self->DefaultValue('Due');
- if (defined($due) && $due =~ /^(\d+) days?$/i) {
- return $1;
- }
-
- return $due;
-}
-
-sub SetInitialPriority {
- my $self = shift;
- my $value = shift;
- RT->Deprecated( Instead => "SetDefaultValue", Remove => '4.6' );
- return $self->SetDefaultValue(
- Name => 'InitialPriority',
- Value => $value,
- );
-}
-
-sub SetFinalPriority {
- my $self = shift;
- my $value = shift;
- RT->Deprecated( Instead => "SetDefaultValue", Remove => '4.6' );
- return $self->SetDefaultValue(
- Name => 'FinalPriority',
- Value => $value,
- );
-}
-
-sub SetDefaultDueIn {
- my $self = shift;
- my $value = shift;
-
- # DefaultDueIn used to be a number of days; so if we're setting to,
- # say, "3" then add the word "days" to match the way the new
- # DefaultValues works
- $value .= " days" if defined($value) && $value =~ /^\d+$/;
-
- RT->Deprecated( Instead => "SetDefaultValue", Remove => '4.6' );
- return $self->SetDefaultValue(
- Name => 'Due',
- Value => $value,
- );
-}
-
RT::Base->_ImportOverlays();
1;
diff --git a/lib/RT/SearchBuilder.pm b/lib/RT/SearchBuilder.pm
index 09a775ec36..27520e3508 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -916,13 +916,6 @@ sub Limit {
: $self->Table
;
- if ( $table and $ARGS{FIELD} and my $instead = $deprecated{ lc $table }{ lc $ARGS{'FIELD'} } ) {
- RT->Deprecated(
- Message => "$table.$ARGS{'FIELD'} column is deprecated",
- Instead => $instead, Remove => '4.6'
- );
- }
-
unless ( exists $ARGS{CASESENSITIVE} or (exists $ARGS{QUOTEVALUE} and not $ARGS{QUOTEVALUE}) ) {
if ( $ARGS{FIELD} and $ARGS{'OPERATOR'} !~ /IS/i
&& $table && $check_case_sensitivity{ lc $table }{ lc $ARGS{'FIELD'} }
diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index a2e3935710..ec9352a763 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -451,7 +451,6 @@ if ( $ARGS{'Update'} && $id ne 'new' ) {
my ($id, $msg) = $value->$mutator( $ARGS{$param} );
push (@results, $msg);
}
- $m->callback(CallbackName => 'AfterUpdateCustomFieldValue', CustomFieldObj => $CustomFieldObj, CustomFieldValueObj => $value, ARGSRef => \%ARGS );
}
}
diff --git a/share/html/Elements/Quicksearch b/share/html/Elements/Quicksearch
deleted file mode 100644
index 5dbfe9f193..0000000000
--- a/share/html/Elements/Quicksearch
+++ /dev/null
@@ -1,55 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC
-%# <sales at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work is distributed in the hope that it will be useful, but
-%# WITHOUT ANY WARRANTY; without even the implied warranty of
-%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-%# General Public License for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<& QueueList, %ARGS &>
-
-<%INIT>
-RT->Deprecated(
- Remove => '4.6',
- Instead => 'QueueList',
-);
-</%INIT>
-----------------------------------------------------------------------
More information about the rt-commit
mailing list