More subuser Model updates.

This commit is contained in:
Dane Everitt 2017-02-09 19:38:54 -05:00
parent c8f6c93d26
commit 99812b0407
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 54 additions and 55 deletions

View file

@ -51,29 +51,29 @@
@can('view-subuser', $server)<th></th>@endcan
@can('delete-subuser', $server)<th></th>@endcan
</tr>
@foreach($subusers as $user)
@foreach($subusers as $subuser)
<tr>
<td class="text-center middle"><img class="img-circle" src="https://www.gravatar.com/avatar/{{ md5($user->email) }}?s=128" style="height:20px;" alt="User Image"></td>
<td class="middle">{{ $user->username }}
<td class="middle"><code>{{ $user->email }}</code></td>
<td class="text-center middle"><img class="img-circle" src="https://www.gravatar.com/avatar/{{ md5($subuser->user->email) }}?s=128" style="height:20px;" alt="User Image"></td>
<td class="middle">{{ $subuser->user->username }}
<td class="middle"><code>{{ $subuser->user->email }}</code></td>
<td class="middle text-center">
@if($user->use_totp)
@if($subuser->user->use_totp)
<i class="fa fa-lock text-green"></i>
@else
<i class="fa fa-unlock text-red"></i>
@endif
</td>
<td class="middle hidden-xs">{{ $user->created_at }}</td>
<td class="middle hidden-xs">{{ $subuser->user->created_at }}</td>
@can('view-subuser', $server)
<td class="text-center middle">
<a href="{{ route('server.subusers.view', ['server' => $server->uuidShort, 'id' => md5($user->id)]) }}">
<a href="{{ route('server.subusers.view', ['server' => $server->uuidShort, 'id' => $subuser->id]) }}">
<button class="btn btn-xs btn-primary">@lang('server.users.configure')</button>
</a>
</td>
@endcan
@can('delete-subuser', $server)
<td class="text-center middle">
<a href="#/delete/{{ md5($user->id) }}" data-action="delete" data-id="{{ md5($user->id) }}">
<a href="#/delete/{{ $subuser->id }}" data-action="delete" data-id="{{ $subuser->id }}">
<button class="btn btn-xs btn-danger">@lang('strings.revoke')</button>
</a>
</td>

View file

@ -35,7 +35,7 @@
@section('content')
@can('edit-subuser', $server)
<form action="{{ route('server.subusers.view', [ 'uuid' => $server->uuidShort, 'id' => md5($subuser->id) ]) }}" method="POST">
<form action="{{ route('server.subusers.view', [ 'uuid' => $server->uuidShort, 'id' => $subuser->id ]) }}" method="POST">
@endcan
<div class="row">
<div class="col-sm-12">
@ -45,7 +45,7 @@
<label class="control-label">@lang('server.users.new.email')</label>
<div>
{!! csrf_field() !!}
<input type="email" class="form-control" disabled value="{{ $subuser->a_userEmail }}" />
<input type="email" class="form-control" disabled value="{{ $subuser->user->email }}" />
</div>
</div>
</div>