From 395db7141d800b721f3ee009ef8230903c35e630 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 11 Oct 2016 11:15:40 -0400 Subject: [PATCH] Update package dashboard Being added for member manager. Uses same model and view file as member contact. --- models/admin/dashboard/packaging.php | 14 ++++++++++++-- setup/adminHooks.php | 10 +++++++++- views/admin/dashboard/packaging.html | 2 ++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/models/admin/dashboard/packaging.php b/models/admin/dashboard/packaging.php index 4e3d59d..b4f5b15 100644 --- a/models/admin/dashboard/packaging.php +++ b/models/admin/dashboard/packaging.php @@ -101,8 +101,10 @@ class GlmMembersAdmin_dashboard_packaging extends GlmDataPackages $success = true; $hasLastDownload = false; $lastSearchDate = ''; - $packages = false; - $havePackages = false; + $packages = false; + $havePackages = false; + $lockedToMember = false; + $memberID = false; // Get list of member events. if ( isset( $this->config['loggedInUser']['contactUser']['ref_dest'] ) @@ -125,6 +127,14 @@ class GlmMembersAdmin_dashboard_packaging extends GlmDataPackages } + } else { + // This should be the Current Packages that are current running. + $where = ''; + $packages = $this->getList( $where, '', true, 'id', 1, 5 ); + // If we have some, tell the template + if ($packages && count($packages['list']) > 0) { + $havePackages = true; + } } // If we have list entries - even if it's an empty list $success = true; diff --git a/setup/adminHooks.php b/setup/adminHooks.php index adba05b..e0d6f93 100644 --- a/setup/adminHooks.php +++ b/setup/adminHooks.php @@ -44,7 +44,6 @@ add_filter('glm-member-db-admin-management-hooksHelp', function($content) { 2 ); - add_filter( 'glm-member-db-dashboard-member-widgets', function ( $member = null ) { @@ -54,3 +53,12 @@ add_filter( 13, 1 ); +add_filter( + 'glm-member-db-dashboard-member-admin-widgets', + function ( $member = null ) { + $content = $this->controller( 'dashboard', 'packaging', $member ); + return $content; + }, + 13, + 1 +); diff --git a/views/admin/dashboard/packaging.html b/views/admin/dashboard/packaging.html index d1c3853..95b2f2c 100644 --- a/views/admin/dashboard/packaging.html +++ b/views/admin/dashboard/packaging.html @@ -2,7 +2,9 @@

Packages + {if $lockedToMember}  Add a New Package for this {$terms.term_member_cap}  + {/if}

-- 2.17.1