diff options
| author | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
| commit | 88bf5db0cca989c51237c661a13078eef08b3674 (patch) | |
| tree | 0a84e1b5e7fd239f57fab678bf40c5311b0064a0 /rt/share/html/Elements/SelectCustomFieldValue | |
| parent | 9c15ffe3a5ee987e30e10c6a0ad1b5bf0b2a12e3 (diff) | |
| parent | e7eb845db1afab1cbdbc34ff9c387c5ac554659e (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'rt/share/html/Elements/SelectCustomFieldValue')
| -rwxr-xr-x | rt/share/html/Elements/SelectCustomFieldValue | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/rt/share/html/Elements/SelectCustomFieldValue b/rt/share/html/Elements/SelectCustomFieldValue index 21887b810..02a95c27b 100755 --- a/rt/share/html/Elements/SelectCustomFieldValue +++ b/rt/share/html/Elements/SelectCustomFieldValue @@ -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) @@ -45,19 +45,21 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -% $m->callback( Name => $Name, CustomField => $CustomField ); +% $m->callback( Name => $Name, CustomField => $CustomField, Default => \$Default ); +% $Default = "" unless defined $Default; % if ($CustomField->Type =~ /Select/i) { % my $values = $CustomField->Values; <select name="<%$Name%>"> <option value="" selected="selected">-</option> <option value="NULL"><&|/l&>(no value)</&></option> % while (my $value = $values->Next) { -<option value="<%$value->Name%>"><%$value->Name%></option> +<option value="<%$value->Name%>"<% ($value->Name eq $Default) ? q[ selected="selected"] : ''%>><%$value->Name%></option> % } </select> -% } -% elsif ( $CustomField->Type eq 'Autocomplete' ) { -<input type="text" id="CF-<% $CustomField->id %>" name="<% $Name %>" size="20" /> +% } elsif ($CustomField->Type =~ /^Date(Time)?$/) { +<& /Elements/SelectDate, ShowTime => ($1 ? 1 : 0), Name => $Name, Value => $Default &> +% } elsif ( $CustomField->Type eq 'Autocomplete' ) { +<input type="text" id="CF-<% $CustomField->id %>" name="<% $Name %>" size="20" value="<% $Default %>" /> <script type="text/javascript"> % my @options; % my $values = $CustomField->Values; @@ -70,9 +72,10 @@ jQuery('#'+'CF-' + <% $CustomField->id %>).autocomplete({ source: <% JSON::to_json(\@options) |n %> }); </script> % } else { -<input name="<%$Name%>" size="20" /> +<input name="<%$Name%>" size="20" value="<% $Default %>" type="text" /> % } <%args> $Name => undef -$CustomField =>undef +$CustomField => undef +$Default => undef </%args> |