diff options
| author | Alex Brelsfoard <alex@freeside.biz> | 2015-02-10 00:11:07 -0500 |
|---|---|---|
| committer | Alex Brelsfoard <alex@freeside.biz> | 2015-02-10 00:11:07 -0500 |
| commit | ec7e8155fce544f19f2b6734476ed6db8c200aa9 (patch) | |
| tree | 8b336b67d075006b6fcbcaa110307cc2413f5554 /httemplate/edit/elements | |
| parent | d422d2530bda9de3af830f1e1ab1084061b486f5 (diff) | |
| parent | 0238fd7aa7a92887970507346ac7e6ad8ed5492c (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/edit/elements')
| -rw-r--r-- | httemplate/edit/elements/edit.html | 4 | ||||
| -rw-r--r-- | httemplate/edit/elements/part_svc_column.html | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html index 9e506a731..4d5beee71 100644 --- a/httemplate/edit/elements/edit.html +++ b/httemplate/edit/elements/edit.html @@ -334,6 +334,10 @@ Example: % #any? % 'colspan' => $f->{'colspan'}, % 'required' => $f->{'required'}, +% +% #contact +% 'custnum' => $f->{'custnum'}, +% 'prospectnum' => $f->{'prospectnum'}, % ); % % $include_common{$_} = $f->{$_} foreach grep exists($f->{$_}), diff --git a/httemplate/edit/elements/part_svc_column.html b/httemplate/edit/elements/part_svc_column.html index 53cda859e..2bb4f5e41 100644 --- a/httemplate/edit/elements/part_svc_column.html +++ b/httemplate/edit/elements/part_svc_column.html @@ -140,7 +140,8 @@ that field. 'value_col' => $def->{'select_key'}, 'order_by' => dbdef->table($def->{'select_table'})->primary_key, 'multiple' => $def->{'multiple'}, - 'disable_empty' => 1, + 'disable_empty' => $def->{'select_allow_empty'} ? undef : 1, + 'empty_label' => $def->{'select_allow_empty'} ? ' ' : undef, 'curr_value' => $value, # these can be switched between multiple and singular, # so put the complete curr_value in an attribute |
