projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
59f21ea
)
fix export-less DID selection, RT#12178
author
ivan
<ivan>
Sat, 26 Mar 2011 00:10:06 +0000
(
00:10
+0000)
committer
ivan
<ivan>
Sat, 26 Mar 2011 00:10:06 +0000
(
00:10
+0000)
httemplate/elements/select-did.html
patch
|
blob
|
history
diff --git
a/httemplate/elements/select-did.html
b/httemplate/elements/select-did.html
index
dd2e8e5
..
17eac48
100644
(file)
--- a/
httemplate/elements/select-did.html
+++ b/
httemplate/elements/select-did.html
@@
-113,17
+113,16
@@
my @exports = $part_svc->part_export_did;
if ( scalar(@exports) > 1 ) {
die "more than one DID-providing export attached to svcpart $svcpart";
}
if ( scalar(@exports) > 1 ) {
die "more than one DID-providing export attached to svcpart $svcpart";
}
+my $export = ''
+$export = $exports[0] if scalar(@exports);
my $use_selector = scalar(@exports) ? 1 : 0;
my $use_selector = scalar(@exports) ? 1 : 0;
-my $export;
-$export = $exports[0] if scalar(@exports);
-
my $bulknum = $opt{'bulknum'} || 0;
my $bulknum = $opt{'bulknum'} || 0;
-my $country
= $export->option('country') ||
- $conf->config('countrydefault') ||
-
'US';
+my $country
= ( $export && $export->option('country') )
+ || $conf->config('countrydefault')
+
||
'US';
#my $field = $opt{'field'} || 'phonenum';
#my $field = $opt{'field'} || 'phonenum';