diff options
| -rw-r--r-- | FS/FS/Conf.pm | 9 | ||||
| -rw-r--r-- | FS/FS/Upgrade.pm | 7 | ||||
| -rwxr-xr-x | httemplate/browse/agent.cgi | 2 | ||||
| -rw-r--r-- | httemplate/browse/cust_class.html | 3 |
4 files changed, 17 insertions, 4 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index e76ff4b77..d81035273 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -6048,12 +6048,19 @@ and customer address. Include units.', { 'key' => 'agent-disable_counts', - 'section' => 'scalability', + 'section' => 'deprecated', 'description' => 'On the agent browse page, disable the customer and package counts. Typically used for very large installs when this page takes too long to render.', 'type' => 'checkbox', }, { + 'key' => 'config-disable_counts', + 'section' => 'scalability', + 'description' => 'Disable the customer and package counts on the Agents, Packages, and Services pages. Use for very large installs where these pages take too long to render.', + 'type' => 'checkbox', + }, + + { 'key' => 'tollfree-country', 'section' => 'telephony', 'description' => 'Country / region for toll-free recognition', diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index d33bca26b..1f62cb421 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -206,6 +206,13 @@ If you need to continue using the old Form 477 report, turn on the FS::upgrade_journal->set_done('deprecate_unmask_ss'); } + # Rename agent-disable_counts as config-disable_counts, flag now + # affects several configuration pages + for my $row ( qsearch( conf => { name => 'agent-disable_counts' } )) { + $row->name('config-disable_counts'); + $row->replace; + } + } sub upgrade_overlimit_groups { diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 751e8b69b..9c6290126 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -405,6 +405,6 @@ if ( $cgi->param('showdisabled') } my $conf = new FS::Conf; -my $disable_counts = $conf->exists('agent-disable_counts'); +my $disable_counts = $conf->exists('config-disable_counts'); </%init> diff --git a/httemplate/browse/cust_class.html b/httemplate/browse/cust_class.html index a35c045cf..93df96aa5 100644 --- a/httemplate/browse/cust_class.html +++ b/httemplate/browse/cust_class.html @@ -23,8 +23,7 @@ my $html_init = 'Customer classes define groups of customer for reporting.<BR><BR>'. qq!<A HREF="${p}edit/cust_class.html"><I>Add a customer class</I></A><BR><BR>!; -#cust_class-disable_counts? or just migrate this to one config probably -#my $disable_counts = $conf->exists('agent-disable_counts'); +#my $disable_counts = $conf->exists('config-disable_counts'); my $disable_counts = 0; my $customers_sub = sub { |