lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fixed [ch15130] - update the seeder to clear requested assets table

Browse source
This commit is contained in:
snipe 2020-09-08 18:29:02 -07:00
parent 251ef82741
commit 82e0b1ffd8
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database/seeds/DatabaseSeeder.php
View file

@ -49,6 +49,8 @@ class DatabaseSeeder extends Seeder
DB::table('imports')->truncate(); DB::table('imports')->truncate();
DB::table('asset_maintenances')->truncate(); DB::table('asset_maintenances')->truncate();
DB::table('requested_assets')->truncate();
} }
} }

2
resources/views/account/accept/index.blade.php
View file

@ -41,7 +41,7 @@ Accept assets {{ $user->present()->fullName() }}
<tbody> <tbody>
@foreach ($acceptances as $acceptance) @foreach ($acceptances as $acceptance)
<tr> <tr>
<td>{{ $acceptance->checkoutable->present()->name }}</td> <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>
<td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">Accept/Decline</a></td> <td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">Accept/Decline</a></td>
</tr> </tr>
@endforeach @endforeach