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

fixes conflicts

Browse source
This commit is contained in:
Godfrey M 2023-08-23 00:40:59 -07:00
parent ce60db009c
commit 0fc79ec936
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -151,10 +151,11 @@ class ActionlogsTransformer
* @param array $clean_meta * @param array $clean_meta
* @return array * @return array
*/ */
public function changedInfo(array $clean_meta) public function changedInfo(array $clean_meta) {
{ $location = Location::withTrashed()->all();
$company = Company::withTrashed()->all(); $location = Location::withTrashed()->get();
$supplier = Supplier::withTrashed()->all(); $company = Company::withTrashed()->get();
$supplier = Supplier::withTrashed()->get();
$model = AssetModel::withTrashed()->get(); $model = AssetModel::withTrashed()->get();