From 50f2db3aaf473e9f619261966cb2884dbd7c793c Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Wed, 4 May 2016 15:20:34 -0400 Subject: [PATCH] Last changes before initial deployment --- models/admin/member/packaging.php | 3 ++ models/admin/packaging/index.php | 2 +- setup/adminMenus.php | 20 ++++++++-- setup/adminTabs.php | 66 +++++++++++++++---------------- views/admin/member/packaging.html | 5 ++- views/admin/packaging/index.html | 24 ++++++----- 6 files changed, 71 insertions(+), 49 deletions(-) diff --git a/models/admin/member/packaging.php b/models/admin/member/packaging.php index 221598b..9641aa9 100644 --- a/models/admin/member/packaging.php +++ b/models/admin/member/packaging.php @@ -253,6 +253,9 @@ class GlmMembersAdmin_member_packaging extends GlmDataPackages $packageDeleted = true; } + // Look for matching package elements + // **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** // + case 'list': default: diff --git a/models/admin/packaging/index.php b/models/admin/packaging/index.php index 5c4d09b..fcb6563 100644 --- a/models/admin/packaging/index.php +++ b/models/admin/packaging/index.php @@ -211,7 +211,7 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages } // Look for matching package elements -// **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** // + // **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** // break; diff --git a/setup/adminMenus.php b/setup/adminMenus.php index 0600747..63a5ab9 100644 --- a/setup/adminMenus.php +++ b/setup/adminMenus.php @@ -31,12 +31,26 @@ */ add_submenu_page( - 'glm-members-admin-menu-members', // Parent slug + $mainMenuSlug, // Parent slug 'Packaging', // Page title 'Packaging', // Menu Title - 'glm_members_members', // Capability required + 'glm_members_edit_my_entity', // Capability required 'glm-members-admin-menu-packaging-index', // Menu slug function() {$this->controller('packaging');} ); +/* +// If a contact is logged in (ownEntity isn't false), add Contact Profile menu item +if ($this->config['loggedInUser']['contactUser']) { + + add_submenu_page( + $mainMenuSlug, + 'Packaging', + 'Packaging', + 'glm_members_edit_my_entity', + 'glm-members-admin-menu-packaging-index', + function() {$this->controller('packaging');} + ); + +} -?> +*/ \ No newline at end of file diff --git a/setup/adminTabs.php b/setup/adminTabs.php index 16a2a68..ebfba8a 100644 --- a/setup/adminTabs.php +++ b/setup/adminTabs.php @@ -33,39 +33,39 @@ * */ -if (apply_filters('glm_members_permit_admin_member_packages_tab', true)) { - add_filter('glm-member-db-add-tab-for-member', - function($addOnTabs) { - $newTabs = array( - array( - 'text' => 'Packaging', - 'menu' => 'member', - 'action' => 'packaging' - ) - ); - $addOnTabs = array_merge($addOnTabs, $newTabs); - return $addOnTabs; - } - ); -} +// If user can manage all members +if (current_user_can('glm_members_members')) { + if (apply_filters('glm_members_permit_admin_member_packages_tab', true)) { + add_filter('glm-member-db-add-tab-for-member', + function($addOnTabs) { + $newTabs = array( + array( + 'text' => 'Packaging', + 'menu' => 'member', + 'action' => 'packaging' + ) + ); + $addOnTabs = array_merge($addOnTabs, $newTabs); + return $addOnTabs; + } + ); + } + if (apply_filters('glm_members_permit_admin_members_packaging_tab', true)) { + add_filter('glm-member-db-add-tab-for-management', + function($addOnTabs) { + $newTabs = array( + array( + 'text' => 'Packaging', + 'menu' => 'management', + 'action' => 'packaging' + ) + ); + $addOnTabs = array_merge($addOnTabs, $newTabs); + return $addOnTabs; + } + ); + } -if (apply_filters('glm_members_permit_admin_members_packaging_tab', true)) { - add_filter('glm-member-db-add-tab-for-management', - function($addOnTabs) { - $newTabs = array( - array( - 'text' => 'Packaging', - 'menu' => 'management', - 'action' => 'packaging' - ) - ); - $addOnTabs = array_merge($addOnTabs, $newTabs); - return $addOnTabs; - } - ); -} - - -?> \ No newline at end of file +} \ No newline at end of file diff --git a/views/admin/member/packaging.html b/views/admin/member/packaging.html index 0a11ffb..3df5024 100644 --- a/views/admin/member/packaging.html +++ b/views/admin/member/packaging.html @@ -2,13 +2,13 @@ {if $packageDeleted}

Package Deleted:

-{/if} +{/if} +{if $packageUpdated}

Package Updated

{/if} {if $option == 'edit' || $option == 'add'} {if apply_filters('glm_members_permit_admin_member_packaging_edit_package', true)} - {if $packageUpdated}

Package Updated

{/if} {if $packageError}

Error submitting package, see below...

{/if} {if $option == 'edit'} @@ -153,6 +153,7 @@ {else} +

Display Package

diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html index 8a46ba5..939f267 100644 --- a/views/admin/packaging/index.html +++ b/views/admin/packaging/index.html @@ -32,11 +32,11 @@ {else}

Add new Multi-{$terms.term_member_cap} Package

{/if} - Return to Package List + Return to Package List - + {if $havePackage} @@ -142,8 +142,8 @@ - - + +-- The contents of this div are read by imageUpload.js to use as a template for inserting a new image into the gallery area --
  • @@ -170,11 +170,11 @@
    • Title:{$packageInfo.fieldData.title}
    Active:{$packageInfo.fieldData.active.name}
    - + -- end of template --
    - +--> + @@ -207,6 +208,7 @@ {else} +

    Display Package

    @@ -226,7 +228,9 @@ {else} {if apply_filters('glm_members_permit_admin_members_packaging_add_package', true)} -
      Add a Multi-{$terms.term_member_cap} Package
    + {/if} @@ -258,7 +262,7 @@
    Title:{$packageInfo.fieldData.title}
    Name for URLs:{$packageInfo.fieldData.package_slug}
    {if $p.ref_type.value} - {$p.title} + {$p.title} {else} {$p.title} {/if} -- 2.17.1