DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-07-17 16:27:16 +01:00
parent d3070a0be1 65dcb2a9bd
commit 2f8306cba8
1 changed files with 70 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
resources/views/livewire/oauth-clients.blade.php
View file

@ -32,14 +32,27 @@
@endif
@if ($clients->count() > 0)
<table class="table table-striped snipe-table">
<table data-cookie-id-table="OAuthClientsTable"
data-pagination="true"
data-id-table="OAuthClientsTable"
data-side-pagination="client"
data-sort-order="desc"
data-sort-name="created_at"
id="OAuthClientsTable"
class="table table-striped snipe-table">
<thead>
<tr>
<th>{{ trans('general.id') }}</th>
<th>{{ trans('general.name') }}</th>
<th>{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
<th>{{ trans('admin/settings/general.oauth_secret') }}</th>
<th><span class="sr-only">{{ trans('general.actions') }}</span></th>
<th data-sortable="true">{{ trans('general.name') }}</th>
<th data-sortable="true">{{ trans('admin/settings/general.oauth_redirect_url') }}</th>
<th data-sortable="true">{{ trans('admin/settings/general.oauth_secret') }}</th>
<th data-sortable="true">{{ trans('general.created_at') }}</th>
<th data-sortable="true">{{ trans('general.updated_at') }}</th>
<th>
<span class="sr-only">
{{ trans('general.actions') }}
</span>
</th>
</tr>
</thead>
<tbody>
@ -57,7 +70,7 @@
<!-- Redirect -->
<td>
{{ $client->redirect }}
<code>{{ $client->redirect }}</code>
</td>
<!-- Secret -->
@ -65,20 +78,33 @@
<code>{{ $client->secret }}</code>
</td>
<td>
{{ $client->created_at ? Helper::getFormattedDateObject($client->created_at, 'datetime', false) : '' }}
</td>
<td>
@if ($client->created_at != $client->updated_at)
{{ $client->updated_at ? Helper::getFormattedDateObject($client->updated_at, 'datetime', false) : '' }}
@endif
</td>
<!-- Edit / Delete Button -->
<td class="text-right">
<a class="action-link btn btn-sm btn-warning"
wire:click="editClient('{{ $client->id }}')"
onclick="$('#modal-edit-client').modal('show');">
<i class="fas fa-pencil-alt" aria-hidden="true"></i><span class="sr-only">{{ trans('general.update') }}</span>
<i class="fas fa-pencil-alt" aria-hidden="true"></i>
<span class="sr-only">
{{ trans('general.update') }}
</span>
</a>
<a class="action-link btn btn-danger btn-sm" wire:click="deleteClient('{{ $client->id }}')">
<i class="fas fa-trash" aria-hidden="true"></i>
<span class="sr-only">
{{ trans('general.delete') }}
</span>
{{ trans('general.delete') }}
</span>
</a>
</td>
</tr>
@ -96,19 +122,34 @@
<div>
<div class="box box-default">
<div class="box-header">
<h2>
<h2 class="box-title">
{{ trans('admin/settings/general.oauth_authorized_apps') }}
</h2>
</div>
<div class="box-body">
<!-- Authorized Tokens -->
<table class="table table-striped snipe-table">
<table data-cookie-id-table="AuthorizedAppsTable"
data-pagination="true"
data-id-table="AuthorizedAppsTable"
data-toolbar="#AuthorizedAppsToolbar"
data-side-pagination="client"
data-sort-order="desc"
data-sort-name="created_at"
id="AuthorizedAppsTable"
class="table table-striped snipe-table">
<thead>
<tr>
<th>{{ trans('general.name') }}</th>
<th>{{ trans('admin/settings/general.oauth_scopes') }}</th>
<th></th>
<th data-sortable="true">{{ trans('general.name') }}</th>
<th data-sortable="true"> {{ trans('account/general.personal_access_token') }}</th>
<th data-sortable="true">{{ trans('admin/settings/general.oauth_scopes') }}</th>
<th data-sortable="true">{{ trans('general.created_at') }}</th>
<th data-sortable="true">{{ trans('general.expires') }}</th>
<th>
<span class="sr-only">
{{ trans('general.actions') }}
</span>
</th>
</tr>
</thead>
@ -120,6 +161,10 @@
{{ $token->client->name }}
</td>
<td>
{{ $token->name }}
</td>
<!-- Scopes -->
<td>
@if(!$token->scopes)
@ -129,6 +174,13 @@
@endif
</td>
<td>
{{ $token->created_at ? Helper::getFormattedDateObject($token->created_at, 'datetime', false) : '' }}
</td>
<td>
{{ $token->expires_at ? Helper::getFormattedDateObject($token->expires_at, 'datetime', false) : '' }}
</td>
<!-- Revoke Button -->
<td>
<a class="btn btn-sm btn-danger pull-right"
@ -354,4 +406,8 @@
</script>
</div>
@section('moar_scripts')
@include ('partials.bootstrap-table')
@endsection