kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Allow user editing in embedded (+ disabled authentication) mode (closes grocy/grocy-desktop#47)

Browse Source
This commit is contained in:
Bernd Bestel
2023-08-19 08:48:52 +02:00
parent 16f686deb8
commit dedbee3181
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
views/layout/default.blade.php
View File

@@ -656,10 +656,8 @@
class="dropdown-item discrete-link link-return"> class="dropdown-item discrete-link link-return">
<i class="fa-solid fa-user-cog"></i> {{ $__t('User settings') }} <i class="fa-solid fa-user-cog"></i> {{ $__t('User settings') }}
</a> </a>
@if(!GROCY_IS_EMBEDDED_INSTALL && !GROCY_DISABLE_AUTH)
<a class="dropdown-item discrete-link permission-USERS_READ" <a class="dropdown-item discrete-link permission-USERS_READ"
href="{{ $U('/users') }}"><i class="fa-solid fa-users"></i>&nbsp;{{ $__t('Manage users') }}</a> href="{{ $U('/users') }}"><i class="fa-solid fa-users"></i>&nbsp;{{ $__t('Manage users') }}</a>
@endif
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@if(!GROCY_DISABLE_AUTH) @if(!GROCY_DISABLE_AUTH)
<a class="dropdown-item discrete-link" <a class="dropdown-item discrete-link"

2
views/userform.blade.php
View File

@@ -63,6 +63,7 @@
value="@if($mode == 'edit'){{ $user->last_name }}@endif"> value="@if($mode == 'edit'){{ $user->last_name }}@endif">
</div> </div>
@if(!GROCY_IS_EMBEDDED_INSTALL && !GROCY_DISABLE_AUTH)
@if(!defined('GROCY_EXTERNALLY_MANAGED_AUTHENTICATION')) @if(!defined('GROCY_EXTERNALLY_MANAGED_AUTHENTICATION'))
@if($mode == 'edit') @if($mode == 'edit')
<div class="form-group mb-1"> <div class="form-group mb-1">
@@ -115,6 +116,7 @@
id="password_confirm" id="password_confirm"
value="x"> value="x">
@endif @endif
@endif
@include('components.userfieldsform', array( @include('components.userfieldsform', array(
'userfields' => $userfields, 'userfields' => $userfields,

2
views/users.blade.php
View File

@@ -97,12 +97,14 @@
title="{{ $__t('Edit this item') }}"> title="{{ $__t('Edit this item') }}">
<i class="fa-solid fa-edit"></i> <i class="fa-solid fa-edit"></i>
</a> </a>
@if(!GROCY_IS_EMBEDDED_INSTALL && !GROCY_DISABLE_AUTH)
<a class="btn btn-info btn-sm" <a class="btn btn-info btn-sm"
href="{{ $U('/user/' . $user->id . '/permissions') }}" href="{{ $U('/user/' . $user->id . '/permissions') }}"
data-toggle="tooltip" data-toggle="tooltip"
title="{{ $__t('Configure user permissions') }}"> title="{{ $__t('Configure user permissions') }}">
<i class="fa-solid fa-lock"></i> <i class="fa-solid fa-lock"></i>
</a> </a>
@endif
<a class="btn btn-danger btn-sm user-delete-button @if($user->id == GROCY_USER_ID) disabled @endif" <a class="btn btn-danger btn-sm user-delete-button @if($user->id == GROCY_USER_ID) disabled @endif"
href="#" href="#"
data-user-id="{{ $user->id }}" data-user-id="{{ $user->id }}"