allow unsetting assigned persons for resource properties of type "user" re #988

Merge request studip/studip!2020

lib/models/resources/ResourcePropertyDefinition.class.php

@@ -244,14 +244,23 @@ class ResourcePropertyDefinition extends SimpleORMap
             $search = new QuickSearch($input_name, new StandardSearch('user_id'));
             $search->defaultValue($value, ($value ? get_fullname($value, 'full_rev_username') : ''));
             return sprintf(
-                '<label %1$s>%2$s%3$s</label>',
+                '<label %1$s>%2$s<div class="assigned-user-search-wrapper flex-row">%3$s%4$s</div></label>',
                 (
                     $label_html_classes
                     ? 'class="' . htmlReady($label_html_classes) . '"'
                     : ''
                 ),
                 $this->__toString(),
-                $search->render()
+                $search->render(),
+                Icon::create('refresh')->asImg(
+                    [
+                        'class'           => 'delete-assigned-user-icon enter-accessible',
+                        'data-input-name' => $input_name,
+                        'title'           => _('Zuorndung entfernen'),
+                        'tabindex'        => '0',
+                        'aria-role'       => 'button'
+                    ]
+                )
             );
         } else {
             $input_type = 'text';

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) {

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');
     }
 });