Moving the require fields for Michgigan.org so they only effect members.

Admin still should be able to edit event without the newly required
fields.

diff --git a/models/admin/events/list.php b/models/admin/events/list.php
index 63597c4..ee3a8e3 100644 (file)
--- a/models/admin/events/list.php
+++ b/models/admin/events/list.php
@@ -152,11 +152,6 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
 
         // Check if there's a logged in user who is locked to their own entity
         $lockedToMember = apply_filters('glm_members_locked_to_member_id', false);
-        // Check config for michigan_org_requirements
-        if ( $this->config['settings']['michigan_org_requirements'] ) {
-            $this->fields['contact_phone']['required'] = true;
-            $this->fields['contact_email']['required'] = true;
-        }
         if ($lockedToMember) {
             $isModerated = apply_filters('glm_user_is_moderated', $lockedToMember);
             // Also need to check if the setting for member event moderated is on
@@ -167,6 +162,11 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             $this->fields['admin_name']['required']  = true;
             $this->fields['admin_email']['required'] = true;
             $this->fields['admin_phone']['required'] = true;
+            // Check config for michigan_org_requirements
+            if ( $this->config['settings']['michigan_org_requirements'] ) {
+                $this->fields['contact_phone']['required'] = true;
+                $this->fields['contact_email']['required'] = true;
+            }
 
             // Check for Member Menu Use
         } elseif (defined('GLM_EVENTS_MEMBER_MENU')) {