From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 15 Jul 2016 19:07:16 +0000 (-0400)
Subject: Get back to search link to work.
X-Git-Tag: v1.0.0^2~20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=46d1c2a0fb3251fdc233ab32c5f95d850bb90cda;p=WP-Plugins%2Fglm-member-db-leads.git

Get back to search link to work.

I have the Back to Search link working for the add edit page.
This works if they area adding or editing the lead also.
---

diff --git a/models/admin/leads/index.php b/models/admin/leads/index.php
index ec7447c..c3247d7 100644
--- a/models/admin/leads/index.php
+++ b/models/admin/leads/index.php
@@ -132,6 +132,12 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry
         if ( isset( $_REQUEST['search'] ) ) {
             $search = filter_var( $_REQUEST['search'], FILTER_VALIDATE_BOOLEAN);
         }
+        if ( isset( $_REQUEST['back'] ) ) {
+            $back = filter_var( $_REQUEST['back'], FILTER_VALIDATE_BOOLEAN);
+            if ( $back ) {
+                $searching = true;
+            }
+        }
 
         // See if they have a saved search to use.
         $result = $this->wpdb->get_row(
@@ -147,7 +153,6 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry
             $search_id = $result['id'];
             if ( !isset( $_REQUEST['search'] ) ) {
                 $search_params = unserialize( $result['search'] );
-                //$search = true;
             }
         }
 
@@ -284,7 +289,7 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry
             } else  if ( $search_params['to_date'] ) {
                 $where_parts[] = "T.date_submitted <= STR_TO_DATE('{$search_params['to_date']}', '%m/%d/%Y')";
             }
-            if ( isset( $search ) && $search ) {
+            if ( ( isset( $search ) && $search ) || $searching ) {
                 if ( isset( $where_parts ) && !empty( $where_parts ) ) {
                     $where .= ' AND ' . implode( ' AND ', $where_parts );
                 }
@@ -294,7 +299,7 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry
                 if (isset($_REQUEST['pageSelect'])) {
 
                     // If request is for Next
-                    if ($_REQUEST['pageSelect'][0] == 'N') {
+                    if ( isset( $_REQUEST['pageSelect'][0] ) && $_REQUEST['pageSelect'][0] == 'N') {
                         $newStart = $_REQUEST['nextStart'] - 0;
 
                     // Otherwise it must be Previous
@@ -776,6 +781,18 @@ class GlmMembersAdmin_leads_index extends GlmDataLeadEntry
         $templateData['updating_error']    = $updating_error;
         $templateData['inserting']         = $inserting;
         $templateData['inserting_error']   = $inserting_error;
+        $templateData['prev']
+            = ( isset( $_REQUEST['prevStart'] ) )
+            ? $_REQUEST['prevStart']
+            : '';
+        $templateData['next']
+            = ( isset( $_REQUEST['nextStart'] ) )
+            ? $_REQUEST['nextStart']
+            : '';
+        $templateData['page']
+            = ( isset( $_REQUEST['pageSelect'] ) )
+            ? $_REQUEST['pageSelect']
+            : '';
 
 
         // Return status, any suggested view, and any data to controller
diff --git a/views/admin/leads/edit.html b/views/admin/leads/edit.html
index f78701f..4bb15bd 100644
--- a/views/admin/leads/edit.html
+++ b/views/admin/leads/edit.html
@@ -5,12 +5,17 @@
 {if $inserting}<span class="glm-notice glm-flash-updated glm-right">Lead Entry Added</span>{/if}
 {if $inserting_error}<span class="glm-error glm-flash-updated glm-right">Lead Entry Add Error</span>{/if}
 
+<a href="{$thisUrl}?back=1&page={$thisPage}&prevStart={$smarty.request.prevStart}&nextStart={$smarty.request.nextStart}&pageSelect={$smarty.request.pageSelect}">Back To Search</a>
+
 {if $entry.status}
 <form action="{$thisUrl}?page={$thisPage}" method="post">
     <input type="hidden" name="glm_action" value="{$thisAction}" />
     {if !$addingLead}
         <input type="hidden" name="entry" value="{$entry.fieldData.id}" />
         <input type="hidden" name="option" value="update" />
+        <input type="hidden" name="prevStart" value="{$smarty.request.prevStart}" />
+        <input type="hidden" name="nextStart" value="{$smarty.request.nextStart}" />
+        <input type="hidden" name="pageSelect" value="{$smarty.request.pageSelect}" />
     {else}
         <input type="hidden" name="option" value="insert" />
     {/if}
diff --git a/views/admin/leads/index.html b/views/admin/leads/index.html
index 22f893c..8cef4c3 100644
--- a/views/admin/leads/index.html
+++ b/views/admin/leads/index.html
@@ -87,7 +87,9 @@
             </tr>
         {/foreach}
         <tr>
-            <td colspan="2"><input class="button" type="submit" value="Search"></td>
+            <td colspan="2">
+                <input class="button" type="submit" value="Search">
+            </td>
         </tr>
     </table>
 
@@ -117,7 +119,7 @@
                 {if $i++ is odd by 1}<tr>{else}<tr class="alternate">{/if}
                     <td>
                         {if $user_can_edit_leads}
-                            <a href="{$thisUrl}?page={$thisPage}&glm_action=index&option=edit&entry={$lead.id}">
+                        <a href="{$thisUrl}?page={$thisPage}&glm_action=index&option=edit&entry={$lead.id}&prevStart={$prev}&nextStart={$next}&pageSelect={$page}">
                         {/if}
                             {$lead.fname} {$lead.lname}
                         {if $user_can_edit_leads}</a>{/if}