DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

clean up

Browse source
This commit is contained in:
Godfrey M 2022-03-16 09:54:10 -07:00
parent b2f7262cd2
commit 6386fa1c5e
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/ActionlogController.php
View file

@ -3,10 +3,12 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\Helper; use App\Helpers\Helper;
use App\Models\Actionlog;
use Response; use Response;
class ActionlogController extends Controller class ActionlogController extends Controller
{ {
public function displaySig($filename) public function displaySig($filename)
{ {
$this->authorize('view', \App\Models\Asset::class); $this->authorize('view', \App\Models\Asset::class);
@ -16,12 +18,4 @@ class ActionlogController extends Controller
return Response::make($contents)->header('Content-Type', $filetype); return Response::make($contents)->header('Content-Type', $filetype);
} }
public function getStoredEula($filename){
$this->authorize('view', \App\Models\Asset::class);
$file = config('app'.$filename);
return Response::download($file);
}
} }

4
resources/views/hardware/view.blade.php
View file

@ -1093,12 +1093,12 @@
<th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th> <th class="col-sm-2" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
<th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th> <th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
<th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th> <th class="col-sm-2" data-field="note">{{ trans('general.notes') }}</th>
<th class="col-sm-1" data-field="stored_eula_file" data-visible="true" data-formatter="fileUploadFormatter">{{ trans('general.accept_eula') }}</th> <th class="col-sm-1" data-field="stored_eula_file" data-visible="true" data-formatter="fileDownloadFormatter">{{ trans('general.accept_eula') }}</th>
<th class="col-md-3" data-visible="false" data-field="file" data-visible="false" data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th> <th class="col-md-3" data-visible="false" data-field="file" data-visible="false" data-formatter="fileUploadFormatter">{{ trans('general.download') }}</th>
<th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th> <th class="col-sm-2" data-field="log_meta" data-visible="true" data-formatter="changeLogFormatter">{{ trans('admin/hardware/table.changed')}}</th>
</tr> </tr>
</thead> </thead>
@foreach($action_logs as $log) @foreach($asset->assetlog as $log)
<tr> <tr>
<td><i class="{{ Helper::filetype_icon($log->filename) }} icon-med" aria-hidden="true"></i></td> <td><i class="{{ Helper::filetype_icon($log->filename) }} icon-med" aria-hidden="true"></i></td>
<td> <td>

1
resources/views/partials/bootstrap-table.blade.php
View file

@ -7,6 +7,7 @@
<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script> <script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
$(function () { $(function () {
var locale = '{{ config('app.locale') }}'; var locale = '{{ config('app.locale') }}';