projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add cust_event.no_action flag for events that conditionally execute, #36741
[freeside.git]
/
httemplate
/
elements
/
select-part_pkg.html
diff --git
a/httemplate/elements/select-part_pkg.html
b/httemplate/elements/select-part_pkg.html
index
e5692a7
..
1f7b42f
100644
(file)
--- a/
httemplate/elements/select-part_pkg.html
+++ b/
httemplate/elements/select-part_pkg.html
@@
-79,7
+79,7
@@
function toggle_disabled_part_pkg (id,showdisabled,noload) {
if (showdisabled || selected[pkginfo.pkgpart] || !pkginfo.disabled) {
var newopt = document.createElement('option');
newopt.value = pkginfo.pkgpart;
if (showdisabled || selected[pkginfo.pkgpart] || !pkginfo.disabled) {
var newopt = document.createElement('option');
newopt.value = pkginfo.pkgpart;
- newopt.
label
= pkginfo.label;
+ newopt.
text
= pkginfo.label;
newopt.selected = selected[newopt.value] ? true : false;
selectbox.appendChild(newopt);
}
newopt.selected = selected[newopt.value] ? true : false;
selectbox.appendChild(newopt);
}
@@
-125,6
+125,7
@@
if ($opt{'toggle_disabled'}) {
order_by
pre_options
post_options
order_by
pre_options
post_options
+ select
) ) {
die "Cannot use toggle_disabled with $someopt"
if exists $opt{$someopt};
) ) {
die "Cannot use toggle_disabled with $someopt"
if exists $opt{$someopt};
@@
-153,7
+154,10
@@
if ( exists($opt{'classnum'}) && defined($opt{'classnum'}) ) {
# currently can't handle this, either
die 'Use of toggle_disabled with classnum has not been implemented'
# currently can't handle this, either
die 'Use of toggle_disabled with classnum has not been implemented'
- if exists $hash{'classnum'};
+ if $opt{'toggle_disabled'} && exists($hash{'classnum'});
+
+# CAUTION: For proper functioning of toggle_disabled,
+# please ensure changes to default options are synced with misc/xmlhttp-part_pkg.cgi
$opt{'select'} = 'part_pkg.*, setup_option.optionvalue AS _setup_fee,
recur_option.optionvalue AS _recur_fee'
$opt{'select'} = 'part_pkg.*, setup_option.optionvalue AS _setup_fee,
recur_option.optionvalue AS _recur_fee'