Fixed up permissions to permit member users to create packages

diff --git a/models/admin/packaging/index.php b/models/admin/packaging/index.php
index 8cf7f01..66ad6d0 100644 (file)
--- a/models/admin/packaging/index.php
+++ b/models/admin/packaging/index.php
@@ -81,6 +81,7 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages
     public function modelAction($actionData = false)
     {
 
+        $lockedToMember = false;
         $success = true;
         $lockedToMember = false;
         $lockedWhereT = 'true';

diff --git a/setup/permissions.php b/setup/permissions.php
index 3b1f839..346c44e 100644 (file)
--- a/setup/permissions.php
+++ b/setup/permissions.php
@@ -61,7 +61,7 @@ add_filter('glm_members_permit_admin_members_packaging_add_package',
 add_filter('glm_members_permit_admin_members_packaging_edit_package',
     function($permit) {
         if (!$permit) { return false; }
-        return current_user_can('glm_members_view_any_member');
+        return current_user_can('glm_members_edit_any_member') || current_user_can('glm_members_edit_my_member');
     }
 );
 

diff --git a/views/admin/packaging/index.html b/views/admin/packaging/index.html
index 212c5d9..ca6b202 100644 (file)
--- a/views/admin/packaging/index.html
+++ b/views/admin/packaging/index.html
@@ -29,16 +29,25 @@
                 </p>
             </div>
         </div>
+      {else}
+      {if $lockedToMember}
+        <h2>Add new Package</h2>
       {else}
         <h2>Add new Multi-{$terms.term_member_cap} Package</h2>
+      {/if}
       {/if}
         <a href="{$thisUrl}?page=glm-members-admin-menu-packaging-index&glm_action=index&option=list" class="button button-primary glm-button glm-right">Return to Package List</a>
         
     
         <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="index">
+      {if $lockedToMember}
+            <input type="hidden" name="ref_type" value="10">
+            <input type="hidden" name="ref_dest" value="{$lockedToMember}">
+      {else}
             <input type="hidden" name="ref_type" value="0">
             <input type="hidden" name="ref_dest" value="0">
+      {/if}
           {if $havePackage}
             <input type="hidden" name="option" value="update">
             <input type="hidden" name="packageID" value="{$packageID}">
@@ -234,10 +243,10 @@
 
 {else} <!-- option is not edit or add -->
     
-  {if apply_filters('glm_members_permit_admin_members_packaging_add_package', true)}
-<!-- Not doing multi-member packaging just yet.  
-    <div id="addPackageButton" class="button button-primary glm-right" title='To create a {$terms.term_member} specific package, select that {$terms.term_member} from the "{$terms.term_member_cap} List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-{$terms.term_member_cap} Package</div> 
--->
+  {if apply_filters('glm_members_permit_admin_member_packaging_add_package', true)}
+    {if $lockedToMember}
+        <div id="addPackageButton" class="button button-primary glm-right">&nbsp;Add a New Package for this {$terms.term_member_cap}&nbsp;</div>
+    {/if}
   {/if}
       
     <!-- Package list selection form -->      
@@ -250,7 +259,6 @@
     </form>
     <br clear="all">
       
-      
     <h2>Packages</h2>
 
     <table class="wp-list-table striped glm-admin-table">
@@ -269,7 +277,11 @@
             <tr>
                 <td class="glm-nowrap">
         {if $p.ref_type.value}
+             {if $lockedToMember} 
                     <a href="{$thisUrl}?page=glm-members-admin-menu-packaging-index&glm_action=index&option=edit&member={$p.ref_dest}&packageID={$p.id}">{$p.title}</a>
+             {else}
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=packaging&option=edit&member={$p.ref_dest}&packageID={$p.id}">{$p.title}</a>
+             {/if}
         {else}
                     <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}">{$p.title}</a>
         {/if}
@@ -301,7 +313,7 @@
     
             // Add Package Button Action
             $('#addPackageButton').click( function() {
-                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=packaging&option=add";
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=index&option=add";
             });
             
             // Date Input