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

Merge pull request #13597 from marcusmoore/bug/sc-23681

Browse source 
Reset checkout to value when navigating away from type
This commit is contained in:
snipe 2023-09-14 12:39:04 +01:00 committed by GitHub
parent 56c7da7b06 74c7f106ce
commit 104219ed76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Listeners/CheckoutableListener.php
View file

@ -142,9 +142,11 @@ class CheckoutableListener
$notifiables = collect(); $notifiables = collect();
/** /**
* Notify the user who checked out the item * Notify who checked out the item as long as the model can route notifications
*/ */
$notifiables->push($event->checkedOutTo); if (method_exists($event->checkedOutTo, 'routeNotificationFor')) {
$notifiables->push($event->checkedOutTo);
}
/** /**
* Notify Admin users if the settings is activated * Notify Admin users if the settings is activated

8
resources/assets/js/snipeit.js
View file

@ -454,12 +454,18 @@ $(document).ready(function () {
$('#assigned_location').hide(); $('#assigned_location').hide();
$('.notification-callout').fadeOut(); $('.notification-callout').fadeOut();
$('[name="assigned_location"]').val('').trigger('change.select2');
$('[name="assigned_user"]').val('').trigger('change.select2');
} else if (assignto_type == 'location') { } else if (assignto_type == 'location') {
$('#current_assets_box').fadeOut(); $('#current_assets_box').fadeOut();
$('#assigned_asset').hide(); $('#assigned_asset').hide();
$('#assigned_user').hide(); $('#assigned_user').hide();
$('#assigned_location').show(); $('#assigned_location').show();
$('.notification-callout').fadeOut(); $('.notification-callout').fadeOut();
$('[name="assigned_asset"]').val('').trigger('change.select2');
$('[name="assigned_user"]').val('').trigger('change.select2');
} else { } else {
$('#assigned_asset').hide(); $('#assigned_asset').hide();
@ -470,6 +476,8 @@ $(document).ready(function () {
} }
$('.notification-callout').fadeIn(); $('.notification-callout').fadeIn();
$('[name="assigned_asset"]').val('').trigger('change.select2');
$('[name="assigned_location"]').val('').trigger('change.select2');
} }
}); });
}); });