kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 09:39:57 +00:00
Code Issues Projects Releases Wiki Activity

Hotfix (will be included in v1.19.0 release): Fixed a regression bug regarding issue #56 (product-flow-popup did not work anymore)

Browse Source
This commit is contained in:
Bernd Bestel 2018-09-24 16:50:30 +02:00
parent ddfe33fab6
commit 067a10e1b2
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -2,7 +2,7 @@
"name": "grocy", "name": "grocy",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@danielfarrell/bootstrap-combobox": "https://github.com/pallidus-fintech/bootstrap-combobox.git#enhance/boostrap_4", "@danielfarrell/bootstrap-combobox": "https://github.com/berrnd/bootstrap-combobox.git#master",
"@fortawesome/fontawesome-free": "^5.1.0", "@fortawesome/fontawesome-free": "^5.1.0",
"TagManager": "https://github.com/max-favilli/tagmanager.git#3.0.2", "TagManager": "https://github.com/max-favilli/tagmanager.git#3.0.2",
"bootbox": "https://github.com/makeusabrew/bootbox.git#v5.x", "bootbox": "https://github.com/makeusabrew/bootbox.git#v5.x",

3
public/viewjs/batterytracking.js
View File

@ -49,7 +49,8 @@ $('#battery_id').on('change', function(e)
}); });
$('.combobox').combobox({ $('.combobox').combobox({
appendId: '_text_input' appendId: '_text_input',
bsVersion: '4'
}); });
$('#battery_id').val(''); $('#battery_id').val('');

3
public/viewjs/choretracking.js
View File

@ -48,7 +48,8 @@ $('#chore_id').on('change', function(e)
}); });
$('.combobox').combobox({ $('.combobox').combobox({
appendId: '_text_input' appendId: '_text_input',
bsVersion: '4'
}); });
$('#chore_id_text_input').focus(); $('#chore_id_text_input').focus();

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

@ -45,7 +45,8 @@ Grocy.Components.ProductPicker.HideCustomError = function()
$('.product-combobox').combobox({ $('.product-combobox').combobox({
appendId: '_text_input', appendId: '_text_input',
bsVersion: '4' bsVersion: '4',
clearIfNoMatch: false
}); });
var prefillProduct = GetUriParam('createdproduct'); var prefillProduct = GetUriParam('createdproduct');
@ -81,7 +82,7 @@ if (addBarcode !== undefined)
$('#barcode-lookup-disabled-hint').removeClass('d-none'); $('#barcode-lookup-disabled-hint').removeClass('d-none');
} }
$('#product_id').on('change', function(e) $('#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 + "']").first();
@ -106,14 +107,20 @@ $('#product_id').on('change', function(e)
bootbox.dialog({ bootbox.dialog({
message: L('"#1" could not be resolved to a product, how do you want to proceed?', input), message: L('"#1" could not be resolved to a product, how do you want to proceed?', input),
title: L('Create or assign product'), title: L('Create or assign product'),
onEscape: function() { }, onEscape: function()
{
Grocy.Components.ProductPicker.SetValue('');
},
size: 'large', size: 'large',
backdrop: true, backdrop: true,
buttons: { buttons: {
cancel: { cancel: {
label: L('Cancel'), label: L('Cancel'),
className: 'btn-default responsive-button', className: 'btn-default responsive-button',
callback: function() { } callback: function()
{
Grocy.Components.ProductPicker.SetValue('');
}
}, },
addnewproduct: { addnewproduct: {
label: '<strong>P</strong> ' + L('Add as new product'), label: '<strong>P</strong> ' + L('Add as new product'),

6
yarn.lock
View File

@ -2,15 +2,15 @@
# yarn lockfile v1 # yarn lockfile v1
"@danielfarrell/bootstrap-combobox@https://github.com/pallidus-fintech/bootstrap-combobox.git#enhance/boostrap_4": "@danielfarrell/bootstrap-combobox@https://github.com/berrnd/bootstrap-combobox.git#master":
version "1.1.8" version "1.1.8"
resolved "https://github.com/pallidus-fintech/bootstrap-combobox.git#0bd1da781b99d390f1c75315b6025e7d8658b263" resolved "https://github.com/berrnd/bootstrap-combobox.git#d5a43b011d4d2c86537df26e15d2caa51be6a15f"
"@fortawesome/fontawesome-free@^5.1.0": "@fortawesome/fontawesome-free@^5.1.0":
version "5.3.1" version "5.3.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.3.1.tgz#5466b8f31c1f493a96754c1426c25796d0633dd9" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.3.1.tgz#5466b8f31c1f493a96754c1426c25796d0633dd9"
"TagManager@https://github.com/max-favilli/tagmanager.git#3.0.2": "TagManager@https://github.com/max-favilli/tagmanager.git#3.0.2", "tagmanager@https://github.com/max-favilli/tagmanager.git#3.0.2":
version "3.0.1" version "3.0.1"
resolved "https://github.com/max-favilli/tagmanager.git#df9eb9935c8585a392dfc00602f890caf233fa94" resolved "https://github.com/max-favilli/tagmanager.git#df9eb9935c8585a392dfc00602f890caf233fa94"
dependencies: dependencies: