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

diff --git a/rt/html/Search/Elements/SelectPersonType b/rt/html/Search/Elements/SelectPersonType
index 01f389304..d4127c97b 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-2005 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -42,16 +42,20 @@
 %# works based on those contributions, and sublicense and distribute
 %# those contributions and any derivatives thereof.
 %# 
-%# }}} END BPS TAGGED BLOCK
+%# END BPS TAGGED BLOCK }}}
 <SELECT NAME ="<%$Name%>">
 % if ($AllowNull) {
 <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>
 
 <%INIT>
@@ -59,6 +63,9 @@ 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);
 }
@@ -68,6 +75,7 @@ my @subtypes = qw(EmailAddress Name RealName Nickname Organization Address1 Addr
 </%INIT>
 <%ARGS>
 $AllowNull => 1
+$Suffix => ''
 $Default=>undef
 $Scope => 'ticket'
 $Name => 'WatcherType'