adding text search capability for custom fields

diff --git a/js/memberManagement.js b/js/memberManagement.js
index 74194cd..a87f7f2 100644 (file)
--- a/js/memberManagement.js
+++ b/js/memberManagement.js
@@ -241,6 +241,7 @@ window.Glma = (function() {
         * 
         */
         textSearch: function(textSearchData){
+            console.log(jQuery('input#'+textSearchData.slug+'-text'));
             var searchResults   = {};
             var listData = {
                 action      : 'glm_members_admin_ajax',
@@ -254,15 +255,18 @@ window.Glma = (function() {
             jQuery('input#'+textSearchData.slug+'-text').autoComplete({
                 minChars:0,
                 source: function( request, response ) {
-                    if( textSearchData.searchType == "list"){
+                    
+                    if( textSearchData.searchType == "list" && !textSearchData.fieldName){
                         listData.text_search = request;
+                    }else if(textSearchData.fieldName){
+                        listData[textSearchData.fieldName] = request;
                     }else{
                         listData.query = request;
                     }
+                    
                     deleteAllFilterFields(listData);
                     updateSearchFilterValues();
                     var queries = getSearchFieldValues();
-                    console.log(queries)
                     mergeProps(listData, queries);
                     
                     jQuery.ajax({

diff --git a/models/admin/ajax/glmTextSearch.php b/models/admin/ajax/glmTextSearch.php
index bf873ba..b6abe13 100644 (file)
--- a/models/admin/ajax/glmTextSearch.php
+++ b/models/admin/ajax/glmTextSearch.php
@@ -98,7 +98,6 @@ class GlmMembersAdmin_ajax_glmTextSearch extends glmMembersAdmin
             $alphaWhere         = ' true ';
             $start = 1;
             $limit = 20;
-    
             $searchData  = $this->controller( 'manageDashboard', 'members', false, true, true);
         }
         

diff --git a/models/admin/manageDashboard/members.php b/models/admin/manageDashboard/members.php
index 82daade..ac24de0 100644 (file)
--- a/models/admin/manageDashboard/members.php
+++ b/models/admin/manageDashboard/members.php
@@ -332,7 +332,7 @@ class GlmMembersAdmin_manageDashboard_members extends GlmDataMembers
             $alphaSelected = strtoupper($actionData['request']['alpha']);
             $alphaWhere .= " AND T.name LIKE '$alphaSelected%'";
         }
-
+       
         // Get full list for all other filters, but not filtered by alpha (that would be silly)
         $alphaList = $this->getAlphaList(' AND '.$where, $alphaSelected);
 

diff --git a/views/admin/manageDashboard/adminSearch/searchHeader.html b/views/admin/manageDashboard/adminSearch/searchHeader.html
index 90dc54f..57ac74d 100644 (file)
--- a/views/admin/manageDashboard/adminSearch/searchHeader.html
+++ b/views/admin/manageDashboard/adminSearch/searchHeader.html
@@ -47,17 +47,7 @@
             </div>
             CUSTOM FIELDS: 
             {apply_filters('glm-member-db-custom-filter-search', '', 'glm-member-db' )}
-            <script>
-                jQuery(function($){
-                    console.log( $("#glm-member-db-cral___bapples-text"))
-                    window.Glma.textSearch({
-                        slug        : 'glm-member-db-cral___bapples',
-                        searchType  : 'list',
-                        glmAction   : "glmTextSearch",
-                        view        : 'list'
-                    });
-                });
-        </script>
+
         </div>
     </div>
 </div>