From 61f659c95a5c2672b9e60504924ea3c47b1d4bac Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Jul 2016 09:09:06 -0400
Subject: [PATCH] Solved issue with php notice

Was giving an notice about undefined stuff in smarty template.
Adding selected key to the groups array fixed this.
---
 models/admin/settings/leads.php | 12 +++++--
 views/admin/settings/leads.html | 58 ++++++++++++++++++---------------
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/models/admin/settings/leads.php b/models/admin/settings/leads.php
index 5c2068e..30efa3c 100644
--- a/models/admin/settings/leads.php
+++ b/models/admin/settings/leads.php
@@ -143,13 +143,13 @@ class GlmMembersAdmin_settings_leads extends GlmDataInterests
                 case 'updateGroup':
                     if ( $id > 0 ) {
                         $groupData->updateEntry( $id );
-                    } 
+                    }
                     break;
 
                 case 'deleteGroup':
                     if ( $id > 0 ) {
                         $groupData->deleteEntry( $id, true );
-                    } 
+                    }
                     break;
 
                 default:
@@ -165,6 +165,14 @@ class GlmMembersAdmin_settings_leads extends GlmDataInterests
 
         $groups = $groupData->getList();
 
+        // If we have groups, add "selected" element default false;
+        if (is_array($groups)) {
+            reset($groups);
+            while (list($k, $v) = each($groups)) {
+                $groups[$k]['selected'] = false;
+            }
+        }
+
         // Get a current list of interests
         $where = null;
         if ( isset( $_REQUEST['filterGroups'] ) ) {
diff --git a/views/admin/settings/leads.html b/views/admin/settings/leads.html
index 125611b..ba5c2a7 100644
--- a/views/admin/settings/leads.html
+++ b/views/admin/settings/leads.html
@@ -5,20 +5,24 @@
     <a id="glm-groups-list" data-show-table="glm-table-groups" class="glm-settings-tab nav-tab">Groups</a>
 </h2>
 
-<form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
-    <input type="hidden" name="glm_action" value="leads">
-    <p class="right">
-        <b>Filter by Groups:</b>
-        <select id="filterGroups" name="filterGroups[]" multiple="multiple">
-            {foreach $groups as $group}
-            <option value="{$group.id}"{if $group.selected} selected{/if}>{$group.title}</option>
-            {/foreach}
-        </select>
-        <input type="submit" value="Submit" style="margin-right: 2em;">
-    </p>
-</form>
 
 <table id="glm-table-interests" class="glm-admin-table glm-settings-table{if $option2!=''} glm-hidden{/if}">
+    <tr>
+        <td colspan="2">
+            <form action="{$thisUrl}?page={$thisPage}" method="post" id="searchForm">
+                <input type="hidden" name="glm_action" value="leads">
+                <p class="right">
+                    <b>Filter by Groups:</b>
+                    <select id="filterGroups" name="filterGroups[]" multiple="multiple">
+                        {foreach $groups as $group}
+                        <option value="{$group.id}"{if $group.selected} selected{/if}>{$group.title}</option>
+                        {/foreach}
+                    </select>
+                    <input type="submit" value="Submit" style="margin-right: 2em;">
+                </p>
+            </form>
+        </td>
+    </tr>
     <tr><td colspan="2">
         <!-- Add Interests Button and Dialog Box -->
         <div id="newInterestButton" class="button button-primary glm-right">Add an Interest</div>
@@ -54,7 +58,7 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="newInterestCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Add new Interest" class="button button-primary">
-                
+
             </form>
         </div>
 
@@ -101,11 +105,11 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="editInterestCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Update this Interest">
-                
+
             </form>
         </div>
-                    
-    
+
+
         <h2>Interests</h2>
 
         <table class="wp-list-table widefat fixed posts glm-admin-table">
@@ -149,7 +153,7 @@
 </table>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
-        
+
         $("#newInterestDialog").dialog({
             autoOpen: false,
             minWidth: 400,
@@ -216,18 +220,18 @@
             // Clear tabl highlights and hide all tables
             $('.glm-settings-tab').removeClass('nav-tab-active');
             $('.glm-settings-table').addClass('glm-hidden');
-            
+
             // Highlight selected tab
             $(this).addClass('nav-tab-active');
-            
+
             // Show selected table
             var table = $(this).attr('data-show-table');
             $('#' + table).removeClass('glm-hidden');
-            
+
             if (table == 'glm-table-address') {
                 initMap();
             }
-            
+
         });
 
         /*
@@ -262,7 +266,7 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="newGroupCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Add new Group" class="button button-primary">
-                
+
             </form>
         </div>
 
@@ -297,7 +301,7 @@
                 <p><span class="glm-required">*</span> Required</p>
                 <a id="editGroupCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Update this Group">
-                
+
             </form>
         </div>
 
@@ -313,7 +317,7 @@
             {if $haveGroups}
                 {assign var="i" value="0"}
                 {foreach $groups as $t}
-                    {if $i++ is odd by 1} 
+                    {if $i++ is odd by 1}
                         <tr>
                     {else}
                         <tr class="alternate">
@@ -336,7 +340,7 @@
 </table>
 <script type="text/javascript">
     jQuery(document).ready(function($) {
-        
+
         $("#newGroupDialog").dialog({
             autoOpen: false,
             minWidth: 400,
@@ -385,6 +389,6 @@
 
     });
 </script>
-    
-            
+
+
 {include file='admin/footer.html'}
-- 
2.17.1