From 56de559089cdf81a957419ef9f4dc968a97ceb9e Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 21 Apr 2017 15:41:20 -0400 Subject: [PATCH] Figured out way to have the search only set as current date better. I think it would be better if the From date is only set when they haven't searched anything yet. If they start searching or empty out the from date then it stays empty. --- models/admin/events/list.php | 2 +- views/admin/events/list.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/models/admin/events/list.php b/models/admin/events/list.php index 7e99a1f..ffccd52 100644 --- a/models/admin/events/list.php +++ b/models/admin/events/list.php @@ -645,7 +645,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents $fromDate = date('m/d/Y', strtotime($_REQUEST['fromDate'])); $fromMYSQL = date('Y-m-d', strtotime($fromDate)); $dateWhere = " end_time >= '$fromMYSQL' "; - } else if ( !$filterArchived ) { + } else if ( !isset( $_REQUEST['searched'] ) ) { $fromDate = date('m/d/Y'); $fromMYSQL = date('Y-m-d', strtotime($fromDate)); $dateWhere = " end_time >= '$fromMYSQL' "; diff --git a/views/admin/events/list.html b/views/admin/events/list.html index cf0dc0a..4f019f0 100644 --- a/views/admin/events/list.html +++ b/views/admin/events/list.html @@ -25,6 +25,7 @@ {/if} + -- 2.17.1