Products.urban 2.7.30__tar.gz → 2.7.32__tar.gz

{Products.urban-2.7.30 → Products.urban-2.7.32}/MANIFEST.in

@@ -17,6 +17,7 @@
   recursive-include src *.gif
   recursive-include src *.ini
   recursive-include src *.js
+  recursive-include src *.json
   recursive-include src *.metadata
   recursive-include src *.odt
   recursive-include src *.oxt

{Products.urban-2.7.30/src/Products.urban.egg-info → Products.urban-2.7.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.30
+Version: 2.7.32
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -46,6 +46,46 @@ Description: *********
         
         .. towncrier release notes start
         
+        2.7.32 (2025-03-24)
+        -------------------
+        
+        Bug fixes:
+        
+        
+        - Fix view for fixing task uid and add possiblity to call on licence folder
+          [jchandelle] (SUP-43189)
+        
+        
+        2.7.31 (2025-03-12)
+        -------------------
+        
+        New features:
+        
+        
+        - Add possibility to get template merged when import
+          [jchandelle] (SUP-39711)
+        
+        
+        Bug fixes:
+        
+        
+        - Ensure 'in_progress'state covers 'complete' and 'deposit' states in statistics calculation.
+          [WBoudabous] (SUP-42045)
+        - Fix lost value in licence duplication
+          [jchandelle] (SUP-42578)
+        - Clarify `Copy to claimant`
+          [daggelpop] (SUP-42931)
+        - Add External method to fix annoncements tasks
+          [jchandelle] (URB-2680)
+        
+        
+        Internal:
+        
+        
+        - Fix ViewPageTemplateFile import
+          [jchandelle] (SUP-41619, URB-3237)
+        
+        
         2.7.30 (2025-02-07)
         -------------------
         
@@ -1551,5 +1591,5 @@ Platform: UNKNOWN
 Classifier: License :: OSI Approved :: GNU General Public License v2 (GPLv2)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 2.7
-Provides-Extra: test
 Provides-Extra: templates
+Provides-Extra: test

{Products.urban-2.7.30 → Products.urban-2.7.32}/docs/CHANGES.rst

@@ -8,6 +8,46 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.32 (2025-03-24)
+-------------------
+
+Bug fixes:
+
+
+- Fix view for fixing task uid and add possiblity to call on licence folder
+  [jchandelle] (SUP-43189)
+
+
+2.7.31 (2025-03-12)
+-------------------
+
+New features:
+
+
+- Add possibility to get template merged when import
+  [jchandelle] (SUP-39711)
+
+
+Bug fixes:
+
+
+- Ensure 'in_progress'state covers 'complete' and 'deposit' states in statistics calculation.
+  [WBoudabous] (SUP-42045)
+- Fix lost value in licence duplication
+  [jchandelle] (SUP-42578)
+- Clarify `Copy to claimant`
+  [daggelpop] (SUP-42931)
+- Add External method to fix annoncements tasks
+  [jchandelle] (URB-2680)
+
+
+Internal:
+
+
+- Fix ViewPageTemplateFile import
+  [jchandelle] (SUP-41619, URB-3237)
+
+
 2.7.30 (2025-02-07)
 -------------------
 

{Products.urban-2.7.30 → Products.urban-2.7.32}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = "2.7.30"
+version = "2.7.32"
 
 setup(
     name="Products.urban",

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/Extensions/fix_schedule_config.py

@@ -4,6 +4,7 @@ from Products.urban.config import URBAN_TYPES
 from importlib import import_module
 from plone import api
 
+import transaction
 import logging
 
 logger = logging.getLogger("urban: fix schedule config")
@@ -92,3 +93,27 @@ def fix_schedule_config():
  'description': '',
  'end_conditions': (<imio.schedule.content.object_factories.EndConditionObject object at 0x7f806ae3f450>,),
 """
+
+
+def fix_announcement_task(schedule_config):
+    if (
+        hasattr(schedule_config, "additional_delay_type")
+        and isinstance(schedule_config.additional_delay_type, dict)
+        and "token" in schedule_config.additional_delay_type
+    ):
+        schedule_config.additional_delay_type = schedule_config.additional_delay_type["token"]
+
+
+def fix_announcement_tasks():
+    portal = api.portal.get()
+    portal_urban = portal["portal_urban"]
+    for ptype in URBAN_TYPES:
+        cfg_folder = portal_urban[ptype.lower()]
+        if "schedule" not in cfg_folder:
+            continue
+        schedule_config = cfg_folder["schedule"]
+        if hasattr(schedule_config, "announcement-preparation"):
+            fix_announcement_task(schedule_config["announcement-preparation"])
+        if hasattr(schedule_config, "announcement"):
+            fix_announcement_task(schedule_config["announcement"])
+    transaction.commit

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/exportimport/import_config.py

@@ -20,6 +20,7 @@ from zope.interface import noLongerProvides
 from zope.schema.interfaces import IVocabularyFactory
 
 import logging
+import os
 
 
 logger = logging.getLogger("Import Urban Config")
@@ -73,6 +74,7 @@ class ConfigImportContent(ImportContent):
         iterator=None,
         import_to_current_lic_config_folder=False,
         import_in_same_instance=False,
+        fix_parent_path=False,
     ):
         self.handle_missing_parent = int(self.request.get("handle_missing_parent", 0))
         self.handle_missing_parent_options = (
@@ -81,6 +83,7 @@ class ConfigImportContent(ImportContent):
         )
         self.import_to_current_lic_config_folder = import_to_current_lic_config_folder
         self.import_in_same_instance = import_in_same_instance
+        self.fix_parent_path = fix_parent_path
         if not self.check_in_portal_urban():
             self.context = api.portal.get_tool("portal_urban")
         alsoProvides(self.request, IConfigImportMarker)
@@ -131,13 +134,98 @@ class ConfigImportContent(ImportContent):
             current = aq_parent(current)
         return False
 
+    def get_obj_from_path(self, path):
+        if "portal_urban" not in path:
+            return None
+        split_path = path.split("portal_urban")[-1].lstrip("/")
+        return api.content.get(path=os.path.join("/portal_urban/", split_path))
+
+    def _get_uid_from_brain(self, brain):
+        catalog = api.portal.get_tool("portal_catalog")
+        rid = brain.getRID()
+        return catalog.getIndexDataForRID(rid)["UID"]
+
+    def get_uid_from_proximity_context(self, context, id, ignore_uid=[]):
+        brains = api.content.find(context=context, portal_type="UrbanTemplate")
+        for brain in brains:
+            brain_uid = self._get_uid_from_brain(brain)
+            if brain_uid in ignore_uid:
+                continue
+            obj = brain.getObject()
+            merge_templates = obj.merge_templates
+            for template in merge_templates:
+                template_obj = api.content.get(UID=template["template"])
+                if template_obj.id == id:
+                    return template["template"]
+            ignore_uid.append(brain_uid)
+        if ILicenceConfig.providedBy(context):
+            return None
+        return self.get_uid_from_proximity_context(aq_parent(context), id, ignore_uid)
+
+    def get_template_uid(self, item, template):
+        if isinstance(template["template"], str):
+            obj = api.content.get(UID=template["template"])
+            if obj:
+                return template["template"]
+            else:
+                return None
+
+        uid = template["template"]["uid"]
+        obj = api.content.get(UID=uid)
+        if obj:
+            return uid
+
+        context = self.get_obj_from_path(item["parent"]["@id"])
+        if context:
+            template_uid = self.get_uid_from_proximity_context(
+                context, template["template"]["id"]
+            )
+            if template_uid:
+                return template_uid
+
+        path = template["template"]["path"]
+        obj = self.get_obj_from_path(path)
+        if not obj:
+            return None
+        return obj.UID()
+
+    def dict_hook_urbantemplate(self, item):
+        merge_templates = item.get("merge_templates", None)
+        if merge_templates is None:
+            return item
+        output_template = []
+        for template in merge_templates:
+            uid = self.get_template_uid(item, template)
+            if uid is None:
+                uid = "--NOVALUE--"
+            template["template"] = uid
+            output_template.append(template)
+        item["merge_templates"] = output_template
+        return item
+
+    def handle_fix_parent_path(self, item):
+        parent = item["parent"]
+        path = parent["@id"]
+        if "portal_urban" not in path:
+            return item
+        path_split = path.split("portal_urban")
+        portal = api.portal.get()
+        fix_path = os.path.join(
+            portal.absolute_url(), "portal_urban", path_split[-1].lstrip("/")
+        )
+        parent["@id"] = fix_path
+        item["parent"] = parent
+        return item
+
     def global_dict_hook(self, item):
         item = self.handle_default_value_none(item)
-        item = self.handle_template_urbantemplate(item)
         item = self.handle_scheduled_contenttype(item)
         item = self.handle_wrong_type(item)
         item = self.handle_textDefaultValues(item)
 
+        if self.fix_parent_path:
+            item = self.handle_fix_parent_path(item)
+
         if self.import_to_current_lic_config_folder:
             item = self.handle_change_id(item)
 
@@ -222,22 +310,6 @@ class ConfigImportContent(ImportContent):
                 item[key] = self.default_value_none[item["@type"]][key]
         return item
 
-    def handle_template_urbantemplate(self, item):
-        if item["@type"] != "UrbanTemplate":
-            return item
-        context = api.portal.get_tool("portal_urban")
-        factory = getUtility(
-            IVocabularyFactory, "collective.documentgenerator.MergeTemplates"
-        )
-        vocabulary = factory(context)
-
-        new_merge_templates = []
-        for merge_template in item.get("merge_templates", []):
-            merge_template["template"] = "--NOVALUE--"
-            new_merge_templates.append(merge_template)
-        item["merge_templates"] = new_merge_templates
-        return item
-
     def handle_scheduled_contenttype(self, item):
         scheduled_contenttype = item.get("scheduled_contenttype", None)
         if scheduled_contenttype is None:

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/exportimport/serializer.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 
 from Products.urban.browser.exportimport.interfaces import IConfigExportMarker
+from Products.urban.docgen.UrbanTemplate import IUrbanTemplate
 from collective.exportimport.serializer import ChoiceFieldSerializer
 from collective.exportimport.serializer import CollectionFieldSerializer
+from plone import api
 from plone.dexterity.interfaces import IDexterityContent
 from plone.restapi.interfaces import IFieldSerializer
 from plone.restapi.serializer.converters import json_compatible
@@ -13,8 +15,8 @@ from zope.schema.interfaces import ICollection
 from zope.schema.interfaces import IVocabularyTokenized
 
 
-@adapter(ICollection, IDexterityContent, IConfigExportMarker)
 @implementer(IFieldSerializer)
+@adapter(ICollection, IDexterityContent, IConfigExportMarker)
 class UrbanConfigCollectionFieldSerializer(CollectionFieldSerializer):
     def __call__(self):
         values = super(UrbanConfigCollectionFieldSerializer, self).__call__()
@@ -25,6 +27,11 @@ class UrbanConfigCollectionFieldSerializer(CollectionFieldSerializer):
             and IVocabularyTokenized.providedBy(value_type.vocabulary)
         ):
             values = [value for value in values if self._check_value(value, value_type)]
+        if (
+            IUrbanTemplate.providedBy(self.context)
+            and self.field.getName() == "merge_templates"
+        ):
+            values = self.handle_merge_templates(values)
         return values
 
     def _check_value(self, value, value_type):
@@ -34,9 +41,26 @@ class UrbanConfigCollectionFieldSerializer(CollectionFieldSerializer):
         except LookupError:
             return False
 
+    def handle_merge_templates(self, values):
+        output = []
+        for value in values:
+            template = value.get("template", None)
+            if template is None:
+                output.append(value)
+                continue
+            try:
+                template_obj = api.content.get(UID=template)
+            except ValueError:
+                output.append(value)
+                continue
+            path = "/".join(template_obj.getPhysicalPath())
+            value["template"] = {"uid": template, "path": path, "id": template_obj.id}
+            output.append(value)
+        return output
+
 
-@adapter(IChoice, IDexterityContent, IConfigExportMarker)
 @implementer(IFieldSerializer)
+@adapter(IChoice, IDexterityContent, IConfigExportMarker)
 class UrbanConfigChoiceFieldSerializer(ChoiceFieldSerializer):
     def __call__(self):
         value = super(UrbanConfigChoiceFieldSerializer, self).__call__()

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/exportimport/templates/import_urban_config.pt

@@ -115,6 +115,18 @@
               </label>
             </div>
 
+            <div class="field">
+              <label>
+                <input
+                    type="checkbox"
+                    name="fix_parent_path:boolean"
+                    id="fix_parent_path"
+                    tal:attributes="checked python:'checked' if view.fix_parent_path else None"
+                    />
+                <span i18n:translate="">Fix parent path</span>
+              </label>
+            </div>
+
             <div class="formControls" class="form-group">
                 <input type="hidden" name="form.submitted" value="1"/>
                 <button class="btn btn-primary submit-widget button-field context"

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/licence/duplicate_licence.py

@@ -137,7 +137,6 @@ class DuplicateLicenceForm(form.Form):
         postCreationActions(duplicated_licence, None)
 
         duplicated_licence.reindexObject()
-        duplicated_licence.processForm()
 
         return self.request.RESPONSE.redirect(duplicated_licence.absolute_url())
 

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/urbanstatsview.py

@@ -71,7 +71,11 @@ class UrbanStatsView(BrowserView):
                 ),
                 "date_end": self.getSearchArgument(["to_year", "to_month", "to_day"]),
             }
+
+        # Adjust licence_state to include 'deposit' and 'complete' if 'in_progress' is requested
+        mapped_states = self.map_in_progress_state(args["licence_state"])
         catalog = getToolByName(context, "portal_catalog")
+        
         brains = catalog(
             portal_type=args["licence_type"],
             created={
@@ -81,16 +85,22 @@ class UrbanStatsView(BrowserView):
                 ],
                 "range": "minmax",
             },
-            review_state=args["licence_state"],
+            review_state=mapped_states
         )
+        
         if not brains:
             return {"sum": {"sum": "0"}}
+
         result = self.getEmptyResultTable(args)
+
         for brain in brains:
-            result[brain.portal_type][brain.review_state] += 1
+            state = self.map_deposit_and_complete_state_to_in_progress(brain.review_state)
+            result[brain.portal_type][state] += 1
+            
         self.sumPartialResults(result, total=len(brains))
-        return result
 
+        return result
+    
     def sumPartialResults(self, table, total):
         # in case where no result is found, partials sums are useless
         sum_line = {}
@@ -116,3 +126,11 @@ class UrbanStatsView(BrowserView):
             for licence_state in arguments["licence_state"]:
                 matrix_line[licence_state] = 0
         return matrix
+    
+    def map_deposit_and_complete_state_to_in_progress(self, review_state):
+            """Map 'complete' and 'deposit' states to 'in_progress'."""
+            return 'in_progress' if review_state in ('complete', 'deposit') else review_state
+
+    def map_in_progress_state(self, licence_states):
+            """Ensure 'in_progress' covers 'complete' and 'deposit' in the filter."""
+            return licence_states + ["deposit", "complete"] if "in_progress" in licence_states else licence_states

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/view_utils/close_task.py

@@ -3,7 +3,7 @@
 from Products.CMFPlone.utils import safe_unicode
 from Products.urban import UrbanMessage as _
 from Products.urban.interfaces import IGenericLicence
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from plone import api
 from plone.z3cform.layout import FormWrapper
 from z3c.form import button

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/browser/view_utils/configure.zcml

@@ -5,7 +5,7 @@
     i18n_domain="urban">
 
   <browser:page
-     for="Products.urban.interfaces.IGenericLicence"
+     for="*"
      name="fix-task-uid-error"
      class=".fix_task_uid_error.FixTaskUidError"
      permission="cmf.ManagePortal"

Products.urban-2.7.32/src/Products/urban/browser/view_utils/fix_task_uid_error.py

@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+from Acquisition import aq_parent
+from Products.Five import BrowserView
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from Products.urban.interfaces import IGenericLicence
+from imio.schedule.content.task import IAutomatedTask
+from imio.schedule.interfaces import TaskConfigNotFound
+from imio.schedule.utils import get_container_tasks
+from plone import api
+
+import logging
+import re
+import transaction
+
+
+logger = logging.getLogger("Fix task uid error: ")
+
+
+class FixTaskUidError(BrowserView):
+    """View used to fix wrong config uid attach to task."""
+
+    template = ViewPageTemplateFile("templates/fix_task_uid_error.pt")
+
+    def __call__(self):
+        if not self.request.form.get("form.submitted", False):
+            return self.template()
+
+        self.fix_task()
+        return self.template()
+
+    def check_if_task_error(self, task):
+        task_config = api.content.get(UID=task.task_config_UID)
+        if not task_config or task.task_config_UID == "":
+            return False
+        return True
+
+    def clear_task_id(self, task_id):
+        task_id = task_id.replace("TASK_", "")
+        task_id = re.sub("\d*$", "", task_id)
+        task_id = task_id.rstrip("-")
+        return task_id
+
+    def get_task_id(self, task):
+        task_id = []
+        parent_task = aq_parent(task)
+        if IAutomatedTask.providedBy(parent_task):
+            task_id.append(self.clear_task_id(parent_task.id))
+        task_id.append(self.clear_task_id(task.id))
+        return "/".join(task_id)
+
+    def get_tasks(self):
+        tasks = []
+        if IGenericLicence.providedBy(self.context):
+            tasks += get_container_tasks(self.context)
+        else:
+            items = self.context.contentItems()
+            len_items = len(items)
+            for count, item in enumerate(items):
+                id, child = item
+                if IGenericLicence.providedBy(child):
+                    logger.info(
+                        "handle licence {} ({}/{})".format(id, count + 1, len_items)
+                    )
+                    tasks += get_container_tasks(child)
+        task_in_error = {}
+        for count, task in enumerate(tasks):
+            logger.info("handle task {}/{}".format(count + 1, len(tasks)))
+            if self.check_if_task_error(task):
+                continue
+            task_id = self.get_task_id(task)
+            if task_id in task_in_error:
+                task_in_error[task_id]["UIDs"].append(task.UID())
+                continue
+            logger.info("new task in error added : {}".format(task.id))
+            task_in_error[task_id] = {
+                "title": task.title,
+                "UIDs": [task.UID()],
+                "current_uid": task.task_config_UID,
+            }
+
+        return task_in_error
+
+    def fix_task(self):
+        form = self.request.form
+        del form["form.submitted"]
+        del form["submit"]
+        for count, item in enumerate(form.items()):
+            task, new_uid = item
+            if new_uid == "":
+                continue
+            logger.info("Fix tasks ({}/{}):".format(count + 1, len(form.items())))
+            task_uids = task.split("-")
+            for count, task_uid in enumerate(task_uids):
+                task_to_fix = api.content.get(UID=task_uid)
+                logger.info(
+                    "\tFixing task {} ({}/{})".format(
+                        "/".join(task_to_fix.getPhysicalPath()),
+                        count + 1,
+                        len(task_uids),
+                    )
+                )
+                task_to_fix.task_config_UID = new_uid
+        transaction.commit()

Products.urban-2.7.32/src/Products/urban/browser/view_utils/templates/fix_task_uid_error.pt

@@ -0,0 +1,50 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:tal="http://xml.zope.org/namespaces/tal">
+
+<div>
+    
+
+
+       <h1 class="documentFirstHeading" >
+           Fix task uid error
+       </h1>
+       <form action="@@fix-task-uid-error" method="post">
+        <ul>
+
+         <li tal:repeat="task python: view.get_tasks().items()">
+          <tal:define define="
+            task_value python: task[1];
+            form_id python: '-'.join(task_value['UIDs']);
+            display_id python: ', '.join(task_value['UIDs']);
+          ">
+            <label tal:attributes="for form_id" ><span tal:content="task_value/title">Title</span>
+            (<span tal:content="python: task[0]">id</span>)
+            Current task_config_UID: <span tal:content="task_value/current_uid">current UID</span></label>
+
+            <div class="field">
+                <label tal:attributes="for form_id">New task_config_UID</label>
+                <div class="widget">
+                  <input type="text" value=""
+                  tal:attributes="id form_id;
+                                  name form_id;">
+                </div>
+              </div>
+          </tal:define>
+        </li>
+        </ul>
+        
+        <div class="formControls" class="form-group">
+            <input type="hidden" name="form.submitted" value="1"/>
+
+            <button class="btn btn-primary submit-widget button-field context"
+                    type="submit" name="submit" value="fix">Fix Task
+            </button>
+
+        </div>
+
+      </form>
+
+</div>
+
+</html>

{Products.urban-2.7.30 → Products.urban-2.7.32}/src/Products/urban/locales/fr/LC_MESSAGES/urban.po

@@ -217,7 +217,7 @@ msgstr "Configurer l'élément"
 
 #: ../profiles/default/actions.xml
 msgid "Copy to claimant"
-msgstr "Copier au demandeur"
+msgstr "Créer comme réclamant"
 
 #: ../browser/templates/coring_update.pt:7
 msgid "Coring"