DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-02-02 15:35:41 -08:00
parent 1f60afa8e3 f9ef49f886
commit 41b0756286
9 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/CustomFieldsetsController.php
View file

@ -196,7 +196,7 @@ class CustomFieldsetsController extends Controller
*/
public function associate(Request $request, $id)
{
$set = CustomField::find($id);
$set = CustomFieldset::find($id);
$this->authorize('update', $set);

2
resources/lang/en/admin/hardware/general.php
View file

@ -14,6 +14,8 @@ return [
'deleted' => 'This asset has been deleted.',
'edit' => 'Edit Asset',
'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.',
'model_invalid' => 'The Model of this Asset is invalid.',
'model_invalid_fix' => 'The Asset should be edited to correct this before attempting to check it in or out.',
'requestable' => 'Requestable',
'requested' => 'Requested',
'not_requestable' => 'Not Requestable',

2
resources/lang/en/admin/models/message.php
View file

@ -3,6 +3,8 @@
return array(
'does_not_exist' => 'Model does not exist.',
'no_association' => 'NO MODEL ASSOCIATED.',
'no_association_fix' => 'This will break things in weird and horrible ways. Edit this asset now to assign it a model.',
'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ',

4
resources/lang/en/general.php
View file

@ -28,6 +28,10 @@ return [
'audit' => 'Audit',
'audit_report' => 'Audit Log',
'assets' => 'Assets',
'assets_audited' => 'assets audited',
'assets_checked_in_count' => 'assets checked in',
'assets_checked_out_count' => 'assets checked out',
'asset_deleted_warning' => 'This asset has been deleted. You must restore it before you can assign it to someone.',
'assigned_date' => 'Date Assigned',
'assigned_to' => 'Assigned to :name',
'assignee' => 'Assigned to',

6
resources/views/hardware/checkin.blade.php
View file

@ -46,13 +46,13 @@
@else
<span class="text-danger text-bold">
<i class="fas fa-exclamation-triangle"></i>This asset's model is invalid!
The asset <a href="{{ route('hardware.edit', $asset->id) }}">should be edited</a> to correct this before attempting to check it in or out.</span>
<i class="fas fa-exclamation-triangle"></i>{{ trans('admin/hardware/general.model_invalid')}}
<a href="{{ route('hardware.edit', $asset->id) }}"></a> {{ trans('admin/hardware/general.model_invalid_fix')}}</span>
@endif
</p>
</div>
</div>
<!-- Asset Name -->
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">

4
resources/views/hardware/checkout.blade.php
View file

@ -36,8 +36,8 @@
@else
<span class="text-danger text-bold">
<i class="fas fa-exclamation-triangle"></i>This asset's model is invalid!
The asset <a href="{{ route('hardware.edit', $asset->id) }}">should be edited</a> to correct this before attempting to check it in or out.</span>
<i class="fas fa-exclamation-triangle"></i>{{ trans('admin/hardware/general.model_invalid')}}
<a href="{{ route('hardware.edit', $asset->id) }}"></a> {{ trans('admin/hardware/general.model_invalid_fix')}}</span>
@endif
</p>
</div>

4
resources/views/hardware/quickscan-checkin.blade.php
View file

@ -73,7 +73,7 @@
<div class="col-md-6">
<div class="box box-default" id="checkedin-div" style="display: none">
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> assets checked in) </h2>
<h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> {{ trans('general.assets_checked_in_count') }}) </h2>
</div>
<div class="box-body">
@ -86,7 +86,7 @@
</tr>
<tr id="checkin-loader" style="display: none;">
<td colspan="3">
<i class="fas fa-spinner spin" aria-hidden="true"></i> Processing...
<i class="fas fa-spinner spin" aria-hidden="true"></i> {{ trans('general.processing') }}...
</td>
</tr>
</thead>

2
resources/views/hardware/quickscan.blade.php
View file

@ -99,7 +99,7 @@
<div class="col-md-6">
<div class="box box-default" id="audited-div" style="display: none">
<div class="box-header with-border">
<h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> assets audited) </h2>
<h2 class="box-title"> {{ trans('general.bulkaudit_status') }} (<span id="audit-counter">0</span> {{ trans('general.assets_audited') }}) </h2>
</div>
<div class="box-body">

9
resources/views/hardware/view.blade.php
View file

@ -75,8 +75,8 @@
@if (!$asset->model)
<div class="col-md-12">
<div class="callout callout-danger">
<h2>NO MODEL ASSOCIATED</h2>
<p>This will break things in weird and horrible ways. Edit this asset now to assign it a model. </p>
<h2>{{ trans('admin/models/message.no_association') }}</h2>
<p>{{ trans('admin/models/message.no_association_fix') }}</p>
</div>
</div>
@endif
@ -85,9 +85,8 @@
<div class="col-md-12">
<div class="alert alert-danger">
<i class="fas fa-exclamation-triangle faa-pulse animated" aria-hidden="true"></i>
<strong>WARNING: </strong>
This asset has been deleted.
You must restore it before you can assign it to someone.
<strong>{{ trans('general.notification_warning') }} </strong>
{{ trans('general.asset_deleted_warning') }}
</div>
</div>
@endif