diff --git a/app/config/permissions.php b/app/config/permissions.php index 297eed7378..12d5045e71 100755 --- a/app/config/permissions.php +++ b/app/config/permissions.php @@ -6,6 +6,7 @@ return array( array( 'permission' => 'superuser', 'label' => 'Super User', + 'note' => 'Determines whether the user has full access to all aspects of the admin. ', ), ), @@ -13,6 +14,7 @@ return array( array( 'permission' => 'admin', 'label' => 'Admin Rights', + 'note' => 'Determines whether the user has access to most aspects of the admin.', ), ), @@ -20,6 +22,7 @@ return array( array( 'permission' => 'reports', 'label' => 'View Reports', + 'note' => 'Determines whether the user has the abiity to view reports.', ), ), @@ -27,6 +30,7 @@ return array( array( 'permission' => 'license_keys', 'label' => 'View License Keys', + 'note' => 'Determines whether the user has the ability to view the license keys assigned to them in their own profile. (Usually granted for lower-level permissions that wouldn\'t normally have access.)', ), ), diff --git a/app/config/version.php b/app/config/version.php index bf540dc7ed..8b9cb796d7 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.1.0-pre', - 'hash_version' => 'v2.1.0-pre-30-g8ea23e6', + 'hash_version' => 'v2.1.0-pre-34-gb16ea61', ); \ No newline at end of file diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php index 284feb69b5..2bab768a84 100755 --- a/app/views/backend/users/edit.blade.php +++ b/app/views/backend/users/edit.blade.php @@ -132,7 +132,7 @@ - + @if (Company::canManageUsersCompanies())
@@ -289,6 +289,8 @@ {{ $area }} @foreach ($permissions as $permission) +

{{{ $permission['note'] }}}

+