Skip to content

Commit 953b3a8

Browse files
snipesnipe
authored
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
Merge master into develop for RC 6.0.0-8
2 parents 011ab60 + c01f088 commit 953b3a8

File tree

295 files changed

+1292
-863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

295 files changed

+1292
-863
lines changed

‎.all-contributorsrc‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2603,6 +2603,24 @@
26032603
"contributions": [
26042604
"code"
26052605
]
2606+
},
2607+
{
2608+
"login": "QveenSi",
2609+
"name": "Yevhenii Huzii",
2610+
"avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
2611+
"profile": "https://github.com/QveenSi",
2612+
"contributions": [
2613+
"code"
2614+
]
2615+
},
2616+
{
2617+
"login": "chrisweirich",
2618+
"name": "Christian Weirich",
2619+
"avatar_url": "https://avatars.githubusercontent.com/u/97299851?v=4",
2620+
"profile": "https://github.com/chrisweirich",
2621+
"contributions": [
2622+
"code"
2623+
]
26062624
}
26072625
]
26082626
}

‎app/Console/Commands/MoveUploadsToNewDisk.php‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ public function handle()
4646
}
4747
$delete_local = $this->argument('delete_local');
4848

49-
$public_uploads['accessories'] = glob('public/uploads/accessories' . "/*.*");
50-
$public_uploads['assets'] = glob('public/uploads/assets' . "/*.*");
51-
$public_uploads['avatars'] = glob('public/uploads/avatars' . "/*.*");
52-
$public_uploads['categories'] = glob('public/uploads/categories' . "/*.*");
53-
$public_uploads['companies'] = glob('public/uploads/companies' . "/*.*");
54-
$public_uploads['components'] = glob('public/uploads/components' . "/*.*");
55-
$public_uploads['consumables'] = glob('public/uploads/consumables' . "/*.*");
56-
$public_uploads['departments'] = glob('public/uploads/departments' . "/*.*");
57-
$public_uploads['locations'] = glob('public/uploads/locations' . "/*.*");
58-
$public_uploads['manufacturers'] = glob('public/uploads/manufacturers' . "/*.*");
59-
$public_uploads['suppliers'] = glob('public/uploads/suppliers' . "/*.*");
60-
$public_uploads['assetmodels'] = glob('public/uploads/models' . "/*.*");
49+
$public_uploads['accessories'] = glob('public/uploads/accessories'."/*.*");
50+
$public_uploads['assets'] = glob('public/uploads/assets'."/*.*");
51+
$public_uploads['avatars'] = glob('public/uploads/avatars'."/*.*");
52+
$public_uploads['categories'] = glob('public/uploads/categories'."/*.*");
53+
$public_uploads['companies'] = glob('public/uploads/companies'."/*.*");
54+
$public_uploads['components'] = glob('public/uploads/components'."/*.*");
55+
$public_uploads['consumables'] = glob('public/uploads/consumables'."/*.*");
56+
$public_uploads['departments'] = glob('public/uploads/departments'."/*.*");
57+
$public_uploads['locations'] = glob('public/uploads/locations'."/*.*");
58+
$public_uploads['manufacturers'] = glob('public/uploads/manufacturers'."/*.*");
59+
$public_uploads['suppliers'] = glob('public/uploads/suppliers'."/*.*");
60+
$public_uploads['assetmodels'] = glob('public/uploads/models'."/*.*");
6161

6262

6363
// iterate files
@@ -69,19 +69,19 @@ public function handle()
6969
$type_count++;
7070
$filename = basename($public_upload[$i]);
7171

