X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Fhtml%2FSearch%2FElements%2FSelectPersonType;h=e2a9a21d42ae9500616ec5420a14f5d0e4394963;hb=e70abd21bab68b23488f7ef1ee2e693a3b365691;hp=01f3893040271cbfba97eb99ada88e87776368ef;hpb=d39d52aac8f38ea9115628039f0df5aa3ac826de;p=freeside.git

diff --git a/rt/html/Search/Elements/SelectPersonType b/rt/html/Search/Elements/SelectPersonType
index 01f389304..e2a9a21d4 100644
--- a/rt/html/Search/Elements/SelectPersonType
+++ b/rt/html/Search/Elements/SelectPersonType
@@ -1,8 +1,8 @@
-%# {{{ BEGIN BPS TAGGED BLOCK
+%# BEGIN BPS TAGGED BLOCK {{{
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# 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:
@@ -42,32 +44,40 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
-<SELECT NAME ="<%$Name%>">
+%# END BPS TAGGED BLOCK }}}
+<select NAME ="<%$Name%>">
 % if ($AllowNull) {
-<OPTION VALUE="">-</OPTION>
+<option value="">-</option>
 % }
-%for my $option (@types) {
-%foreach my $subtype (@subtypes) {
-<OPTION VALUE="<%"$option.$subtype"%>" <%$option eq $Default && $subtype eq 'EmailAddress' && "SELECTED"%> ><%loc("[_1] [_2]",$option, $subtype)%></OPTION>
+% for my $option (@types) {
+%  if ($Suffix) {
+<option value="<% $option %><% $Suffix %>" <%$option eq $Default && "SELECTED"%> ><%loc($option)%></option>
+%   next;
+%  }
+%  foreach my $subtype (@subtypes) {
+<option value="<%"$option.$subtype"%>" <%$option eq $Default && $subtype eq 'EmailAddress' && "SELECTED"%> ><% loc($option) %> <% loc($subtype) %></option>
+%  }
 % }
-%}
-</SELECT>
+</select>
 
 <%INIT>
 my @types;
 if ($Scope =~ 'queue') {
    @types = qw(Cc AdminCc);
 }
+elsif ($Suffix eq 'Group') {
+   @types = qw(Requestor Cc AdminCc Watcher);
+}
 else { 
-   @types = qw(Requestor Cc AdminCc Watcher Owner);
+   @types = qw(Requestor Cc AdminCc Watcher Owner QueueCc QueueAdminCc QueueWatcher);
 }
 
-my @subtypes = qw(EmailAddress Name RealName Nickname Organization Address1 Address2 WorkPhone HomePhone MobilePhone PagerPhone);
+my @subtypes = qw(EmailAddress Name RealName Nickname Organization Address1 Address2 WorkPhone HomePhone MobilePhone PagerPhone id);
 
 </%INIT>
 <%ARGS>
 $AllowNull => 1
+$Suffix => ''
 $Default=>undef
 $Scope => 'ticket'
 $Name => 'WatcherType'