From 1e764ff29d1a032c063d9de87d20c965e1a430b6 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Thu, 15 Jan 2015 01:18:52 -0500 Subject: [PATCH] Can now delete Members. --- lib/GlmDataAbstract/DataAbstract.php | 7 +++++++ ...4f40ebc45e387f5f95c45e90.file.index.html.php | 13 +++++++++---- models/admin/member/index.php | 17 ++++++++++++++--- views/admin/member/index.html | 10 +++++++--- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index 76e14818..40d64a4e 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -112,6 +112,13 @@ abstract class GlmDataAbstract */ public $optionIncludeSelectListData = true; + /** + * 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 972d49af..bd21250a 100644 --- a/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php +++ b/misc/smarty/templates_c/1be35689c5d30d774f40ebc45e387f5f95c45e90.file.index.html.php @@ -1,4 +1,4 @@ - 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 ( getSubTemplate ('admin/member/header.html', $_smarty_tpl->cache_id, $_smarty_tpl->compile_id, 0, null, array(), 0);?> + tpl_vars['deleted']->value) {?>
Delete this Member
@@ -37,16 +39,20 @@ $_valid = $_smarty_tpl->decodeProperties(array (

No, I don't want to delete this member

- +

tpl_vars['member']->value['name'];?>

+ tpl_vars['deleted']->value) {?> +

Member Has Been Deleted!

+ tpl_vars['member']->value['active']['value']) {?>

This member is active.

Member Not Active

+
Member Name: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 = "tpl_vars['thisURL']->value;?> ?page=tpl_vars['thisPage']->value;?> &glm_action=index&option=delete&member_id=tpl_vars['memberID']->value;?> diff --git a/models/admin/member/index.php b/models/admin/member/index.php index 44c5de6c..3cd0887d 100644 --- 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("  Member ID specified: $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 efe643b8..6c97c423 100644 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@ -1,5 +1,6 @@ {include file='admin/member/header.html'} + {if !$deleted}
Delete this Member
@@ -8,15 +9,19 @@

No, I don't want to delete this member

- + {/if}

{$member.name}

+ {if $deleted} +

Member Has Been Deleted!

+ {else} {if $member.active.value}

This member is active.

{else}

Member Not Active

{/if} + {/if} @@ -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"); -- 2.17.1
Member Name:{$member.name}