projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#38881: BILL illegal payby in 4.x [update_payby]
[freeside.git]
/
httemplate
/
misc
/
regions.cgi
diff --git
a/httemplate/misc/regions.cgi
b/httemplate/misc/regions.cgi
index
2450ea3
..
882dd48
100644
(file)
--- a/
httemplate/misc/regions.cgi
+++ b/
httemplate/misc/regions.cgi
@@
-1,4
+1,4
@@
-<%
objToJson(\@regions) %>
+<%
encode_json({ error => $error, regions => \@regions}) %>\
<%init>
my( $state, $svcpart ) = $cgi->param('arg');
<%init>
my( $state, $svcpart ) = $cgi->param('arg');
@@
-7,6
+7,8
@@
my $part_svc = qsearchs('part_svc', { 'svcpart'=>$svcpart } );
die "unknown svcpart $svcpart" unless $part_svc;
my @regions = ();
die "unknown svcpart $svcpart" unless $part_svc;
my @regions = ();
+my $error;
+
if ( $state ) {
my @exports = $part_svc->part_export_did;
if ( $state ) {
my @exports = $part_svc->part_export_did;
@@
-17,9
+19,12
@@
if ( $state ) {
}
my $export = $exports[0];
}
my $export = $exports[0];
- my $something = $export->get_dids('state'=>$state);
+ local $@;
+ local $SIG{__DIE__};
+ my $something = eval { $export->get_dids('state'=>$state) };
+ $error = $@;
- @regions = @{ $something };
+ @regions = @{ $something }
if $something
;
}
}