From 1f17ffb747e202c2d42cb45bad0ca8b0698bdd20 Mon Sep 17 00:00:00 2001
From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 18 Oct 2017 14:55:52 -0400
Subject: [PATCH] changing the member info actions to a generic fields action

using fields for actions instead of member_info and changing the model view structure
---
 models/admin/{memberinfo => fields}/fields.php | 4 ++--
 setup/adminHooks.php                           | 4 ++--
 setup/validActions.php                         | 3 ---
 views/admin/{memberinfo => fields}/fields.html | 0
 4 files changed, 4 insertions(+), 7 deletions(-)
 rename models/admin/{memberinfo => fields}/fields.php (96%)
 rename views/admin/{memberinfo => fields}/fields.html (100%)

diff --git a/models/admin/memberinfo/fields.php b/models/admin/fields/fields.php
similarity index 96%
rename from models/admin/memberinfo/fields.php
rename to models/admin/fields/fields.php
index 372cc4b..b815863 100644
--- a/models/admin/memberinfo/fields.php
+++ b/models/admin/fields/fields.php
@@ -28,7 +28,7 @@ require_once GLM_MEMBERS_FIELDS_PLUGIN_CLASS_PATH.'/data/dataCustomFields.php';
  *            @release SVN: $Id: packaging.php,v 1.0 2011/01/25 19:31:47 cscott
  *            Exp $
  */
-class GlmMembersAdmin_memberinfo_fields extends GlmDataFieldsCustomFields
+class GlmMembersAdmin_fields_fields extends GlmDataFieldsCustomFields
 {
 
     /**
@@ -169,7 +169,7 @@ class GlmMembersAdmin_memberinfo_fields extends GlmDataFieldsCustomFields
             'status'           => true,
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
-            'view'             => 'admin/memberinfo/fields.html',
+            'view'             => 'admin/fields/fields.html',
             'data'             => $template_data
         );
 
diff --git a/setup/adminHooks.php b/setup/adminHooks.php
index 1b83e06..7423add 100644
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@ -44,7 +44,7 @@ add_filter( 'glm-members-customfields-edit', function( $content, $uid ){
  */
 add_filter( 'glm-members-customfields-form', function( $content, $uid, $id ){
     unset( $_REQUEST['glm_action'] );
-    $content = $this->controller( 'memberinfo', 'fields', array( 'uid' => $uid, 'memberId' => $id ), true );
+    $content = $this->controller( 'fields', 'fields', array( 'uid' => $uid, 'memberId' => $id ), true );
     return $content;
 }, 10, 3 );
 /**
@@ -68,7 +68,7 @@ add_filter( 'glm-member-db-member-info-custom-nav', function( $content ){
 
 add_filter( 'glm-member-db-member-info-custom-tab', function( $content, $memberId = '' ){
     unset( $_REQUEST['glm_action'] );
-    $content = $this->controller( 'memberinfo', 'fields', $memberId );
+    $content = $this->controller( 'fields', 'fields', $memberId );
     return $content;
 },1,2);
 add_filter( 'glm-member-db-custom-filter-search', function ( $content ) {
diff --git a/setup/validActions.php b/setup/validActions.php
index 3c2be84..ee086cf 100644
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -59,9 +59,6 @@
 
 $glmMembersFieldsAddOnValidActions = array(
     'adminActions' => array(
-        'memberinfo' => array(
-            'fields' => GLM_MEMBERS_FIELDS_PLUGIN_SLUG,
-        ),
         'ajax' => array(
           'filterSearch' => GLM_MEMBERS_FIELDS_PLUGIN_SLUG,
         ),
diff --git a/views/admin/memberinfo/fields.html b/views/admin/fields/fields.html
similarity index 100%
rename from views/admin/memberinfo/fields.html
rename to views/admin/fields/fields.html
-- 
2.17.1