forked from verdnatura/hedera-web
refs #3971 Issue 067214 fixed
This commit is contained in:
parent
998e7a0b5e
commit
f39b8b4cb3
|
@ -1,4 +1,4 @@
|
||||||
hedera-web (22.46.13) stable; urgency=low
|
hedera-web (22.46.14) stable; urgency=low
|
||||||
|
|
||||||
* Initial Release.
|
* Initial Release.
|
||||||
|
|
||||||
|
|
|
@ -43,8 +43,8 @@ const Catalog = new Class({
|
||||||
}
|
}
|
||||||
|
|
||||||
,getFilter(params, tags, currentTag) {
|
,getFilter(params, tags, currentTag) {
|
||||||
if (params.search == null && params.type == null)
|
if (params.search == null && params.realm == null)
|
||||||
return null;
|
return;
|
||||||
|
|
||||||
const $ = this.$;
|
const $ = this.$;
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ const Catalog = new Class({
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!idSearch) {
|
if (!idSearch) {
|
||||||
if (params.realm != null)
|
if (params.realm != null && currentTag)
|
||||||
filter.push($.realmOp);
|
filter.push($.realmOp);
|
||||||
if (params.type != null)
|
if (params.type != null)
|
||||||
filter.push($.typeOp);
|
filter.push($.typeOp);
|
||||||
|
@ -98,7 +98,18 @@ const Catalog = new Class({
|
||||||
'producer'
|
'producer'
|
||||||
];
|
];
|
||||||
|
|
||||||
const lot = this.getFilter(params, tags);
|
let hasTagFilter = false;
|
||||||
|
for (const tag of tags)
|
||||||
|
if (params[tag] != null) {
|
||||||
|
hasTagFilter = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
const refreshItems = hasTagFilter
|
||||||
|
|| params.search != null
|
||||||
|
|| params.type != null;
|
||||||
|
|
||||||
|
const lot = refreshItems && this.getFilter(params, tags);
|
||||||
if (lot) {
|
if (lot) {
|
||||||
$.items.lot = lot;
|
$.items.lot = lot;
|
||||||
$.items.refresh();
|
$.items.refresh();
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "hedera-web",
|
"name": "hedera-web",
|
||||||
"version": "22.46.13",
|
"version": "22.46.14",
|
||||||
"description": "Verdnatura web page",
|
"description": "Verdnatura web page",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"repository": {
|
"repository": {
|
||||||
|
|
Loading…
Reference in New Issue