clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent tagsinput select element to be submitted without a value when they are required 

- This was allowing to submit private messages to the wrong recipient
This commit is contained in:
Hypolite Petovan 2022-02-22 10:09:54 -05:00
parent f6e4984d7e
commit b24fe917e4
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
view/js/friendica-tagsinput/friendica-tagsinput.js
View File

@ -165,7 +165,7 @@
// add <option /> if item represents a value not present in one of the <select />'s options // add <option /> if item represents a value not present in one of the <select />'s options
if (self.isSelect && !optionExists) { if (self.isSelect && !optionExists) {
var $option = $('<option selected>' + htmlEncode(itemText) + '</option>'); var $option = $('<option>' + htmlEncode(itemText) + '</option>');
$option.data('item', item); $option.data('item', item);
$option.attr('value', itemValue); $option.attr('value', itemValue);
self.$element.append($option); self.$element.append($option);
@ -577,11 +577,6 @@
tagsinput = new TagsInput(this, arg1); tagsinput = new TagsInput(this, arg1);
$(this).data('tagsinput', tagsinput); $(this).data('tagsinput', tagsinput);
results.push(tagsinput); results.push(tagsinput);
if (this.tagName === 'SELECT') {
$('option', $(this)).attr('selected', 'selected');
}
// Init tags from $(this).val() // Init tags from $(this).val()
$(this).val($(this).val()); $(this).val($(this).val());
} else if (!arg1 && !arg2) { } else if (!arg1 && !arg2) {

4
view/templates/acl/message_recipient.tpl
View File

@ -1,4 +1,4 @@
<select name="recipient" class="form-control input-lg" id="recipient"> <select name="recipient" class="form-control input-lg" id="recipient" required>
{{foreach $contacts as $contact}} {{foreach $contacts as $contact}}
<option value="{{$contact.id}}"{{if $contact.id == $selected}} selected{{/if}}>{{$contact.name}}</option> <option value="{{$contact.id}}"{{if $contact.id == $selected}} selected{{/if}}>{{$contact.name}}</option>
{{/foreach}} {{/foreach}}
@ -48,7 +48,9 @@
} }
}); });
{{if $selected}}
// Import existing ACL into the tags input fields. // Import existing ACL into the tags input fields.
$recipient_input.tagsinput('add', acl.get({{$selected}})[0]); $recipient_input.tagsinput('add', acl.get({{$selected}})[0]);
{{/if}}
}); });
</script> </script>