[Rt-commit] rt branch, 4.4/cf-sort-order-inputs, repushed

[? sunnavy]

The branch 4.4/cf-sort-order-inputs was deleted and repushed:
       was 2f32bdcc7545b4c8160608f41fe85b2965bb6997
       now b800a92fff98ce8a7f821a3ecee849d6d274d945

1: a7282ed843 ! 1: 97a320ada7 Support SortOrder edit on ocf admin pages
    @@ -1,8 +1,8 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
    -    support cf reordering by directly editing SortOrder on ocf admin pages
    +    Support SortOrder edit on ocf admin pages
         
    -    since we don't support move up/down for global cfs on queue-specific
    +    Since we don't support move up/down for global cfs on queue-specific
         pages, global cfs' SortOrder inputs are disabled there accordingly.
     
     diff --git a/share/html/Admin/Elements/EditCustomFields b/share/html/Admin/Elements/EditCustomFields
2: d9a85656f3 ! 2: 5f616510d1 Automatically resolve duplicate SortOrders for custom fields
    @@ -1,6 +1,6 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
    -    try to automatically resolve duplicated SortOrder for custom fields
    +    Automatically resolve duplicate SortOrders for custom fields
     
     diff --git a/lib/RT/SearchBuilder/AddAndSort.pm b/lib/RT/SearchBuilder/AddAndSort.pm
     --- a/lib/RT/SearchBuilder/AddAndSort.pm
    @@ -9,7 +9,7 @@
          return $collection->{ $key } = $alias;
      }
      
    -+=head2 ResolveDuplicatedSortOrder( ObjectId => VALUE )
    ++=head2 ResolveDuplicateSortOrders( ObjectId => VALUE )
     +
     +Note that it could fail if it can't find an approach to resolve.
     +
    @@ -20,7 +20,7 @@
     +
     +=cut
     +
    -+sub ResolveDuplicatedSortOrder {
    ++sub ResolveDuplicateSortOrders {
     +    my $self = shift;
     +    my %args = (
     +        ObjectId => 0,
    @@ -122,7 +122,7 @@
     +        );
     +        $ocfs->Limit( FIELD => 'ObjectId', VALUE => [ 0, $id ], OPERATOR => 'IN' );
     +
    -+        my ( $status, @msgs ) = $ocfs->ResolveDuplicatedSortOrder( ObjectId => $id );
    ++        my ( $status, @msgs ) = $ocfs->ResolveDuplicateSortOrders( ObjectId => $id );
     +        push @results, @msgs;
     +    }
      }
3: d80f2905fd ! 3: 21d82647d9 Add config option to enable/disable SortOrder's auto-resolve approach
    @@ -1,6 +1,6 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
    -    config option to enable/disable SortOrder's auto-resolve approach
    +    Add config option to enable/disable SortOrder's auto-resolve approach
     
     diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
     --- a/etc/RT_Config.pm.in
    @@ -9,20 +9,20 @@
          Assets       => 50,
      );
      
    -+=item C<%AdminAutoResolveDuplicatedSortOrder>
    ++=item C<%AdminAutoResolveDuplicateSortOrders>
     +
    -+Use C<%AdminAutoResolveDuplicatedSortOrder> to automatically resolve
    -+duplicated SortOrder on admin pages.
    ++Use C<%AdminAutoResolveDuplicateSortOrders> to automatically resolve duplicate
    ++SortOrders on admin pages.
     +
     +Note that for objects like custom fields that support multiple lever apply
     +approaches(globally or at queue level), updating SortOrder of global custom
     +fields might cause new duplications at queue level, this config doesn't check
    -+or resolve those new duplications.
    ++or resolve those new duplicates.
     +
     +=cut
     +
     +
    -+Set(%AdminAutoResolveDuplicatedSortOrder,
    ++Set(%AdminAutoResolveDuplicateSortOrders,
     +    CustomFields => 0,
     +);
     +
    @@ -38,7 +38,7 @@
          }
      
     -    {
    -+    my $config = RT->Config->Get('AdminAutoResolveDuplicatedSortOrder');
    ++    my $config = RT->Config->Get('AdminAutoResolveDuplicateSortOrders');
     +    if ( $config && $config->{CustomFields} ) {
              my $cfs = RT::CustomFields->new( $session{'CurrentUser'} );
              $cfs->LimitToLookupType($lookup);
4: 2f32bdcc75 ! 4: b800a92fff Add rt-rebuild-sort-order command to rebuild SortOrder
    @@ -1,14 +1,14 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
    -    the script rt-rebuild-sort-order to rebuild SortOrder
    +    Add rt-rebuild-sort-order command to rebuild SortOrder
     
     diff --git a/.gitignore b/.gitignore
     --- a/.gitignore
     +++ b/.gitignore
     @@
    - /sbin/rt-importer
    - /sbin/rt-ldapimport
    + /sbin/rt-passwd
      /sbin/standalone_httpd
    + /sbin/rt-munge-attachments
     +/sbin/rt-rebuild-sort-order
      /var/mason_data/
      /autom4te.cache/
    @@ -18,9 +18,9 @@
     --- a/Makefile.in
     +++ b/Makefile.in
     @@
    - 				rt-ldapimport \
      				rt-passwd \
      				rt-preferences-viewer \
    + 				rt-search-attributes \
     +				rt-rebuild-sort-order \
      				rt-serializer \
      				rt-server \
    @@ -30,9 +30,9 @@
     --- a/configure.ac
     +++ b/configure.ac
     @@
    -                  sbin/rt-serializer
                       sbin/rt-importer
                       sbin/rt-passwd
    +                  sbin/rt-munge-attachments
     +                 sbin/rt-rebuild-sort-order
                       bin/rt-crontool
                       bin/rt-mailgate
    @@ -48,7 +48,7 @@
     +#
     +# COPYRIGHT:
     +#
    -+# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
    ++# This software is Copyright (c) 1996-2020 Best Practical Solutions, LLC
     +#                                          <sales at bestpractical.com>
     +#
     +# (Except where explicitly superseded by other copyright notices)
    @@ -293,11 +293,11 @@
     +
     +For objects like ticket custom fields that support both global and local apply
     +approaches(globally or at queue level), updating SortOrder of global custom
    -+fields might cause duplicated SortOrder at queue level, which is annoying.
    -+
    -+This script rebuilds the whole SortOrder of related objects in a manner that
    -+makes global ones' SortOrder sparse enough so you can easily adjust local
    -+ones' later without worrying about no enough positions.
    ++fields might cause duplicate SortOrders at queue level, which is annoying.
    ++
    ++This script rebuilds the whole SortOrders in a manner that makes global ones
    ++sparse enough so you can easily adjust local ones later without worrying about
    ++available positions.
     +
     +=head1 OPTIONS
     +