Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: make facets URLS /nova-group/unknown work #10498

Merged
merged 5 commits into from
Jul 2, 2024
Merged

fix: make facets URLS /nova-group/unknown work #10498

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3fc204
fix: make facets URLS /nova-group/unknown and /nova-group/not-applica…
4nt0ineB Jun 26, 2024
975affb
Merge branch 'main' into tag-unkown-val
4nt0ineB Jun 26, 2024
a571060
Merge branch 'main' into tag-unkown-val
4nt0ineB Jun 27, 2024
f08cf18
pnns groups
4nt0ineB Jul 1, 2024
1c21274
Merge branch 'main' into tag-unkown-val
4nt0ineB Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/ProductOpener/Display.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4819,6 +4819,8 @@ sub add_params_to_query ($request_ref, $query_ref) {
if $log->is_debug();

# if the value is "unknown", we need to add a condition on the field being empty

my @tagtype_allowing_unknown_as_value = qw(nutrition_grades nova_groups ecoscore);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add pnns_groups_1, pnns_groups_2 and food_groups?

# warning: unknown is a value for pnns_groups_1 and 2
if (
(
Expand All @@ -4831,7 +4833,7 @@ sub add_params_to_query ($request_ref, $query_ref) {
)
)
and ($tagtype !~ /^pnns_groups_/)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pnns_groups_1 / 2 can be included in @tagtype_allowing_unknown_as_value

and ($tagtype ne "creator")
and not(grep {$_ eq $tagtype} @tagtype_allowing_unknown_as_value)
)
{
if ($not) {
Expand All @@ -4844,6 +4846,10 @@ sub add_params_to_query ($request_ref, $query_ref) {
}
# Normal single value (not unknown)
else {
if ($tagtype eq 'nova_groups') {
# Remove language code. e.g. for nova_groups : en:not-applicable -> not-applicable
$tagid =~ s/^[a-z]{2}://;
}
if ($not) {
$query_ref->{$tagtype . $suffix} = {'$ne' => $tagid};
}
Expand Down
Loading