Skip to content

Commit ff2564c

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 91d3848 + ebbcdbc commit ff2564c

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.all-contributorsrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3328,7 +3328,7 @@
33283328
},
33293329
{
33303330
"login": "36864",
3331-
"name": 36864,
3331+
"name": "36864",
33323332
"avatar_url": "https://avatars.githubusercontent.com/u/109086466?v=4",
33333333
"profile": "https://github.com/36864",
33343334
"contributions": [

app/Providers/BreadcrumbsServiceProvider.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ public function boot()
7474

7575
Breadcrumbs::for('hardware.edit', fn (Trail $trail, Asset $asset) =>
7676
$trail->parent('hardware.index', route('hardware.index'))
77-
->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $asset->asset_tag]), route('hardware.edit', $asset))
77+
->push($asset->present()->fullName(), route('hardware.show', $asset))
78+
->push(trans('admin/hardware/general.edit'))
7879
);
7980

8081

app/Providers/SettingsServiceProvider.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ public function boot()
6565
return 'assets/';
6666
});
6767

68+
\App::singleton('audits_upload_path', function () {
69+
return 'audits/';
70+
});
71+
6872
\App::singleton('accessories_upload_path', function () {
6973
return 'public/uploads/accessories/';
7074
});

resources/views/hardware/audit.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
</div>
129129

130130
<!-- Audit Image -->
131-
@include ('partials.forms.edit.image-upload', ['help_text' => trans('general.audit_images_help')])
131+
@include ('partials.forms.edit.image-upload', ['image_path' => app('audits_upload_path'), 'help_text' => trans('general.audit_images_help')])
132132

133133
<!-- Custom fields -->
134134
@include("models/custom_fields_form", [

0 commit comments

Comments
 (0)