72-
try {
73-
Storage::disk('public')->put('uploads/' . $public_type . '/' . $filename, file_get_contents($public_upload[$i]));
74-
$new_url = Storage::disk('public')->url('uploads/' . $public_type . '/' . $filename, $filename);
75-
$this->info($type_count . '. PUBLIC: ' . $filename . ' was copied to ' . $new_url);
72+
try {
73+
Storage::disk('public')->put('uploads/'.$public_type.'/'.$filename, file_get_contents($public_upload[$i]));
74+
$new_url = Storage::disk('public')->url('uploads/'.$public_type.'/'.$filename, $filename);
75+
$this->info($type_count.'. PUBLIC: '.$filename.' was copied to '.$new_url);
7676
} catch (\Exception $e) {
7777
\Log::debug($e);
7878
$this->error($e);
7979
}
8080
}
8181
}
8282

83-
$logos = glob('public/uploads/setting*.*');
84-
$this->info('- There are ' . count($logos) . ' files that might be logos.');
83+
$logos = glob("public/uploads/setting*.*");
84+
$this->info("- There are ".count($logos).' files that might be logos.');
8585
$type_count = 0;
8686

8787
foreach ($logos as $logo) {
@@ -92,14 +92,15 @@ public function handle()
9292
$this->info($type_count . '. LOGO: ' . $filename . ' was copied to ' . env('PUBLIC_AWS_URL') . '/uploads/' . $filename);
9393
}
9494

