From: Laury GvR <laury@gaslightmedia.com>
Date: Thu, 19 Oct 2017 20:26:47 +0000 (-0400)
Subject: Changes for the custom fields - checking for submission success
X-Git-Tag: v2.10.23^2~35
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=298a921c3ca26fb6603fd9f314cebb2108072543;p=WP-Plugins%2Fglm-member-db.git

Changes for the custom fields - checking for submission success
---

diff --git a/models/admin/management/import.php b/models/admin/management/import.php
index c49b128f..4c880fa2 100644
--- a/models/admin/management/import.php
+++ b/models/admin/management/import.php
@@ -182,7 +182,7 @@ class GlmMembersAdmin_management_import
 
             case 'customfields':
                 $requestedView = 'custom.html';
-                $templateData['content']    = apply_filters( 'glm-members-customfields-edit', '', 'members' );
+                $templateData['content']    = apply_filters( 'glm-members-customfields-edit', GLM_MEMBERS_PLUGIN_SLUG, 'members' );
                 $templateData['thisOption'] = $option;
                 break;
 
diff --git a/models/admin/member/memberInfo.php b/models/admin/member/memberInfo.php
index df3d1acc..498c1d30 100644
--- a/models/admin/member/memberInfo.php
+++ b/models/admin/member/memberInfo.php
@@ -215,6 +215,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
         $memberUpdated                     = false;
         $memberUpdateError                 = false;
         $categories                        = false;
+        $errorMessage                      = false;
         $multipleProfileEnabeled           = $this->config['settings']['enable_multiple_profiles'];
 
         // Check for action option - Should be one of the values in the "switch" statement below
@@ -347,9 +348,9 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                     // Update the member Info data
                     $this->memberInfo = $this->updateEntry($this->memberInfoID, 'id', true);
 
-                    do_action( 'glm-member-db-save-custom-fields', $this->memberInfoID );
-
                     if ($this->memberInfo['status']) {
+                        $successfulCustomField = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
+                        echo "Status of save-custom-fields(hardcoded atm): $successfulCustomField";
                         $memberUpdated = true;
                     } else {
                         $memberUpdateError = true;
@@ -393,7 +394,11 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
 
                     $this->memberInfo = $this->editEntry($this->memberInfoID);
 
-                    do_action( 'glm-member-db-save-custom-fields', $this->memberInfoID );
+                    if ($this->memberInfo['status']) {
+                        $successfulCustomField = apply_filters( 'glm-member-db-save-custom-fields', $this->memberInfoID );
+                        echo "Status of save-custom-fields(hardcoded atm): $successfulCustomField";
+                        $errorMessage = "Test";
+                    }
                 }
 
                 glmClearShortcodeCache();
@@ -514,6 +519,7 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
             'memberInfo'          => $this->memberInfo,
             'memberUpdated'       => $memberUpdated,
             'memberUpdateError'   => $memberUpdateError,
+            'errorMessage'        => $errorMessage,
             'availableAmenities'  => $this->amenities,
             'haveImageGallery'    => $this->haveImageGallery,
             'imageGallery'        => $this->imageGallery,
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index abf07d02..9eea7fca 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -109,6 +109,7 @@
 <!-- Not using this yet       <a id="glm-member-info-additional" data-show-table="glm-table-media" class="glm-member-info-tab nav-tab">Additional Data Fields</a>-->
         {if $memberUpdated}<span class="glm-notice glm-flash-updated glm-right">{$terms.term_member_cap} Profile Updated</span>{/if}
         {if $memberUpdateError}<span class="glm-error glm-flash-updated glm-right">{$terms.term_member_cap} Profile Update Error</span>{/if}
+        {if $errorMessage}<span class="glm-error glm-flash-updated glm-right">{$errorMessage}</span>{/if}
     </h2>
 
         <input class="updateMemberProfile button-primary glm-right" type="submit" value="{if $memberInfoID && $memberInfo}Update {$terms.term_member} profile{else}Add new {$terms.term_member} profile{/if}">