diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
| commit | 9aee669886202be7035e6c6049fc71bc99dd3013 (patch) | |
| tree | 2fd5bf6de74f3d99270587ffb1833e4188a6373d /rt/share/html/Search/Elements/EditFormat | |
| parent | ac20214d38d9af00430423f147b5a0e50751b050 (diff) | |
| parent | 1add633372bdca3cc7163c2ce48363fed3984437 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/share/html/Search/Elements/EditFormat')
| -rw-r--r-- | rt/share/html/Search/Elements/EditFormat | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/rt/share/html/Search/Elements/EditFormat b/rt/share/html/Search/Elements/EditFormat index 58de19780..fffec5c9d 100644 --- a/rt/share/html/Search/Elements/EditFormat +++ b/rt/share/html/Search/Elements/EditFormat @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -59,7 +59,8 @@ <td valign="top"><select size="6" name="SelectDisplayColumns" multiple="multiple"> % my %seen; % foreach my $field ( grep !$seen{lc $_}++, @$AvailableColumns) { -<option value="<% $field %>"><% loc($field) %></option> +<option value="<% $field %>" <% $selected{$field} ? 'selected="selected"' : '' |n%>>\ +<% $field =~ /^(?:CustomField|CF)\./ ? $field : loc($field) %></option> % } </select></td> <td> @@ -105,8 +106,10 @@ <td valign="top"> <select size="4" name="CurrentDisplayColumns"> % my $i=0; +% my $current = $ARGS{CurrentDisplayColumns} || ''; $current =~ s/^\d+>//; % foreach my $field ( @$CurrentFormat ) { -<option value="<% $i++ %>><% $field->{Column} %>"><% loc( $field->{Column} ) %></option> +<option value="<% $i++ %>><% $field->{Column} %>" <% $field->{Column} eq $current ? 'selected="selected"' : '' |n%>>\ +<% $field->{Column} =~ /^(?:CustomField|CF)\./ ? $field->{Column} : loc( $field->{Column} ) %></option> % } </select> <br /> @@ -120,6 +123,12 @@ </tr> </table> +<%init> +my $selected = $ARGS{SelectDisplayColumns}; +$selected = [ $selected ] unless ref $selected; +my %selected; +$selected{$_}++ for grep {defined} @{ $selected }; +</%init> <%ARGS> $CurrentFormat => undef $AvailableColumns => undef |