From 284032a9896839d02f95130eb0fb7e46862e4eb2 Mon Sep 17 00:00:00 2001 From: maksmile13 Date: Sun, 17 May 2020 19:14:09 +0300 Subject: [PATCH 1/4] Fix Fav Filter --- lib/app/extapplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app/extapplication.py b/lib/app/extapplication.py index bb415a2033..0a9bf8bb79 100644 --- a/lib/app/extapplication.py +++ b/lib/app/extapplication.py @@ -207,7 +207,7 @@ class ExtApplication(Application): if fs: data = data.filter(id__in=fav_items) else: - data = data.exclude(id__in=fav_items) + data = data.filter(id__nin=fav_items) # Store unpaged/unordered queryset unpaged_data = data # Select related records when fetching for models -- GitLab From 2cec474d85f9eacc4f5f5a4dcf2a7e6d8bc98a54 Mon Sep 17 00:00:00 2001 From: smile13 Date: Tue, 30 Jun 2020 10:48:38 +0300 Subject: [PATCH 2/4] Fix --- lib/app/extapplication.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/app/extapplication.py b/lib/app/extapplication.py index 0a9bf8bb79..e195c5e473 100644 --- a/lib/app/extapplication.py +++ b/lib/app/extapplication.py @@ -11,6 +11,7 @@ import os # Third-party modules from django.http import HttpResponse +from django.db.models.query import QuerySet import ujson # NOC modules @@ -207,7 +208,10 @@ class ExtApplication(Application): if fs: data = data.filter(id__in=fav_items) else: - data = data.filter(id__nin=fav_items) + if isinstance(data, QuerySet): # Model + data = data.exclude(id__in=fav_items) + else: # Doc + data = data.filter(id__nin=fav_items) # Store unpaged/unordered queryset unpaged_data = data # Select related records when fetching for models -- GitLab From 47a3828d842830d59942d2691acd56262a896a95 Mon Sep 17 00:00:00 2001 From: maksmile13 Date: Tue, 18 Aug 2020 16:11:17 +0300 Subject: [PATCH 3/4] Fix if elif --- lib/app/extapplication.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/app/extapplication.py b/lib/app/extapplication.py index e195c5e473..04fd2e3c39 100644 --- a/lib/app/extapplication.py +++ b/lib/app/extapplication.py @@ -207,11 +207,10 @@ class ExtApplication(Application): fav_items = self.get_favorite_items(request.user) if fs: data = data.filter(id__in=fav_items) - else: - if isinstance(data, QuerySet): # Model - data = data.exclude(id__in=fav_items) - else: # Doc - data = data.filter(id__nin=fav_items) + elif not fs and isinstance(data, QuerySet): # Model + data = data.exclude(id__in=fav_items) + else: # Doc + data = data.filter(id__nin=fav_items) # Store unpaged/unordered queryset unpaged_data = data # Select related records when fetching for models -- GitLab From 8d715fc8cdfc11c1f848b8b13f19e458ddb7a863 Mon Sep 17 00:00:00 2001 From: maksmile13 Date: Tue, 18 Aug 2020 18:55:15 +0300 Subject: [PATCH 4/4] Fix if elif --- lib/app/extapplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/app/extapplication.py b/lib/app/extapplication.py index 04fd2e3c39..3430d7f2c9 100644 --- a/lib/app/extapplication.py +++ b/lib/app/extapplication.py @@ -207,7 +207,7 @@ class ExtApplication(Application): fav_items = self.get_favorite_items(request.user) if fs: data = data.filter(id__in=fav_items) - elif not fs and isinstance(data, QuerySet): # Model + elif isinstance(data, QuerySet): # Model data = data.exclude(id__in=fav_items) else: # Doc data = data.filter(id__nin=fav_items) -- GitLab