From 6ae17df0e14c229b4eeb48924fe46ba76bfee03f Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 2 Nov 2016 16:34:02 -0400 Subject: [PATCH] Setup the event form for venue location. If other_ref_dest is set it will hide the location. --- classes/data/dataEvents.php | 11 +++++++++++ views/admin/events/edit.html | 15 ++++++++++++++- views/admin/events/editLocation.html | 16 ++++++++++++++-- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php index 145811b..4f7f27a 100644 --- a/classes/data/dataEvents.php +++ b/classes/data/dataEvents.php @@ -400,6 +400,17 @@ class GlmDataEvents extends GlmDataAbstract 'use' => 'a' ), + // Other Member Ref for Location + 'other_ref_dest' => array( + 'field' => 'other_ref_dest', + 'type' => 'pointer', + 'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'members', + 'p_field' => 'name', + 'p_orderby' => 'name', + 'p_blank' => true, + 'use' => 'a' + ), + // Admin Reference Type 'admin_ref_type' => array ( 'field' => 'admin_ref_type', diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html index 34184e2..4a7cf3d 100644 --- a/views/admin/events/edit.html +++ b/views/admin/events/edit.html @@ -171,6 +171,7 @@ // Check Use Member Location checkbox memberID = $('#memberSelect').val(); + otherMemberID = $('#useOtherRefDest').val(); if (memberID == '') { // No member selected - Clear checkbox, Dissable checkbox, Show location @@ -178,7 +179,9 @@ $('#useMemberLocationCheckbox').prop('disabled', true); $('#useMemberMessage').addClass('glm-hidden'); $('#notUseMemberMessage').removeClass('glm-hidden'); - $('#locationContainer').removeClass('glm-hidden'); + if ( otherMemberID == '' ) { + $('#locationContainer').removeClass('glm-hidden'); + } } else { @@ -1204,6 +1207,16 @@ } }); + // Hide location if other_ref_dest is set + $('#useOtherRefDest').on('change', function(){ + if ($(this).val()) { + $('#locationContainer').addClass('glm-hidden'); + } else { + $('#locationContainer').removeClass('glm-hidden'); + initLocations(); + } + }); + // Display number of characters remaining in limited field function glmCharsRemaining(f) { var maxChar = f.attr('maxlength'); diff --git a/views/admin/events/editLocation.html b/views/admin/events/editLocation.html index f0b7a05..fd9336d 100644 --- a/views/admin/events/editLocation.html +++ b/views/admin/events/editLocation.html @@ -47,14 +47,26 @@ Uses location data from the selected {$terms.term_member} rather than location data from here. - (To use {$terms.term_member} information instead of this location data, select a {$terms.term_member} for the event in the "Event Desription" tab.) + (To use {$terms.term_member} information instead of this location data, select a {$terms.term_member} for the event in the "Event Description" tab.) + {if $settings.use_venue_locations} + + Venue + + + + + {/if} - + -- 2.17.1