From e0b6285fe355cb105d27714e4afea33916ccd7dd Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Fri, 16 Aug 2019 04:20:38 +0000 Subject: [PATCH 1/3] refactor: use parsed requestPath instead of splitting URI --- html-templates/events/events.tpl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/html-templates/events/events.tpl b/html-templates/events/events.tpl index cc73a032..3dcbe04c 100644 --- a/html-templates/events/events.tpl +++ b/html-templates/events/events.tpl @@ -14,15 +14,14 @@

{_ "Events"} {$total|number_format}

- {$starUrl = explode('*', $.server.REQUEST_URI)} - {$currentGroup = $starUrl[1]} -
- Past Events - Upcoming Events - All Events + {$requestPath = Site::$requestPath} + {$currentGroup = $requestPath[1]} + Past Events + Upcoming Events + All Events
From a62f3a793cb86d6c259b576a84832e24a446aeea Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Tue, 20 Aug 2019 20:08:36 -0400 Subject: [PATCH 2/3] feat: add button for adding event segments --- html-templates/events/event.tpl | 3 ++- php-classes/Emergence/Events/EventsRequestHandler.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/html-templates/events/event.tpl b/html-templates/events/event.tpl index 14037083..21636147 100644 --- a/html-templates/events/event.tpl +++ b/html-templates/events/event.tpl @@ -56,7 +56,8 @@ {if $.User} {/if} diff --git a/php-classes/Emergence/Events/EventsRequestHandler.php b/php-classes/Emergence/Events/EventsRequestHandler.php index cc4572a4..54af8e9f 100644 --- a/php-classes/Emergence/Events/EventsRequestHandler.php +++ b/php-classes/Emergence/Events/EventsRequestHandler.php @@ -76,8 +76,8 @@ public static function handleSegmentsRequest(Event $Event) 'total' => count($Event->Segments) ]); } - - if ($segmentHandle == '*create') { + + if ($segmentHandle == '!create') { return EventSegmentsRequestHandler::handleCreateRequest(EventSegment::create(['Event' => $Event])); } From aad5cc671014568905644f5a2a103fc9a4384c66 Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Tue, 20 Aug 2019 20:08:45 -0400 Subject: [PATCH 3/3] chore: remove commented code --- html-templates/events/event.tpl | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/html-templates/events/event.tpl b/html-templates/events/event.tpl index 21636147..dc2c13da 100644 --- a/html-templates/events/event.tpl +++ b/html-templates/events/event.tpl @@ -95,21 +95,6 @@
{/if} - - {*if $Event->Segments} -
Schedule
-
-
    - {foreach item=Segment from=$Event->Segments} - {$thisDate = date("l, M j", $Segment->StartTime)} - {if $lastDate != $thisDate} -
  1. {$thisDate}
  2. - {$lastDate = $thisDate} - {/if} - {/foreach} -
-
- {/if*}