normalizing all of the widget textsearch data so that it's generic and not referring...

diff --git a/models/admin/ajax/glmTextSearch.php b/models/admin/ajax/glmTextSearch.php
index 0a26fd7..f617627 100644 (file)
--- a/models/admin/ajax/glmTextSearch.php
+++ b/models/admin/ajax/glmTextSearch.php
@@ -7,7 +7,7 @@
  * PHP version 5.5
  *
  * @category glmWordPressPlugin
- * @package  glmMembersDatabase
+ * @entity  glmMembersDatabase
  * @author   Chuck Scott <cscott@gaslightmedia.com>
  * @license  http://www.gaslightmedia.com Gaslightmedia
  * @version  0.1
@@ -79,11 +79,11 @@ class GlmMembersAdmin_ajax_glmTextSearch
             $fields         = $_REQUEST['fields'];
             $table          = filter_var($_REQUEST['table'], FILTER_SANITIZE_STRING);
             $sql            = "SELECT $fields FROM $table where title like '%$searchQuery%'";
-            $packages       = $wpdb->get_results($sql); 
+            $entities       = $wpdb->get_results($sql); 
 
-            foreach($packages as $package){
+            foreach($entities as $entity){
                 $searchData[] = [
-                    $package->title => ["image"=>$package->image ,"packageID" => $package->id, "memberID"=>$package->ref_dest]
+                    $entity->title => ["image"=>$entity->image ,"entityID" => $entity->id, "memberID"=>$entity->ref_dest]
                 ];
             }
         }else{
@@ -91,7 +91,6 @@ class GlmMembersAdmin_ajax_glmTextSearch
         }
         
         $return = array(
-            'test'  => $sql,
             'searchData'    => $searchData        // Where our events list will go
         );
 

diff --git a/views/admin/newDashboard/components/textSearch.html b/views/admin/newDashboard/components/textSearch.html
index 702987a..6288f27 100644 (file)
--- a/views/admin/newDashboard/components/textSearch.html
+++ b/views/admin/newDashboard/components/textSearch.html
@@ -3,6 +3,7 @@
         <input id="{$addon.slug}" type="text" class="glm-widget-search-input search-autocomplete">
         <label for="{$addon.slug}">Search</label>
     </div>
+    
 </div>
 <script>
     jQuery(function($){
@@ -12,7 +13,7 @@
             action      : 'glm_members_admin_ajax',
             glm_action  : 'glmTextSearch',
             table       : '{$widgetField.table}',
-            fields      : '{", "|implode:$widgetField.fields}'
+            fields      : '{$widgetField.fields}'
         }
         $('input.search-autocomplete').autoComplete({
             source: function( request, response ) {
@@ -29,9 +30,9 @@
                                 let searchTitle = Object.keys(data.searchData[i])[0];
                                 let image       = (data.searchData[i][searchTitle].image) ? data.searchData[i][searchTitle].image : null;
                                 let memberID    = data.searchData[i][searchTitle].memberID;   
-                                let packageID   = data.searchData[i][searchTitle].packageID;              
+                                let entityID   = data.searchData[i][searchTitle].entityID;              
                                 searchDropdown.push(searchTitle);
-                                {literal} searchResults[searchTitle] = {image: image, memberID: memberID, packageID: packageID}; {/literal}
+                                {literal} searchResults[searchTitle] = {image: image, memberID: memberID, entityID: entityID}; {/literal}
                             }   
                             {literal} response(searchDropdown); {/literal}
                         }else{
@@ -50,9 +51,8 @@
                 let search = $(item).text();
                 console.log(search)
                 if(search !== "No Results Found"){
-                    // window.location.replace('{ $packagingAdminUrl}&member='+searchResults[search].memberID+"&packageID="+searchResults[search].packageID);
+                    // window.location.replace('{ $packagingAdminUrl}&member='+searchResults[search].memberID+"&entityID="+searchResults[search].entityID);
                 }
-                
             },
             minLength: 3,
         });