diff options
Diffstat (limited to 'rt/share/html/Elements/SelectOwner')
| -rwxr-xr-x | rt/share/html/Elements/SelectOwner | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/rt/share/html/Elements/SelectOwner b/rt/share/html/Elements/SelectOwner index 6bdb24064..3ba7af634 100755 --- a/rt/share/html/Elements/SelectOwner +++ b/rt/share/html/Elements/SelectOwner @@ -1,40 +1,40 @@ %# BEGIN BPS TAGGED BLOCK {{{ -%# +%# %# COPYRIGHT: -%# -%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC -%# <jesse@bestpractical.com> -%# +%# +%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# <sales@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 @@ -43,14 +43,16 @@ %# 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="<%$Name%>" id="<%$Name%>"> %if ($DefaultValue) { -<option value=""<% !$Default ? qq[ selected="selected"] : '' |n %>><%$DefaultLabel%></option> +<option value=""<% !$Default ? qq[ selected="selected"] : '' |n %>><%$DefaultLabel |n%></option> %} % $Default = 0 unless defined $Default && $Default =~ /^\d+$/; -% my @formatednames = sort {lc $a->[1] cmp lc $b->[1]} map {[$_, $m->scomp('/Elements/ShowUser', User => $_)]} @users; +% my @formatednames = sort {lc $a->[1] cmp lc $b->[1]} map {[$_, $m->scomp('/Elements/ShowUser', User => $_)]} grep { $_->id != $RT::Nobody->id } @users; +% my $nobody = [$RT::Nobody, $m->scomp('/Elements/ShowUser', User => $RT::Nobody)]; +% unshift @formatednames, $nobody; %foreach my $UserRef ( @formatednames) { %my $User = $UserRef->[0]; <option <% ( $User->Id == $Default) ? qq[ selected="selected"] : '' |n %> @@ -97,9 +99,6 @@ foreach my $object (@objects) { IncludeSuperusers => $isSU ); while ( my $User = $Users->Next() ) { - next - if ( $User->id == $RT::Nobody->id ) - ; # skip nobody here, so we can make them first later $user_uniq_hash{ $User->Id() } = $User; } } @@ -108,8 +107,7 @@ if ($Default && $Default != $RT::Nobody->id && !$user_uniq_hash{$Default}) { $user_uniq_hash{$Default}->Load($Default); } -my @users = sort { uc( $a->Name ) cmp uc( $b->Name ) } values %user_uniq_hash; -unshift( @users, $RT::Nobody ); +my @users = values %user_uniq_hash; $m->callback( %ARGS, |