95-
$private_uploads['assets'] = glob('storage/private_uploads/assets' . '/*.*');
96-
$private_uploads['signatures'] = glob('storage/private_uploads/signatures' . '/*.*');
97-
$private_uploads['audits'] = glob('storage/private_uploads/audits' . '/*.*');
98-
$private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels' . '/*.*');
99-
$private_uploads['imports'] = glob('storage/private_uploads/imports' . '/*.*');
100-
$private_uploads['licenses'] = glob('storage/private_uploads/licenses' . '/*.*');
101-
$private_uploads['users'] = glob('storage/private_uploads/users' . '/*.*');
102-
$private_uploads['backups'] = glob('storage/private_uploads/users' . '/*.*');
95+
$private_uploads['assets'] = glob('storage/private_uploads/assets'."/*.*");
96+
$private_uploads['signatures'] = glob('storage/private_uploads/signatures'."/*.*");
97+
$private_uploads['audits'] = glob('storage/private_uploads/audits'."/*.*");
98+
$private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'."/*.*");
99+
$private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*");
100+
$private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*");
101+
$private_uploads['users'] = glob('storage/private_uploads/users'."/*.*");
102+
$private_uploads['backups'] = glob('storage/private_uploads/backups'."/*.*");
103+
103104

104105
foreach ($private_uploads as $private_type => $private_upload) {
105106
{

‎app/Http/Controllers/Api/AssetsController.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,9 @@ public function checkout(AssetCheckoutRequest $request, $asset_id)
786786
$error_payload['target_type'] = 'user';
787787
}
788788

789+
if ($request->filled('status_id')) {
790+
$asset->status_id = $request->get('status_id');
791+
}
789792

790793

791794
if (! isset($target)) {

‎app/Http/Controllers/Api/LicensesController.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ class LicensesController extends Controller
2626
public function index(Request $request)
2727
{
2828
$this->authorize('view', License::class);
29-
$licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'supplier', 'category')->withCount('freeSeats as free_seats_count'));
29+
$licenses = Company::scopeCompanyables(License::with('company', 'manufacturer', 'supplier','category')->withCount('freeSeats as free_seats_count'));
30+
3031

3132
if ($request->filled('company_id')) {
3233
$licenses->where('company_id', '=', $request->input('company_id'));
@@ -148,9 +149,10 @@ public function index(Request $request)
148149
}
149150

150151
$total = $licenses->count();
151-
$licenses = $licenses->skip($offset)->take($limit)->get();
152152

153+
$licenses = $licenses->skip($offset)->take($limit)->get();
153154
return (new LicensesTransformer)->transformLicenses($licenses, $total);
155+
154156
}
155157

156158
/**

‎app/Http/Controllers/Api/ProfileController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public function requestedAssets()
2929
// Make sure the asset and request still exist
3030
if ($checkoutRequest && $checkoutRequest->itemRequested()) {
3131
$results['rows'][] = [
32-
'image' => $checkoutRequest->itemRequested()->present()->getImageUrl(),
33-
'name' => $checkoutRequest->itemRequested()->present()->name(),
34-
'type' => $checkoutRequest->itemType(),
35-
'qty' => $checkoutRequest->quantity,
36-
'location' => ($checkoutRequest->location()) ? $checkoutRequest->location()->name : null,
32+
'image' => e($checkoutRequest->itemRequested()->present()->getImageUrl()),
33+
'name' => e($checkoutRequest->itemRequested()->present()->name()),
34+
'type' => e($checkoutRequest->itemType()),
35+
'qty' => (int) $checkoutRequest->quantity,
36+
'location' => ($checkoutRequest->location()) ? e($checkoutRequest->location()->name) : null,
3737
'expected_checkin' => Helper::getFormattedDateObject($checkoutRequest->itemRequested()->expected_checkin, 'datetime'),
3838
'request_date' => Helper::getFormattedDateObject($checkoutRequest->created_at, 'datetime'),
3939
];

‎app/Http/Controllers/Api/StatuslabelsController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ public function destroy($id)
178178
}
179179

180180

181+
181182
/**
182183
* Show a count of assets by status label for pie chart
183184
*

‎app/Http/Controllers/Assets/AssetCheckinController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ public function store(AssetCheckinRequest $request, $assetId = null, $backto = n
101101
\Log::debug('After Location ID: '.$asset->location_id);
102102
\Log::debug('After RTD Location ID: '.$asset->rtd_location_id);
103103

104+
104105
if ($request->filled('location_id')) {
105106
\Log::debug('NEW Location ID: '.$request->get('location_id'));
106107
$asset->location_id = e($request->get('location_id'));

‎app/Http/Controllers/Assets/AssetsController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -867,6 +867,7 @@ public function auditStore(Request $request, $id)
867867

868868
public function getRequestedIndex($user_id = null)
869869
{
870+
$this->authorize('index', Asset::class);
870871
$requestedItems = CheckoutRequest::with('user', 'requestedItem')->whereNull('canceled_at')->with('user', 'requestedItem');
871872

872873
if ($user_id) {

‎app/Http/Controllers/Licenses/LicensesController.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ public function edit($licenseId = null)
134134
->with('maintained_list', $maintained_list);
135135
}
136136

137+
137138
/**
138139
* Validates and stores the license form data submitted from the edit
139140
* license form.

‎app/Http/Controllers/Users/BulkUsersController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public function edit(Request $request)
5151
});
5252
}
5353
}
54-
5554
return redirect()->back()->with('success', trans('admin/users/message.password_resets_sent'));
55+
5656
}
5757
}
5858

@@ -103,7 +103,6 @@ public function update(Request $request)
103103
if (! $manager_conflict) {
104104
$this->conditionallyAddItem('manager_id');
105105
}
106-
107106
// Save the updated info
108107
User::whereIn('id', $user_raw_array)
109108
->where('id', '!=', Auth::id())->update($this->update_array);
@@ -179,6 +178,7 @@ public function destroy(Request $request)
179178
$accessories = DB::table('accessories_users')->whereIn('assigned_to', $user_raw_array)->get();
180179
$licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
181180

181+
182182
$this->logItemCheckinAndDelete($assets, Asset::class);
183183
$this->logItemCheckinAndDelete($accessories, Accessory::class);
184184
$this->logItemCheckinAndDelete($licenses, LicenseSeat::class);
@@ -189,6 +189,7 @@ public function destroy(Request $request)
189189
'assigned_type' => null,
190190
]);
191191

192+
192193
LicenseSeat::whereIn('id', $licenses->pluck('id'))->update(['assigned_to' => null]);
193194

194195
foreach ($users as $user) {

0 commit comments

Comments
 (0)