From 8551c2469ece9a769b52b5429574d6984cd367ed Mon Sep 17 00:00:00 2001 From: Mitch Jackson Date: Sun, 31 Mar 2019 18:02:25 -0400 Subject: [PATCH] RT# 81946 Rename conf agent-disable_counts as config-disable_counts --- FS/FS/Conf.pm | 9 ++++++++- FS/FS/Upgrade.pm | 7 +++++++ httemplate/browse/agent.cgi | 2 +- 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 393f068e9..0f774d16c 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -5997,12 +5997,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 8850d36a3..c8c0d4471 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'); 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.

'. qq!Add a customer class

!; -#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 { -- 2.11.0