From: Chuck Scott <cscott@gaslightmedia.com>
Date: Mon, 29 Feb 2016 18:11:26 +0000 (-0500)
Subject: Minor updates to permissions
X-Git-Tag: v1.1.3^2~21
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f0d986e07c1771e6ae6e6fb42ca183205de6a3a9;p=WP-Plugins%2Fglm-member-db-packaging.git

Minor updates to permissions
---

diff --git a/models/admin/management/packaging.php b/models/admin/management/packaging.php
index a0c454d..351b3ce 100644
--- a/models/admin/management/packaging.php
+++ b/models/admin/management/packaging.php
@@ -80,10 +80,13 @@ class GlmMembersAdmin_management_packaging extends GlmDataPackagingManagement
 
     public function modelAction($actionData = false)
     {
+        $packagingSettigns = false;
         $settingsUpdated = false;
+        $settingsUpdateError = false;
+
 
         // Determine if current user can edit configurations
-        if (!current_user_can('glm_members_configure')) {
+        if (!current_user_can('glm_members_management')) {
             return array(
                     'status' => false,
                     'menuItemRedirect' => 'error',
@@ -110,11 +113,10 @@ class GlmMembersAdmin_management_packaging extends GlmDataPackagingManagement
                 $packageSettings = $this->updateEntry(1);
                 if ($packageSettings['status']) {
                     $settingsUpdated = true;
+                } else {
+                    $settingsUpdateError = true;
                 }
 
-                // Display admin message that the data has been updated
-                glmMembersAdmin::addNotice('Packaging Settings for the '.GLM_MEMBERS_PACKAGING_PLUGIN_NAME.' plugin have been updated.', 'AdminNotice');
-
                 break;
 
             // Default is to get the current settings and display the form
@@ -139,8 +141,9 @@ class GlmMembersAdmin_management_packaging extends GlmDataPackagingManagement
         $templateData = array(
             'reason' => '',
             'packagingSettings' => $packageSettings,
-            'settingsUpdated' => $settingsUpdated
-        );
+            'settingsUpdated' => $settingsUpdated,
+            'settingsUpdateError' => $settingsUpdateError
+       );
 
         // Return status, suggested view, and data to controller
         return array(
diff --git a/views/admin/management/packaging.html b/views/admin/management/packaging.html
index a722756..a98a700 100644
--- a/views/admin/management/packaging.html
+++ b/views/admin/management/packaging.html
@@ -1,8 +1,5 @@
 {include file='admin/management/header.html'}
     
-    
-    {if $settingsUpdated}<h2 class="glm-notice glm-flash-updated">Settings Updated</h2>{/if}
-    
     <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
         <input type="hidden" name="glm_action" value="packaging">
         <input type="hidden" name="option" value="submit">
@@ -11,12 +8,18 @@
         
             <!-- General Packaging Settings -->
         
-            <tr><td colspan="2"><h2>General Packaging Settings</h2></td></tr>
             <tr>
-               <th>Package Detail Page Permalink Name:</th>
-                <td>
-                    <input type="text" name="canonical_package_page" value="{$packagingSettings.fieldData.canonical_package_page}">
-                    <br>Use only the page name at the end of the permalink for the package detail page.
+                <td colspan="2">
+                    {if $settingsUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Settings Updated</h2>{/if}
+                    {if $settingsUpdateError}<span class="glm-error glm-flash-updated glm-right">Settings Update Error</span>{/if}
+                    <h2>General Packaging Settings</h2>
+                </td>
+            </tr>
+            <tr>
+                <th {if $packagingSettings.fieldRequired.canonical_package_page}class="glm-required"{/if}>Package Detail Page Permalink Name:</th>
+                <td {if $packagingSettings.fieldFail.canonical_package_page}class="glm-form-bad-input glm-form-bad-input-misc"{/if}>
+                    <input type="text" name="canonical_package_page" value="{$packagingSettings.fieldData.canonical_package_page}" class="glm-form-text-input-medium">
+                    {if $packagingSettings.fieldFail.canonical_package_page}<p>{$packagingSettings.fieldFail.canonical_package_page}</p>{/if}
                 </td>
             </tr>
         </table>