Merge branch 'master' into fix-map-legend

GeoNode · Apr 27, 2021 · e245837 · e245837
2 parents c44db0f + 10a0dd9
commit e245837
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/geonode/api/api.py b/geonode/api/api.py
@@ -111,8 +111,8 @@ def get_resources_counts(self, options):
         counts = list()
         if subtypes:
             for subtype in subtypes:
-                counts.append(
-                    subtype.values(options['count_type']).annotate(count=Count(options['count_type'])).first()
+                counts.extend(
+                    list(subtype.values(options['count_type']).annotate(count=Count(options['count_type'])))
                 )
         else:
             counts = list(resources.values(options['count_type']).annotate(count=Count(options['count_type'])))

diff --git a/geonode/layers/utils.py b/geonode/layers/utils.py
@@ -1153,7 +1153,7 @@ def validate_input_source(layer, filename, files, gtype=None, action_type='repla
                         _("The selected Layer does not exists in the catalog."))
 
                 gs_layer = gs_layer.resource.attributes
-                schema_is_compliant = all([x in gs_layer for x in new_schema_fields])
+                schema_is_compliant = all([x.replace("-", '_') in gs_layer for x in new_schema_fields])
 
                 if not schema_is_compliant:
                     raise Exception(

diff --git a/geonode/upload/utils.py b/geonode/upload/utils.py
@@ -46,7 +46,7 @@
                                        get_store,
                                        set_time_dimension,
                                        create_geoserver_db_featurestore)  # mosaic_delete_first_granule
-from geonode.base.models import ThesaurusKeyword
+from geonode.base.models import HierarchicalKeyword, ThesaurusKeyword
 ogr.UseExceptions()
 
 logger = logging.getLogger(__name__)
@@ -905,6 +905,9 @@ def handle_metadata_keywords(self):
         tkeyword = []
         if len(self.keywords) > 0:
             for dkey in self.keywords:
+                if isinstance(dkey, HierarchicalKeyword):
+                    fkeyword += [dkey.name]
+                    continue
                 if dkey['type'] == 'place':
                     continue
                 thesaurus = dkey['thesaurus']