Setup the venue for the member if set on event.

If the event has other_ref_dest set then get the member info record from
the name that was set. This will be used for the detail page.

diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php
index 4f7f27a..e0de2f8 100644 (file)
--- a/classes/data/dataEvents.php
+++ b/classes/data/dataEvents.php
@@ -538,13 +538,18 @@ class GlmDataEvents extends GlmDataAbstract
         }
         if ($this->postAddLocations) {
             $r['locations'] = array();
-            if ($r['use_member_location']['value'] ) {
+            if ( $r['use_member_location']['value'] ) {
                 include_once  GLM_MEMBERS_PLUGIN_CLASS_PATH . '/data/dataMemberInfo.php';
                 $memberData = new GlmDataMemberInfo( $this->wpdb, $this->config );
                 $member = $memberData->getActiveInfoForMember((int)$r['ref_dest_id']);
                 $r['member'] = $member;
-                //echo '<pre>$member: ' . print_r($member, true) . '</pre>';
-                //exit;
+            } else if ( $r['other_ref_dest'] ) {
+                // get member id from the name
+                $memberId = get_member_id_by_name( $r['other_ref_dest'], '');
+                include_once  GLM_MEMBERS_PLUGIN_CLASS_PATH . '/data/dataMemberInfo.php';
+                $memberData = new GlmDataMemberInfo( $this->wpdb, $this->config );
+                $member = $memberData->getActiveInfoForMember( (int)$memberId );
+                $r['member'] = $member;
             } else {
                 include_once  GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH . '/data/dataLocations.php';
                 $locationData = new GlmDataEventsLocations( $this->wpdb, $this->config  );

diff --git a/models/front/events/list.php b/models/front/events/list.php
index b1e9cde..fb6e47e 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -656,7 +656,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         if ( $override_default_view === 'yes' ) {
             $calendar_view = "agenda";
         } else if ( $calendar_view[0]['calendar_view'] === "" || empty($calendar_view[0]['calendar_view'] ) ) {
-               $calendar_view = "agenda";
+            $calendar_view = "agenda";
         } else {
             $calendar_view = $calendar_view[0]['calendar_view'];
         }

diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index 153ff32..53f4c5b 100644 (file)
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -23,41 +23,41 @@
                 <div class="small-12 column"><!-- .small-12 .column -->
                     <div class="row"><!-- .row #3 -->
                         {if $event.locations}
-                        <div class="small-10 small-centered medium-5 medium-uncentered columns">
-                            {if $event.locations.lat}
-                            <div id="eventDetailMap">
-                                <div id="eventDetail-map" title="Click to enlarge">map...</div>
-                                <div id="map-dialog"><div id="map_canvas" style="width:500px; height:400px">Loading...</div></div>
+                            <div class="small-10 small-centered medium-5 medium-uncentered columns">
+                                {if $event.locations.lat}
+                                    <div id="eventDetailMap">
+                                        <div id="eventDetail-map" title="Click to enlarge">map...</div>
+                                        <div id="map-dialog"><div id="map_canvas" style="width:500px; height:400px">Loading...</div></div>
+                                    </div>
+                                    <div id="event-lat" rel="{$event.locations.lat}"></div>
+                                    <div id="event-lon" rel="{$event.locations.lon}"></div>
+                                    <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
+                                        <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.locations.name}">
+                                        <input type="hidden" id="EventLat" name="EventLat" value="{$event.locations.lat}">
+                                        <input type="hidden" id="EventLon" name="EventLon" value="{$event.locations.lon}">
+                                        <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
+                                    </form>
+                                {/if}
                             </div>
-                            <div id="event-lat" rel="{$event.locations.lat}"></div>
-                            <div id="event-lon" rel="{$event.locations.lon}"></div>
-                            <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
-                                <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.locations.name}">
-                                <input type="hidden" id="EventLat" name="EventLat" value="{$event.locations.lat}">
-                                <input type="hidden" id="EventLon" name="EventLon" value="{$event.locations.lon}">
-                                <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
-                            </form>
-                            {/if}
-                        </div>
-                        {elseif $event.member && $event.use_member_location.value}
-                        <div class="small-12 medium-5 columns">
-                            {if $event.member.lat}
-                            <div id="eventDetailMap">
-                                <div id="eventDetail-map" title="Click to enlarge">map...</div>
-                                <div id="map-dialog"><div id="map_canvas" style="width:500px; height:400px">Loading...</div></div>
+                        {elseif $event.member && ($event.use_member_location.value || $event.other_ref_dest) }
+                            <div class="small-12 medium-5 columns">
+                                {if $event.member.lat}
+                                    <div id="eventDetailMap">
+                                        <div id="eventDetail-map" title="Click to enlarge">map...</div>
+                                        <div id="map-dialog"><div id="map_canvas" style="width:500px; height:400px">Loading...</div></div>
+                                    </div>
+                                    <div id="event-lat" rel="{$event.member.lat}"></div>
+                                    <div id="event-lon" rel="{$event.member.lon}"></div>
+                                    <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
+                                        <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.member.member_name}">
+                                        <input type="hidden" id="EventLat" name="EventLat" value="{$event.member.lat}">
+                                        <input type="hidden" id="EventLon" name="EventLon" value="{$event.member.lon}">
+                                        <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
+                                    </form>
+                                {/if}
                             </div>
-                            <div id="event-lat" rel="{$event.member.lat}"></div>
-                            <div id="event-lon" rel="{$event.member.lon}"></div>
-                            <form id="EventDrivingDirectionsForm" name="EventDrivingDirectionsForm" flexy:ignore="yes" method="post" action="">
-                                <input type="hidden" id="EventLocation" name="EventLocation" value="{$event.member.member_name}">
-                                <input type="hidden" id="EventLat" name="EventLat" value="{$event.member.lat}">
-                                <input type="hidden" id="EventLon" name="EventLon" value="{$event.member.lon}">
-                                <input type="submit" class="button tiny text-center" id="EventDrivingDirectionSubmit" name="EventDrivingDirectionSubmit" value="Get Driving Directions">
-                            </form>
-                            {/if}
-                        </div>
                         {/if}
-                        <div class="small-12 medium-{if $event.locations || $event.use_member_location.value}7{else}12{/if} column">
+                        <div class="small-12 medium-{if $event.locations || $event.use_member_location.value || $event.other_ref_dest}7{else}12{/if} column">
                             <div id="glm-event-detail-dates">
                                 <div><strong>{$event.dates}</strong>{if $expired} <span style="color:red;">(Expired)</span>{/if}</div>
                                 {if !$event.all_day}
@@ -77,7 +77,7 @@
                                     {if $event.locations.zip} {$event.locations.zip} {/if}
                                     {if $event.locations.phone} {$event.locations.phone} {/if}
                                     </div>
-                                {elseif $event.use_member_location.value}
+                                {elseif $event.use_member_location.value || $event.other_ref_dest}
                                     <div id="glm-event-detail-location">
                                     {if $event.member.member} {$event.member.member}<br> {/if}
                                     {if $event.member.addr1} {$event.member.addr1}<br> {/if}