X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/dccb279c84a3f523f1c07ffc4ee4e2b526fd5384..refs/pull/2734/head:/resources/views/users/edit.blade.php

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 54e0ee21a..7fb12bd75 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -8,7 +8,7 @@
         </div>
 
         <section class="card content-wrap">
-            <h1 class="list-heading">{{ $user->id === $currentUser->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
+            <h1 class="list-heading">{{ $user->id === user()->id ? trans('settings.users_edit_profile') : trans('settings.users_edit') }}</h1>
             <form action="{{ url("/http/source.bookstackapp.com/settings/users/{$user->id}") }}" method="post" enctype="multipart/form-data">
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="PUT">
@@ -54,7 +54,7 @@
                 </div>
 
                 <div class="text-right">
-                    <a href="{{  url($currentUser->can('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
+                    <a href="{{  url(userCan('users-manage') ? "/settings/users" : "/") }}" class="button outline">{{ trans('common.cancel') }}</a>
                     @if($authMethod !== 'system')
                         <a href="{{ url("/http/source.bookstackapp.com/settings/users/{$user->id}/delete") }}" class="button outline">{{ trans('settings.users_delete') }}</a>
                     @endif
@@ -63,7 +63,7 @@
             </form>
         </section>
 
-        @if($currentUser->id === $user->id && count($activeSocialDrivers) > 0)
+        @if(user()->id === $user->id && count($activeSocialDrivers) > 0)
             <section class="card content-wrap auto-height">
                 <h2 class="list-heading">{{ trans('settings.users_social_accounts') }}</h2>
                 <p class="text-muted">{{ trans('settings.users_social_accounts_info') }}</p>
@@ -88,41 +88,8 @@
             </section>
         @endif
 
-        {{-- TODO - Review Control--}}
-        @if(($currentUser->id === $user->id && userCan('access-api')) || userCan('manage-users'))
-            <section class="card content-wrap auto-height" id="api_tokens">
-                <div class="grid half">
-                    <div><h2 class="list-heading">{{ trans('settings.users_api_tokens') }}</h2></div>
-                    <div class="text-right pt-xs">
-                        @if(userCan('access-api'))
-                            <a href="{{ $user->getEditUrl('/create-api-token') }}" class="button outline">{{ trans('settings.users_api_tokens_create') }}</a>
-                        @endif
-                    </div>
-                </div>
-                @if (count($user->apiTokens) > 0)
-                    <table class="table">
-                        <tr>
-                            <th>{{ trans('common.name') }}</th>
-                            <th>{{ trans('settings.users_api_tokens_expires') }}</th>
-                            <th></th>
-                        </tr>
-                        @foreach($user->apiTokens as $token)
-                        <tr>
-                            <td>
-                                {{ $token->name }} <br>
-                                <span class="small text-muted italic">{{ $token->client_id }}</span>
-                            </td>
-                            <td>{{ $token->expires_at->format('Y-m-d') ?? '' }}</td>
-                            <td class="text-right">
-                                <a class="button outline small" href="{{ $user->getEditUrl('/api-tokens/' . $token->id) }}">{{ trans('common.edit') }}</a>
-                            </td>
-                        </tr>
-                        @endforeach
-                    </table>
-                @else
-                    <p class="text-muted italic py-m">{{ trans('settings.users_api_tokens_none') }}</p>
-                @endif
-            </section>
+        @if((user()->id === $user->id && userCan('access-api')) || userCan('users-manage'))
+            @include('users.api-tokens.list', ['user' => $user])
         @endif
     </div>