[Rt-commit] rt branch, 4.4/add-groups-users-cf-filter, repushed
Maureen Mirville
maureen at bestpractical.com
Fri Sep 7 14:56:16 EDT 2018
The branch 4.4/add-groups-users-cf-filter was deleted and repushed:
was 6cc2793ecf37ebf7c0bbafbc034982ae231df52b
now 2f63ba7ff44fed0fcb556ae6e47903e41ce381f6
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: 6823dbc45 ! 3: 5df1764dc Allow multiple search criteria on Users Admin page
@@ -131,177 +131,3 @@
+$InputStringName => 'UserString'
</%ARGS>
-diff --git a/share/html/Elements/SelectUsers2 b/share/html/Elements/SelectUsers2
-new file mode 100644
---- /dev/null
-+++ b/share/html/Elements/SelectUsers2
-@@
-+%# BEGIN BPS TAGGED BLOCK {{{
-+%#
-+%# COPYRIGHT:
-+%#
-+%# This software is Copyright (c) 1996-2018 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 }}}
-+<select name="UserField2">
-+% foreach my $col (@fields) {
-+<option <% ($UserField2 eq $col->[0]) ? 'selected="selected"' : '' |n %> value="<% $col->[0] %>"><% loc($col->[1]) %></option>
-+% }
-+% while (my $CF = $CFs->Next) {
-+% my $val = "CustomField-" . $CF->Id;
-+<option <% ($UserField2 eq $val) ? 'selected="selected"' : '' |n %> value="<% $val %>"><&|/l&>CustomField</&>: <% $CF->Name %></option>
-+% }
-+</select>
-+<& /Elements/SelectMatch, Name => 'UserOp2', Default => $UserOp2 &>
-+<input size="8" name="UserString2" value="<% $UserString2 %>" />
-+<%INIT>
-+my $CFs = RT::CustomFields->new($session{'CurrentUser'});
-+$CFs->LimitToChildType('RT::User');
-+$CFs->OrderBy( FIELD => 'Name' );
-+
-+my @fields = RT::User->BasicColumns;
-+
-+if ( $Fields and ref $Fields eq 'ARRAY' ) {
-+ if ( ref $Fields->[0] eq 'ARRAY' ) {
-+ @fields = @$Fields;
-+ }
-+ else {
-+ # make the name equal the label
-+ @fields = [ @$Fields, @$Fields ];
-+ }
-+}
-+</%INIT>
-+<%ARGS>
-+$UserField2 => ''
-+$UserOp2 => ''
-+$UserString2 => ''
-+$Fields => undef
-+</%ARGS>
-
-diff --git a/share/html/Elements/SelectUsers3 b/share/html/Elements/SelectUsers3
-new file mode 100644
---- /dev/null
-+++ b/share/html/Elements/SelectUsers3
-@@
-+%# BEGIN BPS TAGGED BLOCK {{{
-+%#
-+%# COPYRIGHT:
-+%#
-+%# This software is Copyright (c) 1996-2018 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 }}}
-+<select name="UserField3">
-+% foreach my $col (@fields) {
-+<option <% ($UserField3 eq $col->[0]) ? 'selected="selected"' : '' |n %> value="<% $col->[0] %>"><% loc($col->[1]) %></option>
-+% }
-+% while (my $CF = $CFs->Next) {
-+% my $val = "CustomField-" . $CF->Id;
-+<option <% ($UserField3 eq $val) ? 'selected="selected"' : '' |n %> value="<% $val %>"><&|/l&>CustomField</&>: <% $CF->Name %></option>
-+% }
-+</select>
-+<& /Elements/SelectMatch, Name => 'UserOp3', Default => $UserOp3 &>
-+<input size="8" name="UserString3" value="<% $UserString3 %>" />
-+<%INIT>
-+my $CFs = RT::CustomFields->new($session{'CurrentUser'});
-+$CFs->LimitToChildType('RT::User');
-+$CFs->OrderBy( FIELD => 'Name' );
-+
-+my @fields = RT::User->BasicColumns;
-+
-+if ( $Fields and ref $Fields eq 'ARRAY' ) {
-+ if ( ref $Fields->[0] eq 'ARRAY' ) {
-+ @fields = @$Fields;
-+ }
-+ else {
-+ # make the name equal the label
-+ @fields = [ @$Fields, @$Fields ];
-+ }
-+}
-+</%INIT>
-+<%ARGS>
-+$UserField3 => ''
-+$UserOp3 => ''
-+$UserString3 => ''
-+$Fields => undef
-+</%ARGS>
-
4: 6cc2793ec = 4: 2f63ba7ff Add tests for multiple search criteria on Users Admin page
More information about the rt-commit
mailing list