From 2e0721b1013f659f804ddbde0e3e01c87705d958 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Thu, 25 May 2023 18:22:46 +0200 Subject: [PATCH] refs #5667 Fixes: Id filter, translations --- front/salix/components/log/index.js | 8 ++++---- modules/item/back/locale/item-botanical/en.yml | 2 +- modules/item/back/locale/item-botanical/es.yml | 2 +- modules/item/back/locale/item/en.yml | 2 +- modules/item/back/locale/item/es.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 7452c6636..ef1b370b5 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -150,10 +150,10 @@ export default class Controller extends Section { if (value == null || value == '') return null; switch (prop) { case 'search': - const or = [{changedModelId: value}]; - if (!/^[0-9]+$/.test(value)) - or.push({changedModelValue: {like: `%${value}%`}}); - return {or}; + if (/^[0-9]+$/.test(value)) + return {changedModelId: value}; + else + return {changedModelValue: {like: `%${value}%`}}; case 'changes': return {or: [ {oldInstance: {like: `%${value}%`}}, diff --git a/modules/item/back/locale/item-botanical/en.yml b/modules/item/back/locale/item-botanical/en.yml index 03c66a097..9e3d7cad5 100644 --- a/modules/item/back/locale/item-botanical/en.yml +++ b/modules/item/back/locale/item-botanical/en.yml @@ -1,4 +1,4 @@ -name: botanical +name: botanical data columns: itemFk: item genusFk: genus diff --git a/modules/item/back/locale/item-botanical/es.yml b/modules/item/back/locale/item-botanical/es.yml index ca7fd5bf1..75b1587a5 100644 --- a/modules/item/back/locale/item-botanical/es.yml +++ b/modules/item/back/locale/item-botanical/es.yml @@ -1,4 +1,4 @@ -name: botánico +name: datos botánicos columns: itemFk: artículo genusFk: género diff --git a/modules/item/back/locale/item/en.yml b/modules/item/back/locale/item/en.yml index 39e465300..ea40fd34b 100644 --- a/modules/item/back/locale/item/en.yml +++ b/modules/item/back/locale/item/en.yml @@ -35,7 +35,7 @@ columns: packingOut: packing out hasMinPrice: has min price isFragile: fragile - isFloramondo: is floramondo + isFloramondo: floramondo packingShelve: packing shelve isLaid: laid inkFk: ink diff --git a/modules/item/back/locale/item/es.yml b/modules/item/back/locale/item/es.yml index 4b75b4704..973f5e94f 100644 --- a/modules/item/back/locale/item/es.yml +++ b/modules/item/back/locale/item/es.yml @@ -35,7 +35,7 @@ columns: packingOut: empaquetar hasMinPrice: tiene precio mínimo isFragile: frágil - isFloramondo: es floramondo + isFloramondo: floramondo packingShelve: estantería embalaje isLaid: puesto inkFk: tinta