[Rt-commit] rt branch, master, updated. rt-4.4.4-746-g9ba94bd91a

? sunnavy sunnavy at bestpractical.com
Mon Feb 10 14:47:58 EST 2020


The branch, master has been updated
       via  9ba94bd91a17c958e65a924fa6723c5811a256df (commit)
       via  cd189bbef5faf5f1563b9eba9ecd91e66e766f1b (commit)
       via  d648c5bfb08eb960d10e73604213607e791c4920 (commit)
       via  d1be7b0f7e1f73292e474e7b1750f54b63c47f03 (commit)
      from  4cf037f401c7610d78a9cb9019b2b3593b559e16 (commit)

Summary of changes:
 devel/docs/UPGRADING-5.0                  | 37 +++++++++++++++++-
 docs/{UPGRADING-4.6 => UPGRADING-5.0}     |  6 +--
 lib/RT/Interface/Web.pm                   |  5 ---
 lib/RT/Interface/Web/Request.pm           |  6 +--
 lib/RT/ObjectCustomFieldValues.pm         | 22 -----------
 lib/RT/Queue.pm                           | 62 -------------------------------
 lib/RT/SearchBuilder.pm                   |  2 +-
 share/html/Admin/CustomFields/Modify.html |  1 -
 share/html/Elements/Quicksearch           | 55 ---------------------------
 9 files changed, 40 insertions(+), 156 deletions(-)
 rename docs/{UPGRADING-4.6 => UPGRADING-5.0} (90%)
 delete mode 100644 share/html/Elements/Quicksearch

- Log -----------------------------------------------------------------
commit d1be7b0f7e1f73292e474e7b1750f54b63c47f03
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..519b37bc17 100644
--- a/lib/RT/SearchBuilder.pm
+++ b/lib/RT/SearchBuilder.pm
@@ -919,7 +919,7 @@ sub Limit {
     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'
+            Instead => $instead, Remove => '5.2'
         );
     }
 
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>

commit d648c5bfb08eb960d10e73604213607e791c4920
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Fri Feb 7 16:50:00 2020 -0500

    Update UPGRADING references to 5.0

diff --git a/docs/UPGRADING-4.6 b/docs/UPGRADING-5.0
similarity index 90%
rename from docs/UPGRADING-4.6
rename to docs/UPGRADING-5.0
index c357291a4a..535887e4b8 100644
--- a/docs/UPGRADING-4.6
+++ b/docs/UPGRADING-5.0
@@ -1,14 +1,14 @@
 =head1 UPGRADING FROM RT 4.4.0 and greater
 
-The 4.6 release is a major upgrade and as such there are more changes
+The 5.0 release is a major upgrade and as such there are more changes
 than in a minor bugfix release (e.g., 4.4.0 to 4.4.1) and some of these
 changes are backward-incompatible. The following lists some of the notable
 changes, especially those that might require you to change a configuration
 option or other setting due to a change in RT. Read this section carefully
 before you upgrade and look for changes to features you currently use.
 
-See F<devel/docs/UPGRADING-4.6> for internals changes relevant to
-extension writers.
+See F<devel/docs/UPGRADING-5.0> for internals changes relevant to
+extension writers, including deprecated code.
 
 =over
 

commit cd189bbef5faf5f1563b9eba9ecd91e66e766f1b
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Fri Feb 7 17:16:02 2020 -0500

    Document removals

diff --git a/devel/docs/UPGRADING-5.0 b/devel/docs/UPGRADING-5.0
index eec63f0ef0..67c21a3990 100644
--- a/devel/docs/UPGRADING-5.0
+++ b/devel/docs/UPGRADING-5.0
@@ -22,10 +22,43 @@ ticket listing.
 
 =item *
 
-When we cored RT::Extension::ConfigInDatabase, we renamed table name to
-Configurations and also changed internal implementation to support storing
+When we cored RT::Extension::ConfigInDatabase, we renamed the table to
+Configurations and also changed the internal implementation to support storing
 regex there.
 
 =back
 
+=head1 DEPRECATED CODE
+
+Code that is no longer used after updates is marked as deprecated so it will log
+a warning for two versions before we remove it. This gives developers time to
+update their code. This section lists code that has been removed after this
+period.
+
+=over
+
+=item *
+
+SQLFilter callback in /Elements/QueueSummaryByLifecycle
+
+=item *
+
+AfterUpdateCustomFieldValue callback in share/html/Admin/CustomFields/Modify.html
+
+=item *
+
+share/html/Elements/Quicksearch, which was renamed to QueueList
+
+=item *
+
+The find_expired_rows setting for ObjectCustomFieldValues is now find_disabled_rows.
+
+=item *
+
+RT::Queue now has a SetDefaultValue method, so individual methods for setting/getting defaults
+are removed: SetInitialPriority, InitialPriority, SetFinalPriority, FinalPriority,
+SetDefaultDueIn, DefaultDueIn.
+
+=back
+
 =cut

commit 9ba94bd91a17c958e65a924fa6723c5811a256df
Merge: 4cf037f401 cd189bbef5
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Tue Feb 11 03:26:10 2020 +0800

    Merge branch '4.6/remove-deprecated-code'


-----------------------------------------------------------------------


More information about the rt-commit mailing list