From d4c1612d9332544f0e393ac11342cd9869475d51 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 3 Nov 2016 08:39:56 -0400 Subject: [PATCH] Fix for front list page and edit form. Edit form needs to set hidden field for other_ref_dest if venues are off. Front page fix for when to stop getting next end date. --- models/front/events/list.php | 3 ++- views/admin/events/editLocation.html | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/models/front/events/list.php b/models/front/events/list.php index 7f3935c..731431f 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -166,7 +166,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $event_count = 0; do { $event_count = $this->getEventCountForWeekRange( ++$weeks_to_check ); - } while ( $event_count <= $total_events_wanted && $total_current_events >= $total_events_wanted ); + flush; + } while ( $event_count <= $total_events_wanted && $total_current_events > $total_events_wanted ); $week_string = ( $weeks_to_check === 1 ) ? 'weeks': 'week'; $toDate = date('m/d/Y', strtotime( '+ ' . $weeks_to_check . ' ' . $week_string )); diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html index fd9336d..2870405 100644 --- a/views/admin/events/editLocation.html +++ b/views/admin/events/editLocation.html @@ -22,6 +22,9 @@ +{if !$settings.use_venue_locations} + +{/if}
-- 2.17.1