From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 19 Jul 2018 19:30:49 +0000 (-0400)
Subject: Fixed problem with paging forgetting status filter setting.
X-Git-Tag: v1.0.12^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a39d87c7d14777df3832289c0af0387f55af82d2;p=WP-Plugins%2Fglm-member-db-registrations.git

Fixed problem with paging forgetting status filter setting.
---

diff --git a/index.php b/index.php
index 62d0974..deae6ad 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Members Database Event Registrations
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Add-on to integrate registrations into Events add-on.
- * Version: 1.0.11
+ * Version: 1.0.12
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersRegistrationsAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.0.11
+ * @version 1.0.12
  */
 
 // Check that we're being called by WordPress.
@@ -43,7 +43,7 @@ if (!defined('ABSPATH')) {
  *  so that we're sure the other add-ons see an up to date
  *  version from this plugin.
  */
-define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_VERSION', '1.0.11');
+define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_VERSION', '1.0.12');
 define('GLM_MEMBERS_REGISTRATIONS_PLUGIN_DB_VERSION', '1.0.1');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/views/admin/registrations/eventRegistrants.html b/views/admin/registrations/eventRegistrants.html
index d0d4865..00612ba 100644
--- a/views/admin/registrations/eventRegistrants.html
+++ b/views/admin/registrations/eventRegistrants.html
@@ -54,136 +54,115 @@
             </span>
         </p>
     </div>
-</form>
-
-<div class="glm-admin-table-inner glm-admin-table">
-
-    <p><b>Total found:</b> {if $haveRegistrants}{$registrantCount}{else}(none){/if}&nbsp;&nbsp;</p>
 
-    {if $paging}
-    <form method="post" action="{$thisUrl}?page={$thisPage}">
-        <input type="hidden" name="page" value="{$thisPage}">
-        <input type="hidden" name="option" value="registrants">
-        <input type="hidden" name="regEventID" value="{$regEvent.id}">
-        <input type="hidden" name="complete" value="{if $completed}1{else}0{/if}">
-        <input type="hidden" name="textSearch" value="{if $textSearch}{$textSearch}{/if}">
-        <input type="hidden" name="time" value="{if $selectedTime}{$selectedTime}{/if}">
-        <input type="hidden" name="prevStart" value="{$prevStart}">
-        <input type="hidden" name="nextStart" value="{$nextStart}">
-        <input type="hidden" name="limit" value="{$limit}">
-        <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
-        <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
-    </form>
-    {/if}
-
-    {* Attendee Listing Table *}
-    {* Showing the results from reg_request_registrant table *}
-    <table class="wp-list-table striped glm-admin-table-single" style="width: 100%;">
-        <thead>
-            <tr>
-                <th>Name</th>
-                <th>Level</th>
-                <th>Event Date/Time</th>
-                <th>Rate</th>
-                <th>Status</th>
-                <th>Submitted</th>
-                <th>Not Attending</th>
-            </tr>
-        </thead>
-        <tbody>
-        {if $haveRegistrants}
-            {assign var="i" value="0"}
-            {foreach $registrants as $r}
-            <tr id="glmRegAttedeeLine_{$r.id}" class="glm-attendee-line glm-edit-form glm-attendee-{$r.id}{if $i++ is odd by 1}{/if} {if $r.not_attending.value} glm-reg-gray{/if}" data-attendee="{$r.id}">
-                <td>
-                    <span style="clear:right;float:left;display:block;width:100%;">
-                        <span class="glm-attendee-fullname-{$r.id}">{$r.fname} {$r.lname}</span>
-                    </span>
-                </td>
-                <td>{$r.class_name}</td>
-                <td>{$r.event_time_reformatted}</td>
-                <td>{$r.rate_name}</td>
-                <td>{$r.request_status_name}</td>
-                <td>{$r.date_submitted}</td>
-                <td id="glmRegNotAttendingText_{$r.id}">{if $r.not_attending.value}NOT ATTENDING{/if}</td>
-            </tr>
-            <tr id="attendeeLinks_{$r.id}" class="glm-hidden glm-attendee-links"">
-                <td colspan="5" style="padding: .8rem; background-color: #fff;>
-                    <span class="attendee-edit-link">
-                        <a class="glm-edit" href="#" data-registrant="{$r.id}" data-class="{$r.class_id}">Edit {$terms.reg_term_attendee_cap}</a> |
-                    </span>
-                    <span class="attendee-edit-link">
-                        <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-requests&option=requestDashboard&requestID={$r.reg_request}">View Request</a> |
-                    </span>
-                    <span class="attendee-edit-link">
-                        <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&accountID={$r.account.id}">View Account</a> 
-                    </span>
-            {if $r.request_status == 0}
-                    |
-                    <span class="attendee-edit-link">
-                        <a href="{$regUrl}?page=cart&cartId={$r.reg_request}&cartCheck={$r.cartCheck}" target="_cart">Access Cart</a>
-                    </span>
-            {/if}                        
-                
-                </td>
-            </tr>
-            <tr class="glm-edit-form glm-edit-form-{$r.id}{if $r@iteration is div by 2} alternate{/if}" style="display:none; background-color: #fff;">
-                <td colspan="5" style="border: 1px #ccc solid;">
-                    <div class="glm-row" style="margin-bottom: 0px !important; margin-top: .5rem;">
-                        <div id="glm-attendee-{$r.id}" class="glm-columns glm-small-{if apply_filters('glm-members-customfields-plugin-active', false)}6{else}12{/if}">
-                            <b>{$r.account.email}</b>
-                            <p>
-                                <input id="glmRegNotAttending_{$r.id}" type="checkbox" name="not_attending" value="1"{if $r.not_attending.value} checked{/if}> Not Attending<br>
-                                Note that if check this the inventory will be returned to permit another {$terms.reg_term_attendee} to {$terms.reg_term_register}.
-                                If you un-check this it will check to see if inventory is available and if not will not change this to {$terms.reg_term_attending}.
-                            </p>
-                            <label>First Name</label>
-                            <input class="glm-form-text-input-medium" type="text" name="fname" value="{$r.fname}">
-                            <label>Last Name</label>
-                            <input class="glm-form-text-input-medium" type="text" name="lname" value="{$r.lname}">
-                        </div>
-                        {if apply_filters('glm-members-customfields-plugin-active', false)}
-                        <form action="#" id="glm-attendee-form-{$r.id}">
-                            <div class="glm-columns glm-small-5">
-                                <div class="customfields-attendee-{$r.id}">
+    <div class="glm-admin-table-inner glm-admin-table">
+    
+        <p><b>Total found:</b> {if $haveRegistrants}{$registrantCount}{else}(none){/if}&nbsp;&nbsp;</p>
+    
+        {if $paging}
+            <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
+        {/if}
+    
+        {* Attendee Listing Table *}
+        {* Showing the results from reg_request_registrant table *}
+        <table class="wp-list-table striped glm-admin-table-single" style="width: 100%;">
+            <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Level</th>
+                    <th>Event Date/Time</th>
+                    <th>Rate</th>
+                    <th>Status</th>
+                    <th>Submitted</th>
+                    <th>Not Attending</th>
+                </tr>
+            </thead>
+            <tbody>
+            {if $haveRegistrants}
+                {assign var="i" value="0"}
+                {foreach $registrants as $r}
+                <tr id="glmRegAttedeeLine_{$r.id}" class="glm-attendee-line glm-edit-form glm-attendee-{$r.id}{if $i++ is odd by 1}{/if} {if $r.not_attending.value} glm-reg-gray{/if}" data-attendee="{$r.id}">
+                    <td>
+                        <span style="clear:right;float:left;display:block;width:100%;">
+                            <span class="glm-attendee-fullname-{$r.id}">{$r.fname} {$r.lname}</span>
+                        </span>
+                    </td>
+                    <td>{$r.class_name}</td>
+                    <td>{$r.event_time_reformatted}</td>
+                    <td>{$r.rate_name}</td>
+                    <td>{$r.request_status_name}</td>
+                    <td>{$r.date_submitted}</td>
+                    <td id="glmRegNotAttendingText_{$r.id}">{if $r.not_attending.value}NOT ATTENDING{/if}</td>
+                </tr>
+                <tr id="attendeeLinks_{$r.id}" class="glm-hidden glm-attendee-links"">
+                    <td colspan="5" style="padding: .8rem; background-color: #fff;>
+                        <span class="attendee-edit-link">
+                            <a class="glm-edit" href="#" data-registrant="{$r.id}" data-class="{$r.class_id}">Edit {$terms.reg_term_attendee_cap}</a> |
+                        </span>
+                        <span class="attendee-edit-link">
+                            <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-requests&option=requestDashboard&requestID={$r.reg_request}">View Request</a> |
+                        </span>
+                        <span class="attendee-edit-link">
+                            <a href="{$thisUrl}?page=glm-members-admin-menu-registrations-accounts&glm_action=accounts&option=accountDashboard&accountID={$r.account.id}">View Account</a> 
+                        </span>
+                {if $r.request_status == 0}
+                        |
+                        <span class="attendee-edit-link">
+                            <a href="{$regUrl}?page=cart&cartId={$r.reg_request}&cartCheck={$r.cartCheck}" target="_cart">Access Cart</a>
+                        </span>
+                {/if}                        
+                    
+                    </td>
+                </tr>
+                <tr class="glm-edit-form glm-edit-form-{$r.id}{if $r@iteration is div by 2} alternate{/if}" style="display:none; background-color: #fff;">
+                    <td colspan="5" style="border: 1px #ccc solid;">
+                        <div class="glm-row" style="margin-bottom: 0px !important; margin-top: .5rem;">
+                            <div id="glm-attendee-{$r.id}" class="glm-columns glm-small-{if apply_filters('glm-members-customfields-plugin-active', false)}6{else}12{/if}">
+                                <b>{$r.account.email}</b>
+                                <p>
+                                    <input id="glmRegNotAttending_{$r.id}" type="checkbox" name="not_attending" value="1"{if $r.not_attending.value} checked{/if}> Not Attending<br>
+                                    Note that if check this the inventory will be returned to permit another {$terms.reg_term_attendee} to {$terms.reg_term_register}.
+                                    If you un-check this it will check to see if inventory is available and if not will not change this to {$terms.reg_term_attending}.
+                                </p>
+                                <label>First Name</label>
+                                <input class="glm-form-text-input-medium" type="text" name="fname" value="{$r.fname}">
+                                <label>Last Name</label>
+                                <input class="glm-form-text-input-medium" type="text" name="lname" value="{$r.lname}">
+                            </div>
+                            {if apply_filters('glm-members-customfields-plugin-active', false)}
+                            <form action="#" id="glm-attendee-form-{$r.id}">
+                                <div class="glm-columns glm-small-5">
+                                    <div class="customfields-attendee-{$r.id}">
+                                    </div>
                                 </div>
+                            </form>
+                            {/if}
+                        </div>
+                        <div class="glm-row">
+                            <div class="glm-columns glm-small-7">
+                                <button class="glm-cancel button button-secondary" data-registrant="{$r.id}">Cancel</button>
+                                <button class="glm-update button button-secondary" data-registrant="{$r.id}" data-class="{$r.class_id}">Update</button>
                             </div>
-                        </form>
-                        {/if}
-                    </div>
-                    <div class="glm-row">
-                        <div class="glm-columns glm-small-7">
-                            <button class="glm-cancel button button-secondary" data-registrant="{$r.id}">Cancel</button>
-                            <button class="glm-update button button-secondary" data-registrant="{$r.id}" data-class="{$r.class_id}">Update</button>
                         </div>
-                    </div>
-                </td>
-            </tr>
-            {/foreach}
-        {else}
-            <tr class="alternate"><td colspan="2">(no registrants listed)</td></tr>
+                    </td>
+                </tr>
+                {/foreach}
+            {else}
+                <tr class="alternate"><td colspan="2">(no registrants listed)</td></tr>
+            {/if}
+                </tbody>
+            </table>
+    
+    
+        {if $paging}
+            <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
         {/if}
-            </tbody>
-        </table>
-
-
-    {if $paging}
-    <form method="post" action="{$thisUrl}?page={$thisPage}">
-        <input type="hidden" name="page" value="{$thisPage}">
-        <input type="hidden" name="option" value="registrants">
-        <input type="hidden" name="regEventID" value="{$regEvent.id}">
-        <input type="hidden" name="complete" value="{if $completed}1{else}0{/if}">
-        <input type="hidden" name="textSearch" value="{if $textSearch}{$textSearch}{/if}">
-        <input type="hidden" name="time" value="{if $selectedTime}{$selectedTime}{/if}">
-        <input type="hidden" name="prevStart" value="{$prevStart}">
-        <input type="hidden" name="nextStart" value="{$nextStart}">
-        <input type="hidden" name="limit" value="{$limit}">
-        <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
-        <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.reg_term_attendee_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
-    </form>
-    {/if}
+    
+    </div>
 
-</div>
+</form>
 
 {* Export and Print popup form *}
 <div id="exportRegistrantsDialog" title="Export {$terms.reg_term_attendee_plur}">