[Rt-commit] rt branch, 4.4/add-groups-users-cf-filter, repushed

[Maureen Mirville]

The branch 4.4/add-groups-users-cf-filter was deleted and repushed:
       was 58cb1c137cb1d77d5c84cac1b5b8e2ad74496001
       now b9bbfe32b42e67341787a6bb599c9ed637181a21

1: 64b2a045c = 1: 64b2a045c Allow multiple search criteria on Group Admin page
2: d85190fc8 = 2: d85190fc8 Add tests for multiple search criteria on Group Admin page
3: 3e5427fda ! 3: 94b7b5719 Allow multiple search criteria on Users Admin page
    @@ -15,19 +15,26 @@
      %     next unless defined $ARGS{ $field } && length $ARGS{ $field };
      <input type="hidden" name="<% $field %>" value="<% $ARGS{ $field } %>" />
      % }
    - <&|/l&>Find all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields &><br />
    -+<&|/l&>And all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields,
    -+        SelectFieldName => 'UserField2',
    -+        SelectOpName => 'UserOp2',
    -+        InputStringName => 'UserString2',
    -+        UserString => $UserString2,
    -+&><br />
    -+<&|/l&>And all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields,
    -+        SelectFieldName => 'UserField3',
    -+        SelectOpName => 'UserOp3',
    -+        InputStringName => 'UserString3',
    -+        UserString => $UserString3,
    -+&><br />
    +-<&|/l&>Find all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields &><br />
    ++<table>
    ++    <tr><td><&|/l&>Find all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields &></td></tr>
    ++    <tr><td><&|/l&>And all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields,
    ++                SelectFieldName => 'UserField2',
    ++                SelectOpName    => 'UserOp2',
    ++                InputStringName => 'UserString2',
    ++                UserField       => $UserField2,
    ++                UserOp          => $UserOp2,
    ++                UserString      => $UserString2,
    ++            &></td></tr>
    ++    <tr><td><&|/l&>And all users whose</&> <& /Elements/SelectUsers, %ARGS, Fields => \@fields,
    ++                SelectFieldName => 'UserField3',
    ++                SelectOpName    => 'UserOp3',
    ++                InputStringName => 'UserString3',
    ++                UserField       => $UserField3,
    ++                UserOp          => $UserOp3,
    ++                UserString      => $UserString3,
    ++            &></td></tr>
    ++</table>
      <input type="checkbox" class="checkbox" id="FindDisabledUsers" name="FindDisabledUsers" value="1" <% $FindDisabledUsers? 'checked="checked"': '' %> />
      <label for="FindDisabledUsers"><&|/l&>Include disabled users in search.</&></label>
      <br />
    @@ -46,9 +53,11 @@
      
      % }
     @@
    + my $users = RT::Users->new( $session{'CurrentUser'} );
    + $users->FindAllRows if $FindDisabledUsers;
      
    - if ( defined($UserString) && length $UserString ) {
    -     $caption = loc("Users matching search criteria");
    +-if ( defined($UserString) && length $UserString ) {
    +-    $caption = loc("Users matching search criteria");
     -    if ( $UserField =~ /^CustomField-(\d+)/ ) {
     -        $users->LimitCustomField(
     -            CUSTOMFIELD => $1,
    @@ -62,11 +71,13 @@
     -            OPERATOR => $UserOp,
     -            VALUE => $UserString,
     -        ); 
    -+    my @users_queries = ();
    -+    push @users_queries, { field => $UserField, op => $UserOp, string => $UserString };
    -+    push @users_queries, { field => $UserField2, op => $UserOp2, string => $UserString2 } if length $UserString2;
    -+    push @users_queries, { field => $UserField3, op => $UserOp3, string => $UserString3 } if length $UserString3;
    ++$caption = loc("Users matching search criteria");
    ++my @users_queries = ();
    ++push @users_queries, { field => $UserField, op => $UserOp, string => $UserString } if length $UserString;
    ++push @users_queries, { field => $UserField2, op => $UserOp2, string => $UserString2 } if length $UserString2;
    ++push @users_queries, { field => $UserField3, op => $UserOp3, string => $UserString3 } if length $UserString3;
     +
    ++if ( scalar @users_queries ) {
     +    foreach my $user ( @users_queries ) {
     +        if ( $user->{'field'} =~ /^CustomField-(\d+)/ ) {
     +            $users->LimitCustomField(
    @@ -88,14 +99,17 @@
          RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Admin/Users/Modify.html?id=".$users->First->id)
                if $users->Count == 1;
     @@
    + $Format => undef,
    + 
      $UserString => undef
    - $UserOp => '='
    +-$UserOp => '='
    ++$UserOp => undef
      $UserField => 'Name'
     +$UserString2 => undef
    -+$UserOp2 => '='
    ++$UserOp2 => undef
     +$UserField2 => 'Name'
     +$UserString3 => undef
    -+$UserOp3 => '='
    ++$UserOp3 => undef
     +$UserField3 => 'Name'
      $IdLike => undef
      $EmailLike => undef
4: 58cb1c137 = 4: b9bbfe32b Add tests for multiple search criteria on Users Admin page