From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 22 Jun 2018 16:03:55 +0000 (-0400)
Subject: Updating the edit page
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=68d88fa21195828f92acf2588a4693e9cd42149d;p=WP-Plugins%2Fglm-member-db.git

Updating the edit page

Set to inactive status
change name to drafty - inactive status
---

diff --git a/classes/glmMemberInfoClone.php b/classes/glmMemberInfoClone.php
index e88c2494..0fc5f542 100644
--- a/classes/glmMemberInfoClone.php
+++ b/classes/glmMemberInfoClone.php
@@ -92,7 +92,7 @@ class GlmMemberInfoClone
             $newReferenceName = $cloneType . " - ".$memberInfo['reference_name'];
             $sql = "
                 UPDATE ".$MemberInfo->table."
-                   SET create_time = '$t', modify_time = '$t', status = ".$this->config['status_numb']['Pending'].", reference_name = '".addslashes($newReferenceName)."'
+                   SET create_time = '$t', modify_time = '$t', status = ".$this->config['status_numb']['Inactive'].", reference_name = '".addslashes($newReferenceName)."'
                  WHERE id = $newID
             ;";
             $this->wpdb->query($sql);
diff --git a/config/plugin.ini b/config/plugin.ini
index 2b8b1ddf..61a1320e 100644
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -1,14 +1,14 @@
 ;
 ; Main Configuration File
-; Gaslight Media Members Database Plugin 
+; Gaslight Media Members Database Plugin
 ;
 
 ; Image sizes array is outsize of the sections below and is added to $config after the section is selected.
 ; Any sizes added to this section will used by the Data Abstract to generate that size when images are uploaded.
-;    Crop value: 
+;    Crop value:
 ;       1. If false (default), images will not be cropped.
-;       2. If true, images will be cropped to the specified width/height aspect ratio. 
-    
+;       2. If true, images will be cropped to the specified width/height aspect ratio.
+
 [imageSizes]
 
 large['width'] = 800
@@ -53,7 +53,7 @@ sort_order_numb['Pseudo-Random'] = 20
 ;
 status[10] = 'Active'
 status[20] = 'Pending Review'
-status[30] = 'Inactive'
+status[30] = 'Draft'
 status[90] = 'Archived'
 
 status_numb['Active'] = 10
diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html
index e64a7b2d..b7f91a99 100644
--- a/views/admin/member/memberInfo.html
+++ b/views/admin/member/memberInfo.html
@@ -115,10 +115,10 @@
     </h2>
 
         {if $lockedToMember && apply_filters( 'glm_user_is_moderated', $lockedToMember )}
+            <input class="updateMemberProfile button-secondary glm-right" type="submit" style="margin-left: 10px;"
+                value="Save as Draft">
             <input class="updateMemberProfile button-primary glm-right" type="submit"
-                value="{if $memberInfoID && $memberInfo}Save {$terms.term_member} profile as Draft{else}Save as Draft{/if}">
-            <input class="updateMemberProfile button-primary glm-right" type="submit"
-                value="{if $memberInfoID && $memberInfo}Request Update to {$terms.term_member} profile{else}Request Add new {$terms.term_member} profile{/if}">
+                value="Request Update">
         {else}
             <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}">
         {/if}
diff --git a/views/admin/member/memberInfo/editProfileStatus.html b/views/admin/member/memberInfo/editProfileStatus.html
index bd5f3ae5..a31ed580 100644
--- a/views/admin/member/memberInfo/editProfileStatus.html
+++ b/views/admin/member/memberInfo/editProfileStatus.html
@@ -1,5 +1,7 @@
         <div class="glm-admin-table glm-admin-table-inner">
-            {if !$lockedToMember}
+            {if $lockedToMember && apply_filters( 'glm_user_is_moderated', $lockedToMember )}
+                <input type="hidden" name="status" value="{$memberInfo.fieldData.status.value}" />
+            {else}
                 <div class="glm-row">
                     <h2>Profile Status:</h2>
                     <div class="glm-small-12">