aboutsummaryrefslogtreecommitdiff
path: root/resources
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2023-11-23 15:19:10 +0000
committerMoritz Strohm <strohm@data-quest.de>2023-11-23 15:19:10 +0000
commit9cbde5e91c0061cd8893a563abd02f258688f4f8 (patch)
treea57f1e126f61c0ede8ce14d50d9b64946ca425a4 /resources
parent54e6a1d0caf1474544fe789ed401f55cbc3cc5b3 (diff)
allow unsetting assigned persons for resource properties of type "user" re #988
Merge request studip/studip!2020
Diffstat (limited to 'resources')
-rw-r--r--resources/assets/javascripts/bootstrap/resources.js2
-rw-r--r--resources/assets/javascripts/bootstrap/studip_helper_attributes.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/resources/assets/javascripts/bootstrap/resources.js b/resources/assets/javascripts/bootstrap/resources.js
index 1238cec..388f475 100644
--- a/resources/assets/javascripts/bootstrap/resources.js
+++ b/resources/assets/javascripts/bootstrap/resources.js
@@ -773,7 +773,7 @@ STUDIP.ready(function () {
jQuery(document).on(
'click',
- '.create-booking-form .delete-assigned-user-icon',
+ '.delete-assigned-user-icon',
function (event) {
var quicksearch = jQuery(event.target).parent().find('input');
if (!quicksearch) {
diff --git a/resources/assets/javascripts/bootstrap/studip_helper_attributes.js b/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
index 0cdbaf3..8f96dcb 100644
--- a/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
+++ b/resources/assets/javascripts/bootstrap/studip_helper_attributes.js
@@ -258,6 +258,7 @@ $(document).on('change', 'input[data-must-equal]', function() {
$(document).on('keydown', '.enter-accessible', function(event) {
if (event.code == 'Enter') {
//The enter key has been pressed.
+ event.preventDefault();
$(this).trigger('click');
}
});