+ {!! trans('general.footer_credit') !!}
@if ($snipeSettings->version_footer!='off')
@if (($snipeSettings->version_footer=='on') || (($snipeSettings->version_footer=='admin') && (Auth::user()->isSuperUser()=='1')))
-
Version {{ config('version.app_version') }} -
- build {{ config('version.build_version') }} ({{ config('version.branch') }})
+
{{ trans('general.version') }} {{ config('version.app_version') }} -
+ {{ trans('general.build') }} {{ config('version.build_version') }} ({{ config('version.branch') }})
@endif
@endif
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index 09f06e575b..30b26b4ae0 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -41,9 +41,9 @@
@if($field->is_unique)
@endif
- @if(!$field->is_unique)
+ @if(!$field->is_unique)
- @endif
+ @endif
@elseif ($field->element=='checkbox')
@foreach ($field->formatFieldValuesAsArray() as $key => $value)
@@ -61,7 +61,11 @@
@endforeach
-
+
@endif
@else
@@ -130,4 +134,4 @@
@endforeach
@endif
- @endforeach
+ @endforeach
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index c580efdea9..c73df97f7a 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -149,6 +149,7 @@
{{ trans('admin/settings/general.notifications') }}
+
{{ trans('admin/settings/general.keywords.notifications') }}
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index cbb7e2bac9..c9b6924d91 100755
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -42,6 +42,7 @@
@include('partials.users-bulk-actions')
Asset::class,
]
);
+
+ $asset->refresh();
+ $this->assertNull($asset->assigned_to);
+ $this->assertNull($asset->assigned_type);
}
public function testActionLogCreatedUponBulkRestore()
diff --git a/tests/Feature/Assets/Ui/DeleteAssetTest.php b/tests/Feature/Assets/Ui/DeleteAssetTest.php
index a12e9e2cd0..799643929b 100644
--- a/tests/Feature/Assets/Ui/DeleteAssetTest.php
+++ b/tests/Feature/Assets/Ui/DeleteAssetTest.php
@@ -48,6 +48,29 @@ class DeleteAssetTest extends TestCase
]);
}
+ public function testActionLogsActionDateIsPopulatedWhenAssetDeleted()
+ {
+ $actor = User::factory()->deleteAssets()->create();
+
+ $asset = Asset::factory()->create();
+
+ $this->actingAs($actor)->delete(route('hardware.destroy', $asset));
+
+ $asset->refresh();
+
+ $this->assertDatabaseHas('action_logs', [
+ 'action_date' => $asset->updated_at,
+ 'created_at' => $asset->updated_at,
+ 'created_by' => $actor->id,
+ 'action_type' => 'delete',
+ 'target_id' => null,
+ 'target_type' => null,
+ 'item_type' => Asset::class,
+ 'item_id' => $asset->id,
+ ]);
+
+ }
+
public function testAssetIsCheckedInWhenDeleted()
{
Event::fake();
@@ -65,6 +88,10 @@ class DeleteAssetTest extends TestCase
'Asset still assigned to user after deletion'
);
+ $asset->refresh();
+ $this->assertNull($asset->assigned_to);
+ $this->assertNull($asset->assigned_type);
+
Event::assertDispatched(CheckoutableCheckedIn::class);
}