Resolves GeoNode#6925: fix flake8 style errors

geosolutions-it · Feb 5, 2021 · 1c36470 · 1c36470
1 parent 5d1aad8
commit 1c36470
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/geonode/base/tests.py b/geonode/base/tests.py
@@ -33,7 +33,7 @@
 from geonode.services.models import Service
 from geonode.tests.base import GeoNodeBaseTestSupport
 from geonode.base.models import (
-    ResourceBase, MenuPlaceholder, Menu, MenuItem, Configuration, Thesaurus, ThesaurusKeyword, ThesaurusKeywordLabel, TopicCategory
+    ResourceBase, MenuPlaceholder, Menu, MenuItem, Configuration, Thesaurus, ThesaurusKeyword, TopicCategory
 )
 from django.template import Template, Context
 from django.contrib.auth import get_user_model
@@ -903,7 +903,7 @@ def test_form_is_invalid_if_required_fields_are_missing(self):
         self.assertFalse(actual.is_valid())
 
     def test_form_is_invalid_if_fileds_send_unexpected_values(self):
-        actual = self.sut(data={"8": [1,2], "6": 1234})
+        actual = self.sut(data={"8": [1, 2], "6": 1234})
         self.assertFalse(actual.is_valid())
 
     def test_form_is_valid_if_fileds_send_expected_values(self):

diff --git a/geonode/base/views.py b/geonode/base/views.py
@@ -325,7 +325,6 @@ def get_queryset(self):
         lang = self.request.GET.get("lang")
 
         qs = ThesaurusKeywordLabel.objects.filter(keyword__thesaurus__id=tid).filter(lang=lang).order_by('id')
-        print(qs.query)
         return qs
 
     def get_results(self, context):

diff --git a/geonode/layers/views.py b/geonode/layers/views.py
@@ -1016,9 +1016,12 @@ def layer_metadata(
         if hasattr(settings, 'THESAURUS'):
             tkeywords_form = TKeywordForm(request.POST)
         else:
-            tkeywords_form = ThesaurusAvailableForm(request.POST, prefix="tkeywords", initial=int(
-            request.POST["tkeywords"]) if "tkeywords" in request.POST and
-            request.POST["tkeywords"] else None)
+            tkeywords_form = ThesaurusAvailableForm(request.POST)
+            #  set initial values for thesaurus form
+            for tid in tkeywords_form.fields:
+                values = []
+                values = [keyword.id for keyword in topic_thesaurus if int(tid) == keyword.thesaurus.id]
+                tkeywords_form.fields[tid].initial = values
 
         if not tkeywords_form.is_valid():
             logger.error(f"Layer Thesauri Keywords form is not valid: {tkeywords_form.errors}")
@@ -1177,8 +1180,8 @@ def layer_metadata(
                 )
                 layer.tkeywords.set(tkeywords_data)
             elif Thesaurus.objects.all().exists():
-                x = tkeywords_form.cleaned_data
-                layer.tkeywords.set(tkeywords_form.cleanx(x))
+                fields = tkeywords_form.cleaned_data
+                layer.tkeywords.set(tkeywords_form.cleanx(fields))
 
         except Exception:
             tb = traceback.format_exc()