Added member picklist to event if not accessing as a member.

diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php
index 44b9822..be46841 100644 (file)
--- a/classes/data/dataEvents.php
+++ b/classes/data/dataEvents.php
@@ -198,6 +198,17 @@ class GlmDataEvents extends GlmDataAbstract
                 'use' => 'ilged'
             ),
 
+            // Ref_name (member name - need to update this to be Reference Type aware)
+            'ref_dest' => array (
+                'field' => 'ref_dest',
+                'type' => 'pointer',
+                    'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'members',
+                    'p_field' => 'name',
+                    'p_orderby' => 'name',
+                    'p_blank' => true,
+                'use' => 'a'
+            ),
+
             // Member Name (need to update this to be Reference Type aware
             'ref_name' => array(
                 'field' => 'ref_dest',
@@ -206,7 +217,7 @@ class GlmDataEvents extends GlmDataAbstract
                     'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'members',
                     'p_field' => 'name',
                     'p_static' => true,
-                'use' => 'lge'
+                'use' => ''
             ),
 
             // Hide Address flag

diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html
index f99028e..76def26 100644 (file)
--- a/views/admin/events/editStatus.html
+++ b/views/admin/events/editStatus.html
@@ -2,21 +2,26 @@
 <!-- Status and Description -->
 
     <table id="glm-table-descr" class="glm-admin-table glm-event-table">
+        <tr>
+            <th {if $event.fieldRequired.name}class="glm-required"{/if}>Event Name:</th>
+            <td {if $event.fieldFail.name}class="glm-form-bad-input" data-tabid="glm-event-descr"{/if}>
+                <input type="text" name="name" value="{$event.fieldData.name}" class="glm-form-text-input-medium" placeholder="Name of this event.">
+                {if $event.fieldFail.name}<p>{$event.fieldFail.name}</p>{/if}<br>
+            </td>
+        </tr>
         <tr>
             <th>Member:</th>
             <td>
         {if $haveMember}
                 {$memberData.member_name}
         {else}
-                (n/a)
+                <select name="ref_dest">
+    {foreach $event.fieldData.ref_dest.list as $v}
+                    <option value="{$v.value}"{if $v.default} selected{/if}>{$v.name}</option>
+    {/foreach}
+                </select>
         {/if}
             </td>
-        <tr>
-            <th {if $event.fieldRequired.name}class="glm-required"{/if}>Event Name:</th>
-            <td {if $event.fieldFail.name}class="glm-form-bad-input" data-tabid="glm-event-descr"{/if}>
-                <input type="text" name="name" value="{$event.fieldData.name}" class="glm-form-text-input-medium" placeholder="Name of this event.">
-                {if $event.fieldFail.name}<p>{$event.fieldFail.name}</p>{/if}<br>
-            </td>
         </tr>
 {if $haveEvent}
         <tr>

diff --git a/views/admin/events/list.html b/views/admin/events/list.html
index a585039..8c2d47b 100644 (file)
--- a/views/admin/events/list.html
+++ b/views/admin/events/list.html
@@ -67,13 +67,13 @@
                 </td>
                 <td class="glm-nowrap">
             {if $haveMember}
-                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=events&member={$memberID}&option=edit&event={$e.id}">{$e.name}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=events&member={$memberID}&option=edit&event={$e.id}">{$e.ref_dest}</a>
             {else}
-                    <a href="{$thisUrl}?page={$thisPage}&glm_action=list&option=edit&event={$e.id}">{$e.name}</a>
+                    <a href="{$thisUrl}?page={$thisPage}&glm_action=list&option=edit&event={$e.id}">{$e.ref_dest}</a>
             {/if}
                 </td>
                 <td class="glm-nowrap">
-                    {$e.ref_name}
+                    {$e.ref_dest}
                 </td>
                 <td class="glm-nowrap">
                     {$e.status.name}