Merge branch 'develop' into chore/sc-23725/livewire3

# Conflicts: # composer.lock
snipe · Jun 18, 2024 · f0a11be · f0a11be
2 parents a3dea99 + b8882fa
commit f0a11be
Show file tree

Hide file tree

Showing 56 changed files with 257,238 additions and 177 deletions.
diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php
@@ -17,22 +17,24 @@ public function displaySig($filename)
 
  $disk = config('filesystems.default');
  switch (config("filesystems.disks.$disk.driver")) {
- case 's3':
- $file = 'private_uploads/signatures/'.$filename;
- return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));
- default:
- $this->authorize('view', \App\Models\Asset::class);
- $file = config('app.private_uploads').'/signatures/'.$filename;
- $filetype = Helper::checkUploadIsImage($file);
+  case 's3':
+  $file = 'private_uploads/signatures/'.$filename;
+  return redirect()->away(Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(5)));
+  default:
+  $this->authorize('view', \App\Models\Asset::class);
+  $file = config('app.private_uploads').'/signatures/'.$filename;
+  $filetype = Helper::checkUploadIsImage($file);
 
- $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
- if ($contents === false) {
- Log::warning('File '.$file.' not found');
- return false;
- } else {
- return Response::make($contents)->header('Content-Type', $filetype);
- }
+ $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
+ if ($contents === false) {
+ Log::warning('File '.$file.' not found');
+ return false;
+ } else {
+ return Response::make($contents)->header('Content-Type', $filetype);
+ }
+ }
  }
+
  public function getStoredEula($filename){
  $this->authorize('view', \App\Models\Asset::class);
  $file = config('app.private_uploads').'/eula-pdfs/'.$filename;

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
@@ -288,7 +288,7 @@ public function getRestore($id)
  public function show($modelId = null)
  {
  $this->authorize('view', AssetModel::class);
- $model = AssetModel::withTrashed()->withCount('assets')->find($modelId);
+ $model = AssetModel::withTrashed()->find($modelId);
 
  if (isset($model->id)) {
  return view('models/view', compact('model'));

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -827,16 +827,16 @@ public function scopeUserLocation($query, $location, $search){
 
 
  return $query->where('location_id','=', $location)
- ->where('first_name', 'LIKE', '%' . $search . '%')
- ->orWhere('email', 'LIKE', '%' . $search . '%')
- ->orWhere('last_name', 'LIKE', '%' . $search . '%')
- ->orWhere('permissions', 'LIKE', '%' . $search . '%')
- ->orWhere('country', 'LIKE', '%' . $search . '%')
- ->orWhere('phone', 'LIKE', '%' . $search . '%')
- ->orWhere('jobtitle', 'LIKE', '%' . $search . '%')
- ->orWhere('employee_num', 'LIKE', '%' . $search . '%')
- ->orWhere('username', 'LIKE', '%' . $search . '%')
- ->orwhereRaw('CONCAT(first_name," ",last_name) LIKE \''.$search.'%\'');
+ ->where('users.first_name', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.email', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.last_name', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.permissions', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.country', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.phone', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.jobtitle', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.employee_num', 'LIKE', '%' . $search . '%')
+ ->orWhere('users.username', 'LIKE', '%' . $search . '%')
+ ->orwhereRaw('CONCAT(users.first_name," ",users.last_name) LIKE \''.$search.'%\'');
 
 
 

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
  "alek13/slack": "^2.0",
  "arietimmerman/laravel-scim-server": "dev-master",
  "bacon/bacon-qr-code": "^2.0",
- "barryvdh/laravel-debugbar": "^3.6",
+ "barryvdh/laravel-debugbar": "^3.13",
  "barryvdh/laravel-dompdf": "^2.0",
  "doctrine/cache": "^1.10",
  "doctrine/dbal": "^3.1",

diff --git a/composer.lock b/composer.lock
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
- 'app_version' => 'v7.0.2',
- 'full_app_version' => 'v7.0.2 - build 13978-g430808e18',
- 'build_version' => '13978',
+ 'app_version' => 'v7.0.3',
+ 'full_app_version' => 'v7.0.3 - build 13980-',
+ 'build_version' => '13980',
  'prerelease_version' => '',
- 'hash_version' => 'g430808e18',
- 'full_hash' => 'v7.0.2-12-g430808e18',
+ 'hash_version' => '',
+ 'full_hash' => 'v7.0.3',
  'branch' => 'develop',
 );
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
  "less-loader": "^6.0",
  "list.js": "^1.5.0",
  "morris.js": "github:morrisjs/morris.js",
- "papaparse": "5.2.0",
+ "papaparse": "5.4.1",
  "select2": "4.0.13",
  "sheetjs": "^2.0.0",
  "signature_pad": "^4.2.0",

diff --git a/public/css/build/AdminLTE.css b/public/css/build/AdminLTE.css