@@ -663,27 +632,24 @@
@can('admin')
-
- @if (!Auth::user()->isSuperUser())
-
{{ trans('admin/users/general.superadmin_permission_warning') }}
- @endif
+ @if (!Auth::user()->isSuperUser())
+
{{ trans('admin/users/general.superadmin_permission_warning') }}
+ @endif
+
+ @if (!Auth::user()->hasAccess('admin'))
+
{{ trans('admin/users/general.admin_permission_warning') }}
+ @endif
+
+
+ {{ trans('permissions.use_groups') }}
+
+
+
+ @include('partials.forms.edit.permissions-base', ['use_inherit' => true, 'groupPermissions' => $userPermissions])
+
+
- @if (!Auth::user()->hasAccess('admin'))
-
{{ trans('admin/users/general.admin_permission_warning') }}
- @endif
-
-
-
-
- | {{ trans('admin/groups/titles.permission') }} |
- {{ trans('admin/groups/titles.grant') }} |
- {{ trans('admin/groups/titles.deny') }} |
- {{ trans('admin/users/table.inherit') }} |
-
-
- @include('partials.forms.edit.permissions-base')
-
@endcan
@@ -731,34 +697,15 @@ $(document).ready(function() {
@endif
});
-
-
- // Check/Uncheck all radio buttons in the group
- $('tr.header-row input:radio').change(function() {
- value = $(this).attr('value');
- area = $(this).data('checker-group');
- $('.radiochecker-'+area+'[value='+value+']').prop('checked', true);
- });
-
- $('.header-name').click(function() {
- $(this).parent().nextUntil('tr.header-row').slideToggle(500);
- });
-
+
$('.tooltip-base').tooltip({container: 'body'})
- $(".superuser").change(function() {
- var perms = $(this).val();
- if (perms =='1') {
- $("#nonadmin").hide();
- } else {
- $("#nonadmin").show();
- }
- });
+
$('#genPassword').pGenerator({
'bind': 'click',
'passwordElement': '#password',
'displayElement': '#generated-password',
- 'passwordLength': {{ ($settings->pwd_secure_min + 5) }},
+ 'passwordLength': {{ ($settings->pwd_secure_min + 9) }},
'uppercase': true,
'lowercase': true,
'numbers': true,
@@ -768,23 +715,6 @@ $(document).ready(function() {
}
});
- $("#optional_user_info").on("click",function(){
- $('#optional_user_details').fadeToggle(100);
- $('#optional_user_info_icon').toggleClass('fa-caret-right fa-caret-down');
- var optional_user_info_open = $('#optional_user_info_icon').hasClass('fa-caret-down');
- document.cookie = "optional_user_info_open="+optional_user_info_open+'; path=/';
- });
-
- var all_cookies = document.cookie.split(';')
- for(var i in all_cookies) {
- var trimmed_cookie = all_cookies[i].trim(' ')
- if (trimmed_cookie.startsWith('optional_user_info_open=')) {
- elems = all_cookies[i].split('=', 2)
- if (elems[1] == 'true') {
- $('#optional_user_info').trigger('click')
- }
- }
- }
$("#two_factor_reset").click(function(){
$("#two_factor_resetrow").removeClass('success');
@@ -816,6 +746,8 @@ $(document).ready(function() {
});
+
+
});
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index a5e1a915f1..23c5e9fe8c 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -426,17 +426,19 @@
@if ($user->groups->count() > 0)
@foreach ($user->groups as $group)
-
@can('superadmin')
{{ $group->name }}
@else
{{ $group->name }}
@endcan
-
@endforeach
@else
--
@endif
+
+ @if ($user->hasIndividualPermissions())
+
{{ trans('admin/users/general.individual_override') }}
+ @endif