A free open source IT asset/license management system
Working, but there’s a bit of a jitter I need to fix
snipeb937bea04ff0
diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.phpindex e416c5e7ba..5fc6c1c59a 100644--- a/resources/views/partials/forms/edit/permissions-base.blade.php+++ b/resources/views/partials/forms/edit/permissions-base.blade.php@@ -4,13 +4,13 @@@php$localPermission = $area_permission[0];@endphp- <div id="{{ str_slug($localPermission['permission'])}}" class="form-group remember-toggle {{ ($localPermission['permission']!='superuser') ? ' nonsuperuser' : '' }}{{ ( ($localPermission['permission']!='superuser') && ($localPermission['permission']!='admin')) ? ' nonadmin' : '' }}">+ <div id="{{ str_slug($localPermission['permission'])}}" class="form-group {{ (count($area_permission) > 2) ? ' remember-toggle': '' }}{{ ($localPermission['permission']!='superuser') ? ' nonsuperuser' : '' }}{{ ( ($localPermission['permission']!='superuser') && ($localPermission['permission']!='admin')) ? ' nonadmin' : '' }}"><div class="callout callout-legend col-md-12"><div class="col-md-10">- <a id="toggled_remember-toggle-{{ str_slug($localPermission['permission'])}}">+ <a><h4>- @if (count($area_permission) > 1)- <x-icon type="caret-down" id="toggle-arrow-{{ str_slug($localPermission['permission'])}}" />+ @if (count($area_permission) > 2)+ <x-icon type="caret-down" class="fa-fw" id="toggle-arrow-{{ str_slug($localPermission['permission'])}}" />@endif{{ trans('permissions.'.str_slug($area).'.name') }}</h4>@@ -98,14 +98,14 @@</div></div>- @if (count($area_permission) > 1)+ @if (count($area_permission) > 2)@foreach ($area_permission as $index => $this_permission)@if ($this_permission['display'])@php$section_translation = trans('permissions.'.str_slug($this_permission['permission']).'.name');@endphp- <div class="toggle-content-{{ str_slug($localPermission['permission']) }} {{ ($localPermission['permission']!='superuser') ? ' nonsuperuser' : '' }}{{ ( ($localPermission['permission']!='superuser') && ($localPermission['permission']!='admin')) ? ' nonadmin' : '' }}">+ <div id="{{ str_slug($this_permission['permission']) }}" class="toggle-content-{{ str_slug($localPermission['permission']) }} {{ ($localPermission['permission']!='superuser') ? ' nonsuperuser' : '' }}{{ ( ($localPermission['permission']!='superuser') && ($localPermission['permission']!='admin')) ? ' nonadmin' : '' }}"><div class="form-group" style="border-bottom: 1px solid #eee; padding-right: 13px;"><div class="col-md-10"><strong>{{ $section_translation }}</strong>diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.phpindex dde6545786..bca1958e48 100755--- a/resources/views/users/edit.blade.php+++ b/resources/views/users/edit.blade.php@@ -723,13 +723,18 @@ $(document).ready(function() {var toggleable_callout_id = $(this).attr('id');var toggle_content_id = 'toggle-content-'+$(this).attr('id');var toggle_arrow = '#toggle-arrow-' + toggleable_callout_id;- var toggle_cookie_name = 'toggle_state_' + toggleable_callout_id;+ var toggle_cookie_name='toggle_state_'+toggleable_callout_id;++ console.log('Callout ID: ' + toggleable_callout_id);+ console.log('Content ID: '+toggle_content_id);+ console.log('Arrow ID: '+toggle_arrow);+ console.log('Cookie Name: '+toggle_cookie_name);$('.'+toggle_content_id).fadeToggle(100);$(toggle_arrow).toggleClass('fa-caret-right fa-caret-down');var toggle_open = $(toggle_arrow).hasClass('fa-caret-down');- alert(toggle_open);- document.cookie = toggle_cookie_name+"="+toggle_open+'; path=/';+ console.log('Cookie will set open state to: '+toggle_open);+ document.cookie=toggle_cookie_name+"="+toggle_open+';path=/';});@@ -747,6 +752,7 @@ $(document).ready(function() {for (var i in all_cookies) {var trimmed_cookie = all_cookies[i].trim(' ')elems = all_cookies[i].split('=', 2);+ console.log(elems);if (trimmed_cookie.startsWith('optional_user_info_open=')) {@@ -759,10 +765,11 @@ $(document).ready(function() {if (trimmed_cookie.startsWith('toggle_state_')) {// alert('toggle cookies exist!');// alert(elems);- var toggle_selector_name = elems[0].replace('toggle_state_','');- if (elems[1] == 'false') {- // alert(toggle_selector_name);- $('.' + toggle_selector_name).trigger('click')+ var toggle_selector_name = elems[0].replace(' toggle_state_','');+ console.log('Browser Cookie Name:'+elems[0]);+ if (elems[1] != 'true') {+ console.log('Selector name for cookie click trigger: '+toggle_selector_name);+ $('#'+toggle_selector_name+'.remember-toggle').trigger('click')}}