From a14b5c33fde770ce6b142f9e5535b4caffcdf121 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 27 Feb 2016 20:52:46 +0000
Subject: [PATCH] Added missing permission checkboxes and improved image AJAX
 permission responses

---
 app/Http/Controllers/Controller.php           |  5 ++---
 resources/assets/js/controllers.js            | 21 ++++++++++++-------
 resources/lang/en/errors.php                  |  1 +
 resources/views/settings/roles/form.blade.php | 14 ++++++++++---
 4 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index fce479af0..4182743a7 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -68,9 +68,8 @@ abstract class Controller extends BaseController
     protected function showPermissionError()
     {
         Session::flash('error', trans('errors.permission'));
-        throw new HttpResponseException(
-            redirect('/')
-        );
+        $response = request()->wantsJson() ? response()->json(['error' => trans('errors.permissionJson')], 403) : redirect('/', 403);
+        throw new HttpResponseException($response);
     }
 
     /**
diff --git a/resources/assets/js/controllers.js b/resources/assets/js/controllers.js
index 76def6abd..1f7388859 100644
--- a/resources/assets/js/controllers.js
+++ b/resources/assets/js/controllers.js
@@ -118,6 +118,7 @@ module.exports = function (ngApp, events) {
                     page++;
                 });
             }
+
             $scope.fetchData = fetchData;
 
             /**
@@ -130,12 +131,16 @@ module.exports = function (ngApp, events) {
                 $http.put(url, this.selectedImage).then((response) => {
                     events.emit('success', 'Image details updated');
                 }, (response) => {
-                    var errors = response.data;
-                    var message = '';
-                    Object.keys(errors).forEach((key) => {
-                        message += errors[key].join('\n');
-                    });
-                    events.emit('error', message);
+                    if (response.status === 422) {
+                        var errors = response.data;
+                        var message = '';
+                        Object.keys(errors).forEach((key) => {
+                            message += errors[key].join('\n');
+                        });
+                        events.emit('error', message);
+                    } else if (response.status === 403) {
+                        events.emit('error', response.data.error);
+                    }
                 });
             };
 
@@ -158,6 +163,8 @@ module.exports = function (ngApp, events) {
                     // Pages failure
                     if (response.status === 400) {
                         $scope.dependantPages = response.data;
+                    } else if (response.status === 403) {
+                        events.emit('error', response.data.error);
                     }
                 });
             };
@@ -167,7 +174,7 @@ module.exports = function (ngApp, events) {
              * @param stringDate
              * @returns {Date}
              */
-            $scope.getDate = function(stringDate) {
+            $scope.getDate = function (stringDate) {
                 return new Date(stringDate);
             };
 
diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php
index 53785b684..b1a252bf3 100644
--- a/resources/lang/en/errors.php
+++ b/resources/lang/en/errors.php
@@ -8,4 +8,5 @@ return [
 
     // Pages
     'permission' => 'You do not have permission to access the requested page.',
+    'permissionJson' => 'You do not have permission to perform the requested action.'
 ];
\ No newline at end of file
diff --git a/resources/views/settings/roles/form.blade.php b/resources/views/settings/roles/form.blade.php
index b9c47053b..3069896b9 100644
--- a/resources/views/settings/roles/form.blade.php
+++ b/resources/views/settings/roles/form.blade.php
@@ -31,7 +31,9 @@
             </tr>
             <tr>
                 <td>Books</td>
-                <td>@include('settings/roles/checkbox', ['permission' => 'book-create-all'])</td>
+                <td>
+                    <label>@include('settings/roles/checkbox', ['permission' => 'book-create-all']) All</label>
+                </td>
                 <td>
                     <label>@include('settings/roles/checkbox', ['permission' => 'book-update-own']) Own</label>
                     <label>@include('settings/roles/checkbox', ['permission' => 'book-update-all']) All</label>
@@ -43,7 +45,10 @@
             </tr>
             <tr>
                 <td>Chapters</td>
-                <td>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all'])</td>
+                <td>
+                    <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-own']) Own</label>
+                    <label>@include('settings/roles/checkbox', ['permission' => 'chapter-create-all']) All</label>
+                </td>
                 <td>
                     <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-own']) Own</label>
                     <label>@include('settings/roles/checkbox', ['permission' => 'chapter-update-all']) All</label>
@@ -55,7 +60,10 @@
             </tr>
             <tr>
                 <td>Pages</td>
-                <td>@include('settings/roles/checkbox', ['permission' => 'page-create-all'])</td>
+                <td>
+                    <label>@include('settings/roles/checkbox', ['permission' => 'page-create-own']) Own</label>
+                    <label>@include('settings/roles/checkbox', ['permission' => 'page-create-all']) All</label>
+                </td>
                 <td>
                     <label>@include('settings/roles/checkbox', ['permission' => 'page-update-own']) Own</label>
                     <label>@include('settings/roles/checkbox', ['permission' => 'page-update-all']) All</label>