verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 71 Releases Wiki Activity

#7897 - Solve conflicts masterTest_24_36 #670

Merged
jsegarra merged 3 commits from 7897_masterTest_24_36 into test 2024-09-03 05:40:48 +00:00
Conversation 0 Commits 3 Files Changed 3 +6 -4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/ui/VnFilterPanel.vue
View File

@ -202,9 +202,10 @@ function formatValue(value) {
function sanitizer(params) { function sanitizer(params) {
for (const [key, value] of Object.entries(params)) { for (const [key, value] of Object.entries(params)) {
if (value && typeof value === 'object') { if (typeof value === 'object' && value !== null) {
const param = Object.values(value)[0]; sanitizer(value);
if (typeof param == 'string') params[key] = param.replaceAll('%', ''); } else if (typeof value === 'string') {
params[key] = value.replaceAll('%', '');
} }
} }
return params; return params;

2
src/pages/Item/Card/ItemCard.vue
View File

@ -12,7 +12,7 @@ import ItemListFilter from '../ItemListFilter.vue';
search-data-key="ItemList" search-data-key="ItemList"
:searchbar-props="{ :searchbar-props="{
url: 'Items/filter', url: 'Items/filter',
label: 'searchbar.labelr', label: 'searchbar.label',
info: 'searchbar.info', info: 'searchbar.info',
}" }"
/> />

1
src/pages/Item/Card/ItemLastEntries.vue
View File

@ -42,6 +42,7 @@ const to = ref();
const arrayData = useArrayData('ItemLastEntries', { const arrayData = useArrayData('ItemLastEntries', {
url: 'Items/lastEntriesFilter', url: 'Items/lastEntriesFilter',
order: ['landed DESC', 'buyFk DESC'], order: ['landed DESC', 'buyFk DESC'],
searchUrl: 'itemLastEntries',
exprBuilder: exprBuilder, exprBuilder: exprBuilder,
userFilter: { userFilter: {
where: { where: {