Merge remote-tracking branch 'origin/2.2' into 2.3

doc/integrator/caching.rst

@@ -22,6 +22,12 @@ To change this value for a specific service add the following stricture in the
             <service_name>:
                 cache_control_max_age: <max_age>
 
+    ...
+
+    update_paths:
+      - headers.<service_name>
+
+
 Where ``<service_name>`` can be: ``entry``, ``fulltextsearch``, ``mapserver``,
 ``print`` or ``layers`` (editing).
 

geoportal/c2cgeoportal_geoportal/lib/lingua_extractor.py

@@ -267,7 +267,7 @@ class C:
                             value.encode("ascii", errors="replace") if isinstance(value, str) else value)
                         enums.append(Message(None, msgid, None, [], "", "", (filename, location)))
 
-        metadata = []
+        metadata_list = []
         defs = config["admin_interface"]["available_metadata"]
         names = [e["name"] for e in defs if e.get("translate", False)]
 
@@ -281,9 +281,11 @@ class C:
             query = session.query(Metadata).filter(Metadata.name.in_(names))
             for metadata in query.all():
                 location = "metadata/{}/{}".format(metadata.name, metadata.id)
-                metadata.append(Message(None, metadata.value, None, [], u"", u"", (filename, location)))
+                metadata_list.append(
+                    Message(None, metadata.value, None, [], u"", u"", (filename, location))
+                )
 
-        return raster + enums + metadata
+        return raster + enums + metadata_list
 
     @staticmethod
     def _enumerate_attributes_values(dbsessions, layers, layerinfos, fieldname):
@@ -433,8 +435,12 @@ def _import_layer_wms(self, layer, messages):
                         column = column_property.columns[0]
                         if not column.primary_key and not isinstance(column.type, Geometry):
                             if column.foreign_keys:
-                                name = "type_" if column.name == "type_id" else \
-                                    column.name[0:column.name.rindex("_id")]
+                                if column.name == "type_id":
+                                    name = "type_"
+                                elif column.name.endswith("_id"):
+                                    name = column.name[:-3]
+                                else:
+                                    name = column.name + "_"
                             else:
                                 name = column_property.key
                             messages.append(Message(

geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_config-schema.yaml

@@ -173,6 +173,9 @@ mapping:
               access_control_max_age:
                 required: True
                 type: int
+              cache_control_max_age:
+                required: True
+                type: int
           index: *header
           config: *header
           api: *header

geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_vars.yaml_tmpl

@@ -210,6 +210,8 @@ vars:
       # Layers group
       - name: isExpanded
         type: boolean
+      - name: printNativeAngle
+        type: boolean
       # Layer
       - name: copyTo  # V1
       - name: copyable
@@ -396,6 +398,7 @@ vars:
   # Control the HTTP headers
   headers:
     index: &header
+      cache_control_max_age: 600  # 10 minutes
       access_control_max_age: 600  # 10 minutes
       access_control_allow_origin:
         - "*"
@@ -407,6 +410,7 @@ vars:
     exportgpxkml: *header
     error: *header
     themes: &auth_header
+      cache_control_max_age: 600  # 10 minutes
       access_control_max_age: 600  # 10 minutes
       access_control_allow_origin:
         - "{web_protocol}://{host}"
@@ -419,6 +423,7 @@ vars:
     layers: *auth_header
     shortener: *auth_header
     login:
+      cache_control_max_age: 600  # 10 minutes
       access_control_max_age: 600  # 10 minutes
       access_control_allow_origin:
         - "{web_protocol}://{host}"