[freeside-commits] freeside/httemplate/elements select-did.html, 1.12, 1.13

Ivan,,, ivan at wavetail.420.am
Fri Mar 25 17:10:08 PDT 2011


Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv20078

Modified Files:
	select-did.html 
Log Message:
fix export-less DID selection, RT#12178

Index: select-did.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-did.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -d -r1.12 -r1.13
--- select-did.html	1 Mar 2011 04:09:22 -0000	1.12
+++ select-did.html	26 Mar 2011 00:10:06 -0000	1.13
@@ -113,17 +113,16 @@
 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 $export;
-$export = $exports[0] if scalar(@exports);
-
 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';
 



More information about the freeside-commits mailing list