From 46a0a15f6d6fe47a06537fe8ff6557a0dc94f625 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 4 Apr 2017 16:01:51 -0400
Subject: [PATCH] Updating Counties.

Check if enable_counties is turned on.
If it is off then take care of the member info edit screen with hidden
field.
If it is on then show the setting tab for counties.
---
 views/admin/member/memberInfo.html              | 4 +++-
 views/admin/member/memberInfo/editLocation.html | 4 +++-
 views/admin/members/index.html                  | 2 +-
 views/admin/settings/header.html                | 5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index d9d89987..85cad94b 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -82,7 +82,9 @@
         <input type="hidden" name="option" value="addNew">
         <input type="hidden" name="create_time" value="now">
       {/if}
-
+      {if !$settings.enable_counties}
+        <input type="hidden" name="county" value="0">
+      {/if}
         <table class="glm-admin-table">
             <tr>
                 <th>{$terms.term_member_cap} Name:</th>
diff --git a/views/admin/member/memberInfo/editLocation.html b/views/admin/member/memberInfo/editLocation.html
index 65c6eef9..291b7e49 100644
--- a/views/admin/member/memberInfo/editLocation.html
+++ b/views/admin/member/memberInfo/editLocation.html
@@ -58,8 +58,9 @@
                     {if $memberInfo.fieldFail.state}<p>{$memberInfo.fieldFail.state}</p>{/if}
                 </td>
             </tr>
+            {if $settings.enable_counties}
             <tr>
-                <th {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>County:</th>
+                <th {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>{$terms.term_county_cap}:</th>
                 <td {if $memberInfo.fieldFail.county}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                     <select name="county">
                         {foreach from=$memberInfo.fieldData.county.list item=v}
@@ -69,6 +70,7 @@
                     {if $memberInfo.fieldFail.county}<p>{$memberInfo.fieldFail.county}</p>{/if}
                 </td>
             </tr>
+            {/if}
             <tr>
                 <th {if $memberInfo.fieldRequired.region}class="glm-required"{/if}>Region:</th>
                 <td {if $memberInfo.fieldFail.region}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
diff --git a/views/admin/members/index.html b/views/admin/members/index.html
index 7183f0a9..c7497946 100644
--- a/views/admin/members/index.html
+++ b/views/admin/members/index.html
@@ -37,7 +37,7 @@
             <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=cities">Click here to add Cities.</a></td>
         </tr>
   {/if}
-  {if !$haveCounties}
+  {if !$haveCounties && $settings.enable_counties}
         <tr>
             <th><span class="glm-error">You do not have any {$terms.term_county_plur} setup.</span></th>
             <td><a href="{$thisUrl}?page=glm-members-admin-menu-settings&glm_action=counties">Click here to add {$terms.term_county_plur_cap}.</a></td>
diff --git a/views/admin/settings/header.html b/views/admin/settings/header.html
index 83a0d87d..ce5b4320 100644
--- a/views/admin/settings/header.html
+++ b/views/admin/settings/header.html
@@ -11,7 +11,10 @@
         <a href="{$thisUrl}?page={$thisPage}&glm_action=cities" class="nav-tab{if $thisAction==cities} nav-tab-active{/if}">Cities</a>
         {if $enable_members}
         <a href="{$thisUrl}?page={$thisPage}&glm_action=regions" class="nav-tab{if $thisAction==regions} nav-tab-active{/if}">Regions</a>
-        <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
+
+            {if $settings.enable_counties}
+            <a href="{$thisUrl}?page={$thisPage}&glm_action=counties" class="nav-tab{if $thisAction==counties} nav-tab-active{/if}">{$terms.term_admin_menu_configure_counties}</a>
+            {/if}
         {/if}
 {foreach $addOnTabs as $a}
         <a href="{$thisUrl}?page={$thisPage}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
-- 
2.17.1