Can now delete Members.

diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index 76e1481..40d64a4 100755 (executable)
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -112,6 +112,13 @@ abstract class GlmDataAbstract
      */\r
     public $optionIncludeSelectListData = true;\r
 
+    /**
+     * Delete Restrictions - Not fully sorted out yet
+     *
+     * @access private
+     */
+    public $deleteRestrictions = false;
+
     /**
      * Constructor
      *

diff --git a/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php b/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php
index 972d49a..bd21250 100644 (file)
--- a/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php
+++ b/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php
@@ -1,4 +1,4 @@
-<?php /* Smarty version Smarty-3.1.21-dev, created on 2015-01-15 05:45:36
+<?php /* Smarty version Smarty-3.1.21-dev, created on 2015-01-15 06:15:32
          compiled from "/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/index.html" */ ?>
 <?php /*%%SmartyHeaderCode:163797333154b6ac77c986e8-14104892%%*/if(!defined('SMARTY_DIR')) exit('no direct access allowed');
 $_valid = $_smarty_tpl->decodeProperties(array (
@@ -7,7 +7,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
     '1be35689c5d30d774f40ebc45e387f5f95c45e90' => 
     array (
       0 => '/var/www/server/wordpress/wp-content/plugins/glm-member-db/views/admin/member/index.html',
-      1 => 1421300732,
+      1 => 1421302521,
       2 => 'file',
     ),
   ),
@@ -19,6 +19,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
   'unifunc' => 'content_54b6ac77cbe666_15018258',
   'variables' => 
   array (
+    'deleted' => 0,
     'member' => 0,
     'thisURL' => 0,
     'thisPage' => 0,
@@ -29,6 +30,7 @@ $_valid = $_smarty_tpl->decodeProperties(array (
 <?php if ($_valid && !is_callable('content_54b6ac77cbe666_15018258')) {function content_54b6ac77cbe666_15018258($_smarty_tpl) {?><?php echo $_smarty_tpl->getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?>
 
 
+  <?php if (!$_smarty_tpl->tpl_vars['deleted']->value) {?>
     <div id="deleteMemberButton" class="button-primary glm-right">Delete this Member</div>
     <div id="deleteMemberDialog" class="glm-dialog-box">
         <center>
@@ -37,16 +39,20 @@ $_valid = $_smarty_tpl->decodeProperties(array (
             <p><div id="deleteMemberCancel" class="button-primary">No, I don't want to delete this member</div></p>
         </center>
     </div>
-    
+  <?php }?>    
     
     <h2><?php echo $_smarty_tpl->tpl_vars['member']->value['name'];?>
 </h2>
 
+  <?php if ($_smarty_tpl->tpl_vars['deleted']->value) {?>
+        <h3 class="glm-notice">Member Has Been Deleted!</h3>
+  <?php } else { ?>
     <?php if ($_smarty_tpl->tpl_vars['member']->value['active']['value']) {?>
         <p>This member is active.</p>
     <?php } else { ?>
         <h3 class="glm-notice">Member Not Active</h3>
     <?php }?>
+  <?php }?>
     
     <table>
         <tr><th class="glm-table-fieldname">Member Name:</th><td><?php echo $_smarty_tpl->tpl_vars['member']->value['name'];?>
@@ -69,7 +75,6 @@ $_valid = $_smarty_tpl->decodeProperties(array (
                });
             $('#deleteMemberConfirm').click( function() {
                 $("#deleteMemberDialog").dialog("close");
-alert('We need to have this select the "archive" field to delete the member.');                
                 window.location.href = "<?php echo $_smarty_tpl->tpl_vars['thisURL']->value;?>
 ?page=<?php echo $_smarty_tpl->tpl_vars['thisPage']->value;?>
 &glm_action=index&option=delete&member_id=<?php echo $_smarty_tpl->tpl_vars['memberID']->value;?>

diff --git a/models/admin/member/index.php b/models/admin/member/index.php
index 44c5de6..3cd0887 100644 (file)
--- a/models/admin/member/index.php
+++ b/models/admin/member/index.php
@@ -103,6 +103,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
         $haveMember = false;
         $memberData = false;
         $memberID = 0;
+        $deleted = false;
 
         // Check if a redirecting model supplied the member ID
         if (isset($redirectData['memberID'])) {
@@ -137,11 +138,20 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
             glmMembersAdmin::addNotice("<b>&nbsp;&nbsp;Member ID specified:</b> $memberID");
         }
 
-        // Try to get existing member data
-        $memberData = $this->getEntry($memberID);
+        // If a delete request has been made, try to delete the member without confirmation
+        if(isset($_REQUEST['option']) && $_REQUEST['option'] == 'delete') {
+            $memberData = $this->deleteEntry($memberID, true);
+            $deleted = $memberData['deleteConfirmed'];
+            $memberID = 0;
+            $haveMember = false;
+
+        } else {
+            // Try to get existing member data
+            $memberData = $this->getEntry($memberID);
+        }
 
         // Check that we have data for the specified member ID
-        if ($memberData !== false) {
+        if (!$deleted && $memberData !== false) {
             $haveMember = true;
         }
 
@@ -154,6 +164,7 @@ class GlmMembersAdmin_member_index extends GlmDataMembers
             'haveMember' => $haveMember,
             'memberID' => $memberID,
             'member' => $memberData,
+            'deleted' => $deleted
         );
 
         // Return status, suggested view, and data to controller

diff --git a/views/admin/member/index.html b/views/admin/member/index.html
index efe643b..6c97c42 100644 (file)
--- a/views/admin/member/index.html
+++ b/views/admin/member/index.html
@@ -1,5 +1,6 @@
 {include file='admin/member/header.html'}
 
+  {if !$deleted}
     <div id="deleteMemberButton" class="button-primary glm-right">Delete this Member</div>
     <div id="deleteMemberDialog" class="glm-dialog-box">
         <center>
@@ -8,15 +9,19 @@
             <p><div id="deleteMemberCancel" class="button-primary">No, I don't want to delete this member</div></p>
         </center>
     </div>
-    
+  {/if}    
     
     <h2>{$member.name}</h2>
 
+  {if $deleted}
+        <h3 class="glm-notice">Member Has Been Deleted!</h3>
+  {else}
     {if $member.active.value}
         <p>This member is active.</p>
     {else}
         <h3 class="glm-notice">Member Not Active</h3>
     {/if}
+  {/if}
     
     <table>
         <tr><th class="glm-table-fieldname">Member Name:</th><td>{$member.name}</td></tr>
@@ -35,8 +40,7 @@
                });
             $('#deleteMemberConfirm').click( function() {
                 $("#deleteMemberDialog").dialog("close");
-alert('We need to have this select the "archive" field to delete the member.');                
-//                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=index&option=delete&member_id={$memberID}";
+                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=index&option=delete&member_id={$memberID}";
             });
             $('#deleteMemberCancel').click( function() {
                 $("#deleteMemberDialog").dialog("close");