From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 1 Aug 2018 20:07:19 +0000 (-0400)
Subject: Update contact_role field for edit page
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=ec3b0ab32852e0a88b202698513305b0912ed6e2;p=WP-Plugins%2Fglm-member-db-contacts.git

Update contact_role field for edit page

Update the names only for the select option labels to use the short
list. Still using the contact_role from fieldData.
---

diff --git a/classes/data/dataContacts.php b/classes/data/dataContacts.php
index 9e04991..f856fd8 100644
--- a/classes/data/dataContacts.php
+++ b/classes/data/dataContacts.php
@@ -193,7 +193,7 @@ class GlmDataContacts extends GlmDataAbstract
                 'type' => 'list',
                 'list' => $this->config['contact_role_short'],
                 'default' => $this->config['contact_role_numb']['EntityManager'],
-                'use' => 'a'
+                'use' => 'lged'
             ),
 
             // Organization name
diff --git a/models/admin/contacts/index.php b/models/admin/contacts/index.php
index 88af86f..8fb1d0b 100644
--- a/models/admin/contacts/index.php
+++ b/models/admin/contacts/index.php
@@ -802,6 +802,7 @@ class GlmMembersAdmin_contacts_index extends GlmDataContacts
             'contactUpdateError'       => $contactUpdateError,
             'errorMessage'             => false,
             'billingFieldResults'      => $billingFieldResults,
+            'contactRoleShort'         => $this->config['contact_role_short'],
         );
 
         // Return status, any suggested view, and any data to controller
diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index 0368d26..db207ce 100644
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -160,15 +160,15 @@
                                     </i>
                                 </a>
                             </th>
-                            <td {if $contactInfo.fieldFail.contact_role_short}class="glm-form-bad-input"{/if}>
+                            <td {if $contactInfo.fieldFail.contact_role}class="glm-form-bad-input"{/if}>
                                 <select id="contactRoleSelect" name="contact_role">
-                    {foreach from=$contactInfo.fieldData.contact_role_short.list item=v}
+                    {foreach from=$contactInfo.fieldData.contact_role.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                                        {$v.name}
+                                        {$contactRoleShort[$v.value]}
                                     </option>
                     {/foreach}
                                 </select>
-                                {if $contactInfo.fieldFail.contact_role_short}<p>{$contactInfo.fieldFail.contact_role_short}</p>{/if}
+                                {if $contactInfo.fieldFail.contact_role}<p>{$contactInfo.fieldFail.contact_role}</p>{/if}
                             </td>
                         </tr>
                         <tr>