Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/User.php

@@ -74,7 +74,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'password'                => 'required|min:8',
         'locale'                  => 'max:10|nullable',
         'website'                 => 'url|nullable',
-        'manager_id'              => 'nullable|exists:users,id',
+        'manager_id'              => 'nullable|exists:users,id|cant_manage_self',
         'location_id'             => 'exists:locations,id|nullable',
     ];
 

app/Providers/ValidationServiceProvider.php

@@ -107,6 +107,27 @@ public function boot()
             return preg_match('/\p{Z}|\p{S}|\p{P}/', $value);
         });
 
+        Validator::extend('cant_manage_self', function ($attribute, $value, $parameters, $validator) {
+            // $value is the actual *value* of the thing that's being validated
+            // $attribute is the name of the field that the validation is running on - probably manager_id in our case
+            // $parameters are the optional parameters - an array for everything, split on commas. But we don't take any params here.
+            // $validator gives us proper access to the rest of the actual data
+            $data = $validator->getData();
+
+            if(array_key_exists("id", $data)) {
+                if ($value && $value == $data['id']) {
+                    // if you definitely have an ID - you're saving an existing user - and your ID matches your manager's ID - fail.
+                    return false;
+                } else {
+                    return true;
+                }
+            } else {
+                // no 'id' key to compare against (probably because this is a new user)
+                // so it automatically passes this validation
+                return true;
+            }
+        });
+
 
     }
 

config/backup.php

@@ -48,6 +48,7 @@
                  */
                 'exclude' => [
                     base_path('vendor'),
+                    base_path('config'),
                     base_path('node_modules'),
                 ],
 

package-lock.json

@@ -7,7 +7,7 @@
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=eb25d2ec49f730d09431",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=0cfa39cacd9c83b4f53b",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=8dfcf59850a3f5775b8c",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=35602987835e5d50d162",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=6bd9c2420a41eaf96f0b",
     "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=60de5bc2660c35544c4d",
@@ -19,9 +19,9 @@
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71c178700d68294e3413",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
     "/css/dist/all.css": "/css/dist/all.css?id=6e3b75006f2b19d69f37",
-    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
-    "/css/[email protected]": "/css/[email protected]?id=51135dd4d24f88f5de0b",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0cfa39cacd9c83b4f53b",
+    "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
+    "/css/[email protected]": "/css/[email protected]?id=62c67c6a822439e8a4ac",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=8dfcf59850a3f5775b8c",
     "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=6bd9c2420a41eaf96f0b",
     "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=2f665cf40d7348b3f94c",
     "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=4a19f5ae861f98f40bab",

public/css/dist/skins/skin-green-dark.css

@@ -117,6 +117,7 @@
         "hashed_pass"      => "Your current password is incorrect",
         "statuslabel_type" => "You must select a valid status label type",
     ],
+    'cant_manage_self'  => "A user cannot be their own manager",
 
     /*
     |--------------------------------------------------------------------------

public/css/dist/skins/skin-green-dark.min.css

@@ -178,6 +178,9 @@
                 <table
                     data-cookie-id-table="dashActivityReport"
                     data-height="400"
+                    data-pagination="false"
+                    data-id-table="dashActivityReport"
+                    data-side-pagination="server"
                     data-sort-order="desc"
                     data-sort-name="created_at"
                     id="dashActivityReport"

public/mix-manifest.json

@@ -139,9 +139,10 @@
                   <i class="fa fa-bell fa-4x" aria-hidden="true"></i>
                   <br><br>
                   <span class="name">Notifications</span>
+
                 </a>
               </h5>
-              <p class="help-block">Email alerts</p>
+              <p class="help-block">Email alerts, audit settings</p>
             </div>
           </div>
         </div>