A free open source IT asset/license management system
Fixed #19133 - added optional clear asset name to quick scan checkin/audit
snipebab5294399b6
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.phpindex 98882dcf9a..0581847bf0 100644--- a/app/Http/Controllers/Api/AssetsController.php+++ b/app/Http/Controllers/Api/AssetsController.php@@ -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,diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex 83350d229f..30129d45fb 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -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',diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.phpindex 3e4d11ec22..0bd4807215 100644--- a/resources/views/hardware/quickscan-checkin.blade.php+++ b/resources/views/hardware/quickscan-checkin.blade.php@@ -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">diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.phpindex 1d3fe61953..f06d3f267c 100644--- a/resources/views/hardware/quickscan.blade.php+++ b/resources/views/hardware/quickscan.blade.php@@ -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>