better error message about missing secrets file errors. WTF is going on!

[freeside.git] / httemplate / misc / svc_acct-domains.cgi

diff --git a/httemplate/misc/svc_acct-domains.cgi b/httemplate/misc/svc_acct-domains.cgi
index 5e96b8d..a49a023 100644 (file)
--- a/httemplate/misc/svc_acct-domains.cgi
+++ b/httemplate/misc/svc_acct-domains.cgi
@@ -3,9 +3,10 @@
 %  my $pkgpart_svcpart = $cgi->param('arg');
 %  $pkgpart_svcpart =~ /^\d+_(\d+)$/;
 %  my $part_svc = qsearchs('part_svc', { 'svcpart' => $1 }) if $1;
-%  my $part_svc_column = $part_svc->part_svc_column('domsvc');
+%  my $part_svc_column = $part_svc->part_svc_column('domsvc') if $part_svc;
 %
-%  my @output = split /,/, $part_svc_column->columnvalue;
+%  my @output = split /,/, $part_svc_column->columnvalue if $part_svc_column;
+%  my $columnflag = $part_svc_column->columnflag if $part_svc_column;
 %  my @svc_domain = ();
 %  my %seen = ();
 %  
@@ -16,10 +17,15 @@
 %    push @svc_domain, [ $_ => $svc_domain->domain ];
 %    $seen{$_}++;
 %  }
-%  if ($part_svc_column->columnflag eq 'D' || $part_svc_column->columnflag eq '') {
+%  if ($conf->exists('svc_acct-alldomains')
+%       && ( $columnflag eq 'D' || $columnflag eq '' )
+%     ) {
 %    foreach (grep { $_->svcnum ne $output[0] } qsearch('svc_domain', {}) ){
 %      push @svc_domain, [ $_->svcnum => $_->domain ];
 %    }
 %  }
 %
 [ <% join(', ', map { qq("$_->[0]", "$_->[1]") } @svc_domain) %> ]
+<%init>
+my $conf = new FS::Conf;
+</%init>