Fixed display of archived members in member list

diff --git a/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php b/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php
index 8b972ff..2bee983 100644 (file)
--- a/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php
+++ b/misc/smarty/templates_c/4c287ca0e4946b3d644e61950c851e98e8906d49.file.list.html.php
@@ -1,4 +1,4 @@
-<?php /* Smarty version Smarty-3.1.21-dev, created on 2015-03-09 14:11:56
+<?php /* Smarty version Smarty-3.1.21-dev, created on 2015-03-10 11:33:06
          compiled from "/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/list.html" */ ?>
 <?php /*%%SmartyHeaderCode:33593880254c05ab8e362a8-88978550%%*/if(!defined('SMARTY_DIR')) exit('no direct access allowed');
 $_valid = $_smarty_tpl->decodeProperties(array (
@@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     '4c287ca0e4946b3d644e61950c851e98e8906d49' => 
     array (
       0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/members/list.html',
-      1 => 1425924469,
+      1 => 1426001563,
       2 => 'file',
     ),
   ),
@@ -37,7 +37,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     
     <form class="glm-right" onSubmit="return false;">
        <span<?php if ($_smarty_tpl->tpl_vars['haveFilter']->value) {?> class="glm-notice"<?php }?>><b>List Filters:</b>&nbsp;&nbsp;</span> 
-       <span class="glm-item-container"><input type="checkbox" id="filterArchived" class="listFilter"<?php if ($_smarty_tpl->tpl_vars['filterArchived']->value) {?> checked<?php }?>>Only show Archived</span>&nbsp;&nbsp;
+       <span class="glm-item-container"><input type="checkbox" id="filterArchived" class="listFilter"<?php if ($_smarty_tpl->tpl_vars['filterArchived']->value) {?> checked<?php }?>>Show Archived</span>&nbsp;&nbsp;
        <span class="glm-item-container"><input type="checkbox" id="filterPending" class="listFilter"<?php if ($_smarty_tpl->tpl_vars['filterPending']->value) {?> checked<?php }?>>Only show Pending Information</span>&nbsp;&nbsp;
        <span class="glm-item-container"><input type="text" id="filterName" class="listFilter" value="<?php echo $_smarty_tpl->tpl_vars['filterName']->value;?>
 "> Search</span>

diff --git a/models/admin/members/list.php b/models/admin/members/list.php
index 3146565..da0c6fe 100644 (file)
--- a/models/admin/members/list.php
+++ b/models/admin/members/list.php
@@ -110,10 +110,15 @@ class GlmMembersAdmin_members_list extends GlmDataMembers
             $haveFilter = true;
         }
 
+        // Check if this is a request to show archived members
         if (isset($_REQUEST['filterArchived'])) {
             $where .= " T.access = ".$this->config['memb_access_numb']['Archived'];
             $filterArchived = true;
             $haveFilter = true;
+
+        // If not, don't show them
+        } else {
+            $where .= " T.access != ".$this->config['memb_access_numb']['Archived'];
         }
 
         // Get a current list of members

diff --git a/views/admin/members/list.html b/views/admin/members/list.html
index a25450b..5781ad2 100644 (file)
--- a/views/admin/members/list.html
+++ b/views/admin/members/list.html
@@ -2,7 +2,7 @@
     
     <form class="glm-right" onSubmit="return false;">
        <span{if $haveFilter} class="glm-notice"{/if}><b>List Filters:</b>&nbsp;&nbsp;</span> 
-       <span class="glm-item-container"><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if}>Only show Archived</span>&nbsp;&nbsp;
+       <span class="glm-item-container"><input type="checkbox" id="filterArchived" class="listFilter"{if $filterArchived} checked{/if}>Show Archived</span>&nbsp;&nbsp;
        <span class="glm-item-container"><input type="checkbox" id="filterPending" class="listFilter"{if $filterPending} checked{/if}>Only show Pending Information</span>&nbsp;&nbsp;
        <span class="glm-item-container"><input type="text" id="filterName" class="listFilter" value="{$filterName}"> Search</span>
     </form>