[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 b9bbfe32b42e67341787a6bb599c9ed637181a21
       now 16d3f089d71c273bef72b67707404c31e047dc84

1: 64b2a045c ! 1: 387efdfae Allow multiple search criteria on Group Admin page
    @@ -10,17 +10,28 @@
      </form>
      
     -<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html">
    +-<&|/l&>Find groups whose</&> <& /Elements/SelectGroups &><br />
     +<form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Groups/index.html" name="GroupsAdmin">
    - <&|/l&>Find groups whose</&> <& /Elements/SelectGroups &><br />
    ++<&|/l&>Find groups whose</&> <& /Elements/SelectGroups,
    ++        GroupField      => $GroupField,
    ++        GroupOp         => $GroupOp,
    ++        GroupString     => $GroupString,
    ++&><br />
     +<&|/l&>And groups whose</&> <& /Elements/SelectGroups,
     +        SelectFieldName => 'GroupField2',
    -+        SelectOpName => 'GroupOp2',
    ++        SelectOpName    => 'GroupOp2',
     +        InputStringName => 'GroupString2',
    ++        GroupField      => $GroupField2,
    ++        GroupOp         => $GroupOp2,
    ++        GroupString     => $GroupString2,
     +&><br />
     +<&|/l&>And groups whose</&> <& /Elements/SelectGroups,
     +        SelectFieldName => 'GroupField3',
    -+        SelectOpName => 'GroupOp3',
    ++        SelectOpName    => 'GroupOp3',
     +        InputStringName => 'GroupString3',
    ++        GroupField      => $GroupField3,
    ++        GroupOp         => $GroupOp3,
    ++        GroupString     => $GroupString3,
     +&><br />
      <input type="checkbox" class="checkbox" id="FindDisabledGroups" name="FindDisabledGroups" value="1" <% $FindDisabledGroups? 'checked="checked"': '' |n %> />
      <label for="FindDisabledGroups"><&|/l&>Include disabled groups in listing.</&></label><br />
    @@ -39,9 +50,11 @@
      % }
      
     @@
    +     $Groups->FindAllRows();
    + }
      
    - if (length $GroupString) {
    -     $caption = loc("Groups matching search criteria");
    +-if (length $GroupString) {
    +-    $caption = loc("Groups matching search criteria");
     -    if ($GroupField =~ /^CustomField-(\d+)/) {
     -        $Groups->LimitCustomField(
     -            CUSTOMFIELD => $1,
    @@ -56,11 +69,13 @@
     -            VALUE => $GroupString,
     -            CASESENSITIVE => 0
     -        );
    -+    my @groups = ();
    -+    push @groups, { field => $GroupField, op => $GroupOp, string => $GroupString };
    -+    push @groups, { field => $GroupField2, op => $GroupOp2, string => $GroupString2 } if length $GroupString2;
    -+    push @groups, { field => $GroupField3, op => $GroupOp3, string => $GroupString3 } if length $GroupString3;
    ++$caption = loc("Groups matching search criteria");
    ++my @groups = ();
    ++push @groups, { field => $GroupField, op => $GroupOp, string => $GroupString } if length $GroupString;
    ++push @groups, { field => $GroupField2, op => $GroupOp2, string => $GroupString2 } if length $GroupString2;
    ++push @groups, { field => $GroupField3, op => $GroupOp3, string => $GroupString3 } if length $GroupString3;
     +
    ++if ( scalar @groups ) {
     +    foreach my $group ( @groups ) {
     +        if ( $group->{'field'} =~ /^CustomField-(\d+)/ ) {
     +            $Groups->LimitCustomField(
    @@ -87,14 +102,15 @@
      $Format => undef,
      
     -$GroupString => '' unless defined $GroupString
    -+$GroupString => ''
    - $GroupOp => '='
    +-$GroupOp => '='
    ++$GroupString => undef
    ++$GroupOp => undef
      $GroupField => 'Name'
    -+$GroupString2 => ''
    -+$GroupOp2 => '='
    ++$GroupString2 => undef
    ++$GroupOp2 => undef
     +$GroupField2 => 'Name'
    -+$GroupString3 => ''
    -+$GroupOp3 => '='
    ++$GroupString3 => undef
    ++$GroupOp3 => undef
     +$GroupField3 => 'Name'
      $FindDisabledGroups => 0
      </%ARGS>
2: d85190fc8 = 2: c868116f4 Add tests for multiple search criteria on Group Admin page
3: 94b7b5719 = 3: c47cdcbb8 Allow multiple search criteria on Users Admin page
4: b9bbfe32b = 4: 16d3f089d Add tests for multiple search criteria on Users Admin page