kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-23 21:49:48 +00:00
Code Issues Projects Releases Wiki Activity

Fixed quotes were not escaped properly for contains search in dropdowns (fixes #249)

Browse Source
This commit is contained in:
Bernd Bestel
2019-05-16 22:20:01 +02:00
parent 8f9c3c66f7
commit 0a4ea6861a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/viewjs/components/productpicker.js
View File

@@ -70,7 +70,7 @@ if (!prefillProduct2.isEmpty())
} }
if (typeof prefillProduct !== "undefined") if (typeof prefillProduct !== "undefined")
{ {
var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + prefillProduct + "']").first(); var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + prefillProduct.replace("'", "\\'") + "']").first();
if (possibleOptionElement.length === 0) if (possibleOptionElement.length === 0)
{ {
possibleOptionElement = $("#product_id option:contains('" + prefillProduct + "')").first(); possibleOptionElement = $("#product_id option:contains('" + prefillProduct + "')").first();
@@ -120,7 +120,7 @@ $('#product_id_text_input').on('blur', function(e)
} }
var input = $('#product_id_text_input').val().toString(); var input = $('#product_id_text_input').val().toString();
var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first(); var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input.replace("'", "\\'") + "']").first();
if (GetUriParam('addbarcodetoselection') === undefined && possibleOptionElement.length > 0) if (GetUriParam('addbarcodetoselection') === undefined && possibleOptionElement.length > 0)
{ {

2
public/viewjs/components/userpicker.js
View File

@@ -42,7 +42,7 @@ $('.user-combobox').combobox({
var prefillUser = Grocy.Components.UserPicker.GetPicker().parent().data('prefill-by-username').toString(); var prefillUser = Grocy.Components.UserPicker.GetPicker().parent().data('prefill-by-username').toString();
if (typeof prefillUser !== "undefined") if (typeof prefillUser !== "undefined")
{ {
var possibleOptionElement = $("#user_id option[data-additional-searchdata*='" + prefillUser + "']").first(); var possibleOptionElement = $("#user_id option[data-additional-searchdata*='" + prefillUser.replace("'", "\\'") + "']").first();
if (possibleOptionElement.length === 0) if (possibleOptionElement.length === 0)
{ {
possibleOptionElement = $("#user_id option:contains('" + prefillUser + "')").first(); possibleOptionElement = $("#user_id option:contains('" + prefillUser + "')").first();