Introduce separate print_template title, which strips tenant subdir prefix

Author: manisandro

src/config_generator/qgs_reader.py

@@ -200,6 +200,7 @@ def __print_templates(self, root, shortname_map):
             }
             print_template = {}
             print_template['name'] = template.get('name')
+            print_template['title'] = template.get('name')
             print_map = {}
             print_map['name'] = "map0"
             print_map['x'] = float(position[0]) * tomm.get(position[2], 1)
@@ -225,10 +226,10 @@ def __print_templates(self, root, shortname_map):
 
             print_templates.append(print_template)
 
-        project_template_names = [template['name'] for template in print_templates]
+        project_template_titles = [template['title'] for template in print_templates]
         return print_templates + [
             template for template in self.global_print_layouts
-            if template["name"] not in project_template_names
+            if template["title"] not in project_template_titles
         ]
 
 

src/config_generator/theme_reader.py

@@ -81,6 +81,7 @@ def __search_global_print_layouts(self):
             if subdirpath and not dirpath.startswith(subdirpath):
                 continue
             relpath = dirpath[len(qgis_print_layouts_dir.rstrip('/')) + 1:]
+            subdirrelpath = dirpath[len(subdirpath or qgis_print_layouts_dir.rstrip('/')) + 1:]
 
             for filename in files:
                 if Path(filename).suffix != ".qpt":
@@ -100,6 +101,7 @@ def __search_global_print_layouts(self):
                 position = composer_map.get('positionOnPage').split(',')
                 print_template = OrderedDict()
                 print_template['name'] = os.path.join(relpath, layout.get('name'))
+                print_template['title'] = os.path.join(subdirrelpath, layout.get('name'))
                 print_map = OrderedDict()
                 print_map['name'] = "map0"
                 print_map['x'] = float(position[0])