Fixed bad parameter references when listing and editing registration events.

diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php
index 255ca1b..3551482 100644 (file)
--- a/classes/data/dataRegEvent.php
+++ b/classes/data/dataRegEvent.php
@@ -129,7 +129,7 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract
                 'field'     => 'event_name',
                 'type'      => 'text',
                 'required'  => true,
-                'use'       => 'lgned'
+                'use'       => 'a'
             ),
 
             // A short code used to reference this event

diff --git a/models/admin/registrations/list.php b/models/admin/registrations/list.php
index 1c46b65..816620f 100644 (file)
--- a/models/admin/registrations/list.php
+++ b/models/admin/registrations/list.php
@@ -26,7 +26,7 @@ class GlmMembersAdmin_registrations_list extends GlmDataRegistrationsRegEvent
      * @access public
      */
     public $wpdb;
-    /**MEMBER
+    /**
      * Plugin Configuration Data
      *
      * @var $config
@@ -104,6 +104,7 @@ class GlmMembersAdmin_registrations_list extends GlmDataRegistrationsRegEvent
         $alphaSelected      = false;
         $haveRegEvents      = false;
         $regEventsCount     = false;
+        $namesList          = false;
         
         // If doing alpha list
         if (isset($_REQUEST['alpha'])) {
@@ -126,7 +127,7 @@ class GlmMembersAdmin_registrations_list extends GlmDataRegistrationsRegEvent
         // Get count of reg event listed
         $regEventsCount = $this->getStats($where);
         
-        // Get stats for number of members found matching current selection criteria (includes alpha selection)
+        // Get stats for number of registration events found matching current selection criteria (includes alpha selection)
         $filteredRegEventsFound = $this->getStats(str_replace('T.', '', $where.$alphaWhere));
         
         // Get a current list of reg events
@@ -147,7 +148,7 @@ class GlmMembersAdmin_registrations_list extends GlmDataRegistrationsRegEvent
             $nextStart = $start + $limit;
         }
         
-        // since we're doing paging, we have to break out just the member data
+        // since we're doing paging, we have to break out just the event data
         $list = $listResult['list'];
         unset($listResult);
         
@@ -164,13 +165,6 @@ class GlmMembersAdmin_registrations_list extends GlmDataRegistrationsRegEvent
             }
         }
         
-        // Add a url for each reg event
-        if ( isset( $list) && is_array( $list ) ) {
-            foreach ($list as $regEvent) {
-                $list[$regEvent['id']]['reg'] = sanitize_title($member['name']);
-            }
-        }
-        
         
         
         
@@ -363,7 +357,17 @@ class GlmMembersAdmin_registrations_list extends GlmDataRegistrationsRegEvent
             'regEventsCount'    => $regEventsCount,
             'haveRegEvents'     => $haveRegEvents,
             'regEvents'         => $list,
-            
+            'alphaList'         => $alphaList,
+            'alphaSelected'     => $alphaSelected,
+            'numbDisplayed'     => $numbDisplayed,
+            'lastDisplayed'     => $lastDisplayed,
+            'paging'            => $paging,
+            'prevStart'         => $prevStart,
+            'nextStart'         => $nextStart,
+            'start'             => $start,
+            'limit'             => $limit,
+            'namesList'         => $namesList,
+            'textSearch'        => $textSearch
         );
         
         // Return status, any suggested view, and any data to controller

diff --git a/views/admin/registrations/list.html b/views/admin/registrations/list.html
index 2f8ff80..6088c70 100644 (file)
--- a/views/admin/registrations/list.html
+++ b/views/admin/registrations/list.html
@@ -1,5 +1,5 @@
 {include file='admin/registrations/header.html'}
-    
+
 <div class="glm-admin-table-inner glm-admin-table">
     <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
         <input type="hidden" name="glm_action" value="list">
@@ -58,106 +58,21 @@
                 </tr>
         {/foreach}
     {else}
-                <tr class="alternate"><td colspan="2">(no {$terms.term_member_plur} listed)</td></tr>
+                <tr class="alternate"><td colspan="2">(no registration events listed)</td></tr>
     {/if}
             </tbody>
         </table>
 
         {if $paging}
-            <input type="Submit" name="pageSelect" value="Previous {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
-            <input type="Submit" name="pageSelect" value="Next {$limit} {$terms.term_member_plur_cap}" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Previous {$limit} Events" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
+            <input type="Submit" name="pageSelect" value="Next {$limit} Events" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
         {/if}
 
     </form>
-
-    <div id="exportMembersDialog" class="glm-dialog-box" title="Export {$terms.term_member_cap} Profiles">
-        <form id="exportForm" action="{$ajaxUrl}" method="post" enctype="multipart/form-data">
-            <input type="hidden" name="action" value="glm_members_admin_ajax">
-            <input type="hidden" name="glm_action" value="membersListExport">
-            <table class="glm-admin-table">
-                <tr>
-                    <th>Categories: </th>
-                    <td>
-                        <select id="exportFilterCategories" name="filterCategories[]" multiple="multiple" size="1">
-            {foreach from=$categories item=v}
-                                <option value="{$v.id}" data-parent="{$v.parent}"{if $v.selected} selected{/if}>
-                                    {if $v.parent_id}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                                </option>
-            {/foreach}
-                        </select>
-                    </td>
-                </tr>
-                <tr><th>Show Archived: </th><td><input type="checkbox" name="filterArchived"></td></tr>
-                <tr><th>Featured Only: </th><td><input type="checkbox" name="filterFeatured"></td></tr>
-                <tr><th>Pending Only: </th><td><input type="checkbox" name="filterPending"></td></tr>
-                <tr><th>Name Search: </th><td><input  class="exportMembersSearch glm-form-text-input-medium" type="text" name="text_search" id="autoTest"><br>
-                        Enter any portion of a {$terms.term_member_cap} name and press enter or select any specific {$terms.term_member_cap} found.
-                    </td></tr>
-                <tr>
-                    <th>Fields to export</th>
-                    <td>
-                        <table padding="3">
-                            <tr>
-                                <td>
-                                    <input type="checkbox" name="exportId"> {$terms.term_member_cap} ID<br>
-                                    <input type="checkbox" name="exportOldId"> Old {$terms.term_member_cap} ID<br>
-                                    <input type="checkbox" name="exportMember" checked> {$terms.term_member_cap} Name<br>
-                                    <input type="checkbox" name="exportReferenceName"> Profile Reference Name<br>
-                                    <input type="checkbox" name="exportAddr1" checked> Address Line #1<br>
-                                    <input type="checkbox" name="exportAddr2" checked> Address Line #2<br>
-                                    <input type="checkbox" name="exportCity" checked> City<br>
-                                    <input type="checkbox" name="exportState" checked> State<br>
-                                    <input type="checkbox" name="exportZip" checked> ZIP/Postal Code<br>
-                                    <input type="checkbox" name="exportCounty" checked> County <br>
-                                    <input type="checkbox" name="exportRegion" checked> Region <br>
-                                </td>
-                                <td>
-                                    <input type="checkbox" name="exportPhone" checked> Phone #<br>
-                                    <input type="checkbox" name="exportTollFree" checked> Toll Free<br>
-                                    <input type="checkbox" name="exportEmail" checked> Main E-Mail<br>
-                                    <input type="checkbox" name="exportPriContactName" checked> Primary Contact Name<br>
-                                    <input type="checkbox" name="exportPriContactEmail" checked> Primary Contact E-Mail<br>
-                                    <input type="checkbox" name="exportUrl" checked> Web Address (URL)<br>
-                                    <input type="checkbox" name="exportCategories" checked> Categories<br>
-                                    <input type="checkbox" name="exportMailingAddr1" checked> Mailing Address Line #1<br>
-                                    <input type="checkbox" name="exportMailingAddr2" checked> Mailing Address Line #2<br>
-                                    <input type="checkbox" name="exportMailingCity" checked> Mailing City<br>
-                                    <input type="checkbox" name="exportMailingState" checked> Mailing State<br>
-                                    <input type="checkbox" name="exportMailingZip" checked> Mailing ZIP/Postal Code<br>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-                <tr>
-                    <th>Export to: </th>
-                    <td>
-                        <input type="radio" name="type" value="print" checked="checked"> Export for Print<br>
-                        <input type="radio" name="type" value="csv"> Export to Spreadsheet (CSV)
-                    </td>
-                </tr>
-            </table>
-            <a id="exportMembersCancel" class="button button-secondary glm-right">Cancel</a>
-            <input type="submit" value="Export" class="button button-primary">
-        </form>
-    </div>
 </div>
     <script type="text/javascript">
         jQuery(document).ready(function($) {
 
-
-            $("#exportMembersDialog").dialog({
-                autoOpen: false,
-                minWidth: 600,
-                dialogClass: "glm-dialog-no-close"
-            });
-            $('#exportMembersButton').click( function() {
-                $("#exportMembersDialog").dialog("open");
-            });
-            $('#exportMembersCancel').click( function() {
-                $("#exportMembersDialog").dialog("close");
-            });
-
             // Filter triggers
             $(".listFilter" ).change( function() {
 
@@ -183,27 +98,20 @@
                 return false;
             });
 
-            // Perform Export
-            $("#glmMembersExport").on( 'click', function() {
-                window.open("{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersListExport&type=print", 'Member Export');
-                return false;
-            });
-
-            // Perform CSV Export
-            $("#glmMembersExportCsv").on( 'click', function() {
-                window.open("{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersListExport&type=csv", 'Member Export CSV');
-                return false;
-            });
 
+/******* THE REST OF THIS NEEDS TO BE REWRITTEN FOR THIS APPLICATION *********/
+            
+            
             /*
-             * Do autocomplete search for member
+             *
+             * Do autocomplete search for registration events
              * label: What will be searched
              * value: What will be displayed when selected
              * id: Member id added so we can go to the member while showing what was selected
              * Also note that autocomplete does not properly render HTML codes, so we
              * "unescape" them for HTML in Smarty.
              */
-
+/*
              var availableTags = [
     {foreach $namesList as $m}
                 { label: "{$m.name|unescape:'html'|replace:'"':''}", value: "{$m.name|unescape:'html'|replace:'"':''}", id: '{$m.id}' },
@@ -242,23 +150,13 @@
                  }
              });
 
-             // No submit on ENTER for pop-up export form
-             jQuery.each($("#exportForm").find('input'), function(){
-                 $(this).bind('keypress keydown keyup', function(e){
-                    if(e.keyCode == 13) {
-                        $( ".exportMembersSearch" ).autocomplete("close");
-                        return false;
-                    }
-                 });
-             });
-
              // Restrict autocomplete list to a certain height with scrollbar
              $('.ui-autocomplete').css('height','200px').css('overflow-y','scroll');
-
+             
              // Expand multi-select on hover
              $('#filterCategories').multiselect();
              $('#exportFilterCategories').multiselect();
-
+*/
 
         });
     </script>