diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2017-09-07 08:51:58 -0400 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2017-09-07 08:51:58 -0400 |
| commit | 444ecdc59e1da312e559ffa8b8f34130cf2317b5 (patch) | |
| tree | ed44ac0b3dc72d2cd29e649f5c52a59341377712 | |
| parent | 0c8c33892661b2774fd29423e3791d08a257d0fe (diff) | |
| parent | 0bca43616911f2b48d9a0617e70a3bf0f30b92db (diff) | |
Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside
| -rw-r--r-- | httemplate/browse/part_pkg_taxproduct/compliance_solutions.html | 3 | ||||
| -rw-r--r-- | httemplate/config/config-view.cgi | 14 | ||||
| -rwxr-xr-x | httemplate/edit/svc_acct.cgi | 10 |
3 files changed, 17 insertions, 10 deletions
diff --git a/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html b/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html index bbcb6877f..b5936daef 100644 --- a/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html +++ b/httemplate/browse/part_pkg_taxproduct/compliance_solutions.html @@ -53,6 +53,9 @@ function category_changed(what) { jopt( $('#product_code'), '', 'Select product code' ); var part_pkg_taxproduct = reply.part_pkg_taxproduct; + if ( part_pkg_taxproduct.length == 0 ) { + alert('No compliance solutions product codes found; did you run freeside-compliance_solutions-import?'); + } for ( var s = 0; s < part_pkg_taxproduct.length; s=s+2 ) { var product_code = part_pkg_taxproduct[s]; var description = part_pkg_taxproduct[s+1]; diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi index b02ab1af3..5f09b128a 100644 --- a/httemplate/config/config-view.cgi +++ b/httemplate/config/config-view.cgi @@ -212,11 +212,15 @@ invoice language options: <tr> <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff"> -<font size="-2"><pre><% encode_entities(join("\n", - map { length($_) > 88 ? substr($_,0,88).'...' : $_ } - $conf->config($i->key, $agentnum) - ) ) -%></pre></font> + +% my $escaped = eval { encode_entities(join("\n", +% map { length($_) > 88 ? substr($_,0,88).'...' : $_ } +% $conf->config($i->key, $agentnum) +% ) ); +% }; +% $escaped = $@ ? '('.encode_entities($@).')' : $escaped; +<font size="-2"><pre><% $escaped %></pre></font> + </td> </tr> diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi index 7be5eabb7..27ea3c5ea 100755 --- a/httemplate/edit/svc_acct.cgi +++ b/httemplate/edit/svc_acct.cgi @@ -310,11 +310,11 @@ % } % } -% my %label = ( seconds => 'Time', -% upbytes => 'Upload bytes', -% downbytes => 'Download bytes', -% totalbytes => 'Total bytes', -% ); +% tie my %label, 'Tie::IxHash', seconds => 'Time', +% upbytes => 'Upload bytes', +% downbytes => 'Download bytes', +% totalbytes => 'Total bytes', +% ; % foreach my $uf (keys %label) { % my $tf = $uf . "_threshold"; % if ( $curuser->access_right('Edit usage') ) { |