Fixed #19133 - added optional clear asset name to quick scan checkin/audit
This commit is contained in:
@@ -1140,7 +1140,9 @@ class AssetsController extends Controller
|
||||
$asset->assignedTo()->disassociate($asset);
|
||||
$asset->accepted = null;
|
||||
|
||||
if ($request->has('name')) {
|
||||
if ($request->input('clear_name') == '1') {
|
||||
$asset->name = null;
|
||||
} elseif ($request->has('name')) {
|
||||
$asset->name = $request->input('name');
|
||||
}
|
||||
|
||||
@@ -1283,6 +1285,10 @@ class AssetsController extends Controller
|
||||
|
||||
$asset->last_audit_date = date('Y-m-d H:i:s');
|
||||
|
||||
if ($request->input('clear_name') == '1') {
|
||||
$asset->name = null;
|
||||
}
|
||||
|
||||
// Set up the payload for re-display in the API response
|
||||
$payload = [
|
||||
'id' => $asset->id,
|
||||
|
||||
@@ -83,6 +83,7 @@ return [
|
||||
'user_requests_count' => 'Requests',
|
||||
'city' => 'City',
|
||||
'click_here' => 'Click here',
|
||||
'clear_name' => 'Clear asset name',
|
||||
'clear_selection' => 'Clear Selection',
|
||||
'companies' => 'Companies',
|
||||
'companies_var' => 'Company|Companies',
|
||||
|
||||
@@ -70,7 +70,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Clear Name -->
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-3 col-md-9">
|
||||
<label class="form-control">
|
||||
<input type="checkbox" value="1" name="clear_name">
|
||||
<span>{{ trans('general.clear_name') }}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div> <!--/.box-body-->
|
||||
<div class="box-footer">
|
||||
|
||||
@@ -95,6 +95,16 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Clear Name -->
|
||||
<div class="form-group">
|
||||
<div class="col-sm-offset-3 col-md-9">
|
||||
<label class="form-control">
|
||||
<input type="checkbox" value="1" name="clear_name">
|
||||
<span>{{ trans('general.clear_name') }}</span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div> <!--/.box-body-->
|
||||
<div class="box-footer">
|
||||
<a class="btn btn-link" href="{{ route('hardware.index') }}"> {{ trans('button.cancel') }}</a>
|
||||
|
||||
Reference in New Issue
Block a user