Allow models uploads

Signed-off-by: snipe <snipe@snipe.net>

app/Http/Controllers/AssetModelsFilesController.php

@@ -0,0 +1,155 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\StorageHelper;
+use App\Http\Requests\AssetFileRequest;
+use App\Models\Actionlog;
+use App\Models\AssetModel;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
+use enshrined\svgSanitize\Sanitizer;
+
+class AssetModelsFilesController extends Controller
+{
+    /**
+     * Upload a file to the server.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param AssetFileRequest $request
+     * @param int $modelId
+     * @return Redirect
+     * @since [v1.0]
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function store(AssetFileRequest $request, $modelId = null)
+    {
+        if (! $model = AssetModel::find($modelId)) {
+            return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $model);
+
+        if ($request->hasFile('file')) {
+            if (! Storage::exists('private_uploads/assetmodels')) {
+                Storage::makeDirectory('private_uploads/assetmodels', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+
+                $extension = $file->getClientOriginalExtension();
+                $file_name = 'model-'.$model->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
+
+                // Check for SVG and sanitize it
+                if ($extension=='svg') {
+                    \Log::debug('This is an SVG');
+
+                    $sanitizer = new Sanitizer();
+                    $dirtySVG = file_get_contents($file->getRealPath());
+                    $cleanSVG = $sanitizer->sanitize($dirtySVG);
+
+                    try {
+                        Storage::put('private_uploads/assetmodels/'.$file_name, $cleanSVG);
+                    } catch (\Exception $e) {
+                        \Log::debug('Upload no workie :( ');
+                        \Log::debug($e);
+                    }
+                } else {
+                    Storage::put('private_uploads/assetmodels/'.$file_name, file_get_contents($file));
+                }
+
+
+                $model->logUpload($file_name, e($request->get('notes')));
+            }
+
+            return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
+        }
+
+        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show($modelId = null, $fileId = null, $download = true)
+    {
+        $model = AssetModel::find($modelId);
+        // the asset is valid
+        if (isset($model->id)) {
+            $this->authorize('view', $model);
+
+            if (! $log = Actionlog::find($fileId)) {
+                return response('No matching record for that model/file', 500)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            $file = 'private_uploads/assetmodels/'.$log->filename;
+            \Log::debug('Checking for '.$file);
+
+
+            if (! Storage::exists($file)) {
+                return response('File '.$file.' not found on server', 404)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            if ($download != 'true') {
+                if ($contents = file_get_contents(Storage::url($file))) {
+                    return Response::make(Storage::url($file)->header('Content-Type', mime_content_type($file)));
+                }
+
+                return JsonResponse::create(['error' => 'Failed validation: '], 500);
+            }
+
+            return StorageHelper::downloader($file);
+        }
+        // Prepare the error message
+        $error = trans('admin/hardware/message.does_not_exist', ['id' => $fileId]);
+
+        // Redirect to the hardware management page
+        return redirect()->route('hardware.index')->with('error', $error);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     * @return View
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($modelId = null, $fileId = null)
+    {
+        $model = AssetModel::find($modelId);
+        $this->authorize('update', $model);
+        $rel_path = 'private_uploads/assetmodels';
+
+        // the asset is valid
+        if (isset($model->id)) {
+            $this->authorize('update', $model);
+            $log = Actionlog::find($fileId);
+            if ($log) {
+                if (Storage::exists($rel_path.'/'.$log->filename)) {
+                    Storage::delete($rel_path.'/'.$log->filename);
+                }
+                $log->delete();
+
+                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+            }
+
+            return redirect()->back()
+                ->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        // Redirect to the hardware management page
+        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+    }
+}

app/Models/AssetModel.php

@@ -20,7 +20,7 @@ class AssetModel extends SnipeModel
     use HasFactory;
     use SoftDeletes;
     protected $presenter = \App\Presenters\AssetModelPresenter::class;
-    use Requestable, Presentable;
+    use Loggable, Requestable, Presentable;
 
     protected $table = 'models';
     protected $hidden = ['user_id', 'deleted_at'];
@@ -181,6 +181,23 @@ class AssetModel extends SnipeModel
         return false;
     }
 
+    /**
+     * Get uploads for this model
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function uploads()
+    {
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+            ->where('item_type', '=', AssetModel::class)
+            ->where('action_type', '=', 'uploaded')
+            ->whereNotNull('filename')
+            ->orderBy('created_at', 'desc');
+    }
+
+
     /**
      * -----------------------------------------------
      * BEGIN QUERY SCOPES

resources/views/models/view.blade.php

@@ -56,9 +56,16 @@
                         </span>
                         <span class="hidden-xs hidden-sm">
                             {{ trans('general.files') }}
+                            {!! ($model->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($model->uploads->count()).'</badge>' : '' !!}
                           </span>
                     </a>
                 </li>
+                <li class="pull-right">
+                    <a href="#" data-toggle="modal" data-target="#uploadFileModal">
+                        <i class="fas fa-paperclip" aria-hidden="true"></i>
+                        {{ trans('button.upload') }}
+                    </a>
+                </li>
 
             </ul>
 
@@ -92,13 +99,101 @@
                 }'>
                     </table>
                     {{ Form::close() }}
-                    </div>
-
                 </div> <!-- /.tab-pane assets -->
 
+
                 <div class="tab-pane fade" id="uploads">
 
-                   kljhglfh
+                    <div class="row">
+                        <div class="col-md-12">
+
+                            @if ($model->uploads->count() > 0)
+                                <table
+                                        class="table table-striped snipe-table"
+                                        id="modelFileHistory"
+                                        data-pagination="true"
+                                        data-id-table="modelFileHistory"
+                                        data-search="true"
+                                        data-side-pagination="client"
+                                        data-sortable="true"
+                                        data-show-columns="true"
+                                        data-show-fullscreen="true"
+                                        data-show-refresh="true"
+                                        data-sort-order="desc"
+                                        data-sort-name="created_at"
+                                        data-show-export="true"
+                                        data-export-options='{
+                         "fileName": "export-asset-{{ $model->id }}-files",
+                         "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                       }'
+                                        data-cookie-id-table="assetFileHistory">
+                                    <thead>
+                                    <tr>
+                                        <th data-visible="true" data-field="icon" data-sortable="true">{{trans('general.file_type')}}</th>
+                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
+                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename" data-sortable="true">{{ trans('general.file_name') }}</th>
+                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="filesize">{{ trans('general.filesize') }}</th>
+                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes" data-sortable="true">{{ trans('general.notes') }}</th>
+                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="download">{{ trans('general.download') }}</th>
+                                        <th class="col-md-2" data-searchable="true" data-visible="true" data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
+                                        <th class="col-md-1" data-searchable="true" data-visible="true" data-field="actions">{{ trans('table.actions') }}</th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+
+                                    @foreach ($model->uploads as $file)
+                                        <tr>
+                                            <td><i class="{{ Helper::filetype_icon($file->filename) }} icon-med" aria-hidden="true"></i></td>
+                                            <td>
+                                                @if ( Helper::checkUploadIsImage($file->get_src('assets')))
+                                                    <a href="{{ route('show/modelFile', ['modelId' => $model->id, 'fileId' =>$file->id]) }}" data-toggle="lightbox" data-type="image" data-title="{{ $file->filename }}" data-footer="{{ Helper::getFormattedDateObject($asset->last_checkout, 'datetime', false) }}">
+                                                        <img src="{{ route('show/modelfile', ['assetId' => $model->id, 'fileId' =>$file->id]) }}" style="max-width: 50px;">
+                                                    </a>
+                                                @endif
+                                            </td>
+                                            <td>
+                                                {{ $file->filename }}
+                                            </td>
+                                            <td data-value="{{ filesize(storage_path('private_uploads/assetmodels/').$file->filename) }}">
+                                                {{ Helper::formatFilesizeUnits(filesize(storage_path('private_uploads/assetmodels/').$file->filename)) }}
+                                            </td>
+                                            <td>
+                                                @if ($file->note)
+                                                    {{ $file->note }}
+                                                @endif
+                                            </td>
+                                            <td>
+                                                @if ($file->filename)
+                                                    <a href="{{ route('show/modelfile', [$model->id, $file->id]) }}" class="btn btn-default">
+                                                        <i class="fas fa-download" aria-hidden="true"></i>
+                                                    </a>
+                                                @endif
+                                            </td>
+                                            <td>
+                                                @if ($file->created_at)
+                                                    {{ Helper::getFormattedDateObject($file->created_at, 'datetime', false) }}
+                                                @endif
+                                            </td>
+                                            <td>
+                                                @can('update', \App\Models\AssetModel::class)
+                                                    <a class="btn delete-asset btn-sm btn-danger btn-sm" href="{{ route('delete/assetfile', [$model->id, $file->id]) }}" data-tooltip="true" data-title="Delete" data-content="{{ trans('general.delete_confirm', ['item' => $file->filename]) }}"><i class="fas fa-trash icon-white" aria-hidden="true"></i></a>
+                                                @endcan
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                    </tbody>
+                                </table>
+
+                            @else
+
+                                <div class="alert alert-info alert-block">
+                                    <i class="fas fa-info-circle"></i>
+                                    {{ trans('general.no_results') }}
+                                </div>
+                            @endif
+
+                        </div> <!-- /.col-md-12 -->
+                    </div> <!-- /.row -->
 
                 </div>
 
@@ -106,7 +201,17 @@
             </div> <!-- /.tab-content -->
         </div>  <!-- /.nav-tabs-custom -->
     </div><!-- /. col-md-12 -->
+
     <div class="col-md-3">
+        <div class="row">
+        <div class="col-md-12" style="padding-bottom: 5px;">
+            <a href="{{ route('models.edit', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-primary hidden-print">{{ trans('admin/models/table.edit') }}</a>
+        </div>
+        <div class="col-md-12" style="padding-bottom: 10px;">
+            <a href="{{ route('clone/model', $model->id) }}" style="width: 100%;" class="btn btn-sm btn-warning hidden-print">{{ trans('admin/models/table.clone') }}</a>
+        </div>
+
+            <div class="col-md-12">
                 <div class="box box-default">
                     <div class="box-header with-border">
                         <div class="box-heading">
@@ -115,6 +220,8 @@
                     </div><!-- /.box-header -->
                     <div class="box-body">
 
+
+
                 @if ($model->image)
                     <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($model->image)) }}" class="img-responsive"></li>
                 @endif
@@ -207,7 +314,13 @@
                 @endif
             </div>
         </div>
+        </div>
+        </div>
 </div> <!-- /.row -->
+
+@can('update', \App\Models\AssetModel::class)
+    @include ('modals.upload-file', ['item_type' => 'models', 'item_id' => $model->id])
+@endcan
 @stop
 
 @section('moar_scripts')

routes/web/models.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Http\Controllers\AssetModelsController;
+use App\Http\Controllers\AssetModelsFilesController;
 use App\Http\Controllers\BulkAssetModelsController;
 use Illuminate\Support\Facades\Route;
 
@@ -9,6 +10,18 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
 
+    Route::post('{modelID}/upload',
+        [AssetModelsFilesController::class, 'store']
+    )->name('upload/models');
+
+    Route::get('{modelID}/showfile/{fileId}/{download?}',
+        [AssetModelsFilesController::class, 'show']
+    )->name('show/modelfile');
+
+    Route::delete('{modelID}/showfile/{fileId}/delete',
+        [AssetModelsFilesController::class, 'destroy']
+    )->name('delete/modelfile');
+
     Route::get(
         '{modelId}/clone',
         [
@@ -74,6 +87,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () {
     )->name('models.bulkdelete.store');
 
 
+
 });
 
 Route::resource('models', AssetModelsController::class, [