Skip to content

A free open source IT asset/license management system

Added checkboxes and JS to checkin/checkout blades

snipe2daf0458a70f
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 868abeee31..4d139ef308 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -76,6 +76,21 @@
</div>
</div>
+ <div class="form-group">
+ <div class="col-md-7 col-md-offset-3">
+ <label class="form-control" for="set_not_requestable">
+ <input
+ type="checkbox"
+ value="1"
+ name="set_not_requestable"
+ id="set_not_requestable"
+ @checked((bool) old('set_not_requestable', true))
+ >
+ {{ trans('admin/hardware/general.not_requestable') }}
+ </label>
+ </div>
+ </div>
+
<!-- Checkout selector -->
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 740ea0a8c4..00fa444df2 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -109,6 +109,7 @@
name="status_id"
id="modal-statuslabel_types"
:options="$statusLabel_list"
+ :selected="old('status_id')"
style="width: 100%"
aria-label="status_id"
/>
@@ -116,6 +117,25 @@
</div>
</div>
+ <div
+ class="form-group"
+ id="set-requestable-wrapper"
+ @if (! $show_requestable_toggle) style="display: none;" @endif
+ >
+ <div class="col-md-9 col-md-offset-3">
+ <label class="form-control" for="set_requestable">
+ <input
+ type="checkbox"
+ value="1"
+ name="set_requestable"
+ id="set_requestable"
+ @checked((bool) old('set_requestable', false))
+ />
+ {{ trans('admin/hardware/general.requestable') }}
+ </label>
+ </div>
+ </div>
+
<x-input.location-select
:label="trans('general.location')"
name="location_id"
@@ -200,3 +220,48 @@
</div>
@stop
+
+@section('moar_scripts')
+ <script nonce="{{ csrf_token() }}">
+ const initializeRequestableToggle = function () {
+ const deployableStatusIds = @json($deployable_status_ids);
+ const statusSelect = document.getElementById('modal-statuslabel_types')
+ ?? document.querySelector('select[name="status_id"]');
+ const requestableWrapper = document.getElementById('set-requestable-wrapper');
+ const requestableCheckbox = document.getElementById('set_requestable');
+
+ if (!statusSelect || !requestableWrapper) {
+ return;
+ }
+
+ const toggleRequestable = function () {
+ const selectedStatusValue = statusSelect.value;
+ const selectedStatusId = Number.parseInt(selectedStatusValue, 10);
+ const isDeployable = selectedStatusValue !== ''
+ && Number.isInteger(selectedStatusId)
+ && deployableStatusIds.includes(selectedStatusId);
+
+ requestableWrapper.style.display = isDeployable ? '' : 'none';
+
+ if (!isDeployable && requestableCheckbox) {
+ requestableCheckbox.checked = false;
+ }
+ };
+
+ statusSelect.addEventListener('change', toggleRequestable);
+
+ if (window.jQuery) {
+ window.jQuery(statusSelect).on('select2:select select2:clear', toggleRequestable);
+ }
+
+ toggleRequestable();
+ };
+
+ if (document.readyState === 'loading') {
+ document.addEventListener('DOMContentLoaded', initializeRequestableToggle);
+ } else {
+ initializeRequestableToggle();
+ }
+ </script>
+@stop
+
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 9eff896e1b..0d44ec5769 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -101,6 +101,23 @@
</div>
</div>
+ @if ($asset->requestable)
+ <div class="form-group">
+ <div class="col-md-7 col-md-offset-3">
+ <label class="form-control" for="set_not_requestable">
+ <input
+ type="checkbox"
+ value="1"
+ name="set_not_requestable"
+ id="set_not_requestable"
+ @checked((bool) old('set_not_requestable', true))
+ >
+ {{ trans('admin/hardware/general.not_requestable') }}
+ </label>
+ </div>
+ </div>
+ @endif
+
@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
@include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'style' => (session('checkout_to_type') ?: 'user') == 'user' ? '' : 'display: none;'])
<!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->