[Rt-commit] rt branch, 4.4/ocfv-disabled-flag, repushed

[? sunnavy]

The branch 4.4/ocfv-disabled-flag was deleted and repushed:
       was d639b5cdfdda452513f40a5a2ae4db17dc708004
       now 54072f917e222ba24871fd28fcff66986df961d9

1:  d639b5c ! 1:  54072f9 consistently use with_disabled_column for ObjectCustomFieldValues too
    @@ -5,6 +5,45 @@
         no need to use an extra flag("find_expired_rows")
         
         Fixes: #20766
    +
    +diff --git a/etc/upgrade/4.0.19/content b/etc/upgrade/4.0.19/content
    +--- a/etc/upgrade/4.0.19/content
    ++++ b/etc/upgrade/4.0.19/content
    +@@
    +     sub {
    +         use RT::ObjectCustomFieldValues;
    +         my $ocfvs = RT::ObjectCustomFieldValues->new(RT->System);
    +-        $ocfvs->{'find_expired_rows'} = 1;
    ++        $ocfvs->{'find_disabled_rows'} = 1;
    +         $ocfvs->Limit( FIELD => 'ObjectType', VALUE => 'RT::FM::Article' );
    +         while ( my $ocfv = $ocfvs->Next ) {
    +             my ($ret, $msg) = $ocfv->__Set( Field => 'ObjectType', Value => 'RT::Article' );
    +
    +diff --git a/etc/upgrade/4.2.2/content b/etc/upgrade/4.2.2/content
    +--- a/etc/upgrade/4.2.2/content
    ++++ b/etc/upgrade/4.2.2/content
    +@@
    +     sub {
    +         use RT::ObjectCustomFieldValues;
    +         my $ocfvs = RT::ObjectCustomFieldValues->new(RT->System);
    +-        $ocfvs->{'find_expired_rows'} = 1;
    ++        $ocfvs->{'find_disabled_rows'} = 1;
    +         $ocfvs->Limit( FIELD => 'ObjectType', VALUE => 'RT::FM::Article' );
    +         while ( my $ocfv = $ocfvs->Next ) {
    +             my ($ret, $msg) = $ocfv->__Set( Field => 'ObjectType', Value => 'RT::Article' );
    +
    +diff --git a/etc/upgrade/upgrade-articles.in b/etc/upgrade/upgrade-articles.in
    +--- a/etc/upgrade/upgrade-articles.in
    ++++ b/etc/upgrade/upgrade-articles.in
    +@@
    +     use RT::ObjectCustomFieldValues;
    +     my $ocfvs = RT::ObjectCustomFieldValues->new(RT->System);
    +     $ocfvs->Limit( FIELD => 'ObjectType', VALUE => 'RT::FM::Article' );
    +-    $ocfvs->{'find_expired_rows'} = 1;
    ++    $ocfvs->{'find_disabled_rows'} = 1;
    +     while ( my $ocfv = $ocfvs->Next ) {
    +         my ($ret, $msg) = $ocfv->__Set( Field => 'ObjectType', Value => 'RT::Article' );
    +         warn "Updated CF ".$ocfv->__Value('CustomField')." Value for Article ".$ocfv->__Value('ObjectId');
     
     diff --git a/lib/RT/Migrate/Serializer.pm b/lib/RT/Migrate/Serializer.pm
     --- a/lib/RT/Migrate/Serializer.pm
    @@ -41,7 +80,7 @@
     -        $self->LimitToEnabled();
     +
     +    if ( exists $self->{'find_expired_rows'} ) {
    -+        RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows' );
    ++        RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows', Remove => '4.6' );
     +        $self->{'find_disabled_rows'} = $self->{'find_expired_rows'};
          }
     -    
    @@ -58,7 +97,7 @@
     -        $self->LimitToEnabled();
     +
     +    if ( exists $self->{'find_expired_rows'} ) {
    -+        RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows' );
    ++        RT->Deprecated( Arguments => "find_expired_rows", Instead => 'find_disabled_rows', Remove => '4.6' );
     +        $self->{'find_disabled_rows'} = $self->{'find_expired_rows'};
          }
     -