scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-31 04:32:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix escaping for dropdown options and keywords escaping [SCI-8137] (#5145)

Browse source
This commit is contained in:
aignatov-bio 2023-03-15 12:55:28 +01:00 committed by GitHub
parent 00c63b280e
commit 44823da268
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/javascripts/sitewide/dropdown_selector.js
View file

@ -541,16 +541,22 @@ var dropdownSelector = (function() {
var customLabel = selector2.data('config').optionLabel;
var customClass = params.optionClass || selector2.data('config').optionClass || '';
var customStyle = selector2.data('config').optionStyle;
return $(`
<div class="dropdown-option ${customClass}" style="${customStyle ? customStyle(option) : ''}"
title="${(option.params && option.params.tooltip) || ''}"
data-params='${JSON.stringify(option.params || {})}'
data-label="${option.label}"
data-group="${group ? group.value : ''}"
data-value="${option.value}">
${customLabel ? customLabel(option) : option.label}
</div>"
var optionElement = $(`
<div class="dropdown-option ${customClass}" style="${customStyle ? customStyle(option) : ''}">
</div>
`);
optionElement
.attr('title', (option.params && option.params.tooltip) || '')
.attr('data-params', JSON.stringify(option.params || {}))
.attr('data-label', option.label)
.attr('data-group', group ? group.value : '')
.attr('data-value', option.value);
if (customLabel) {
optionElement.html(customLabel(option));
} else {
optionElement.html(option.label);
}
return optionElement;
}
// Draw delimiter object

6
app/controllers/protocols_controller.rb
View file

@ -172,12 +172,6 @@ class ProtocolsController < ApplicationController
def update_keywords
respond_to do |format|
# sanitize user input
if params[:keywords]
params[:keywords].collect! do |keyword|
escape_input(keyword)
end
end
if @protocol.update_keywords(params[:keywords])
format.json do
log_activity(:edit_keywords_in_protocol_repository, nil, protocol: @protocol.id)