Products.urban 2.7.28__tar.gz → 2.7.30__tar.gz

{Products.urban-2.7.28 → Products.urban-2.7.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Products.urban
-Version: 2.7.28
+Version: 2.7.30
 Summary: Urban Certificate Management
 Home-page: http://www.communesplone.org/les-outils/applications-metier/gestion-des-permis-durbanisme
 Author: Simon Delcourt
@@ -46,6 +46,45 @@ Description: *********
         
         .. towncrier release notes start
         
+        2.7.30 (2025-02-07)
+        -------------------
+        
+        New features:
+        
+        
+        - Add utility view to fix task_config_UID on task
+          [jchandelle] (SUP-41619)
+        - Add utils view to closed task depending filter
+          [jchandelle] (URB-3237)
+        - Add reorder to event attachment
+          [jchandelle] (URBBDC-1111)
+        
+        
+        Bug fixes:
+        
+        
+        - Fix external decision values
+          [daggelpop]
+        
+          Handle default vocabulary values for a non-array field
+          [daggelpop] (SUP-40288)
+        - Fix urban vocabularies following configuration order 
+          [WBoudabous] (SUP-41929)
+        - Add missing translation in schedule config
+          [WBoudabous] (URB-3142)
+        
+        
+        2.7.29 (2025-02-04)
+        -------------------
+        
+        Bug fixes:
+        
+        
+        - Fix encoding in error message for import csv from carto
+          Fix logic and pattern for import csv from carto
+          [jchandelle] (URB-3250)
+        
+        
         2.7.28 (2025-02-02)
         -------------------
         
@@ -1512,5 +1551,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: templates
 Provides-Extra: test
+Provides-Extra: templates

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

@@ -8,6 +8,45 @@ Changelog
 
 .. towncrier release notes start
 
+2.7.30 (2025-02-07)
+-------------------
+
+New features:
+
+
+- Add utility view to fix task_config_UID on task
+  [jchandelle] (SUP-41619)
+- Add utils view to closed task depending filter
+  [jchandelle] (URB-3237)
+- Add reorder to event attachment
+  [jchandelle] (URBBDC-1111)
+
+
+Bug fixes:
+
+
+- Fix external decision values
+  [daggelpop]
+
+  Handle default vocabulary values for a non-array field
+  [daggelpop] (SUP-40288)
+- Fix urban vocabularies following configuration order 
+  [WBoudabous] (SUP-41929)
+- Add missing translation in schedule config
+  [WBoudabous] (URB-3142)
+
+
+2.7.29 (2025-02-04)
+-------------------
+
+Bug fixes:
+
+
+- Fix encoding in error message for import csv from carto
+  Fix logic and pattern for import csv from carto
+  [jchandelle] (URB-3250)
+
+
 2.7.28 (2025-02-02)
 -------------------
 

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

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

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/UrbanEvent.py

@@ -558,7 +558,7 @@ optional_fields = [
 setOptionalAttributes(schema, optional_fields)
 ##/code-section after-local-schema
 
-UrbanEvent_schema = BaseFolderSchema.copy() + schema.copy()
+UrbanEvent_schema = OrderedBaseFolderSchema.copy() + schema.copy()
 
 ##code-section after-schema #fill in your manual code here
 UrbanEvent_schema["title"].widget.condition = "python:here.showTitle()"
@@ -567,7 +567,7 @@ UrbanEvent_schema["title"].required = False
 ##/code-section after-schema
 
 
-class UrbanEvent(BaseFolder, BrowserDefaultMixin):
+class UrbanEvent(OrderedBaseFolder, BrowserDefaultMixin):
     """ """
 
     security = ClassSecurityInfo()
@@ -592,12 +592,19 @@ class UrbanEvent(BaseFolder, BrowserDefaultMixin):
         if not context or not field:
             return [""]
 
-        empty_value = getattr(field, "multivalued", "") and [] or ""
+        multivalued = bool(getattr(field, "multivalued", ""))
+        empty_value = multivalued and [] or ""
         if hasattr(field, "vocabulary") and isinstance(
             field.vocabulary, UrbanVocabulary
         ):
             licence = context.aq_parent
-            return field.vocabulary.get_default_values(licence)
+            default_values = field.vocabulary.get_default_values(licence)
+            # handle case of a list of default values (only one, in principle) for a string field
+            if not multivalued and type(default_values) == list and len(default_values) > 0:
+                return default_values[0]
+            else:
+                return default_values
+
         return empty_value
 
     security.declarePublic("getDefaultText")

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/UrbanTool.py

@@ -25,6 +25,7 @@ from Products.DataGridField.Column import Column
 from Products.DataGridField.SelectColumn import SelectColumn
 from collective.datagridcolumns.DateColumn import DateColumn
 from collective.datagridcolumns.TextAreaColumn import TextAreaColumn
+from collections import OrderedDict
 
 from Products.urban.config import *
 from Products.urban.interfaces import IContactFolder
@@ -444,7 +445,7 @@ class UrbanTool(UniqueObject, OrderedBaseFolder, BrowserDefaultMixin):
             allowedStates=allowedStates,
             with_empty_value=with_empty_value,
         )
-        res = {}
+        res = OrderedDict()
         for brain in brains:
             res[getattr(brain, id_to_use)] = brain.getObject()
         return res

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/UrbanVocabularyTerm.py

@@ -31,7 +31,7 @@ from Products.Archetypes.interfaces import IVocabulary
 from Products.urban import UrbanMessage as _
 from datetime import datetime
 from DateTime import DateTime
-
+from collections import OrderedDict
 from Products.urban.config import PROJECTNAME
 from Products.urban.config import EMPTY_VOCAB_VALUE
 from zope.globalrequest import getRequest
@@ -296,10 +296,11 @@ class UrbanVocabulary(object):
             with_empty_value=self.with_empty_value,
         )
         deposit_date = self._get_deposit_date(content_instance)
-        filtered_terms = {
-            k: v for k, v in voc_terms.items()
-            if self._validate_term(v, deposit_date)
-        }
+        filtered_terms = OrderedDict()
+        for k, v in voc_terms.items():
+             if self._validate_term(v, deposit_date):
+                filtered_terms[k] = v
+      
         return filtered_terms
 
     def listAllVocTerms(self, content_instance):

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

@@ -10,6 +10,7 @@
   <include package=".table" />
   <include package=".warnings" />
   <include package=".exportimport" />
+  <include package=".view_utils" />
   <include file="portlets.zcml" />
 
   <browser:resourceDirectory

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/browser/table/configure.zcml

@@ -265,6 +265,15 @@
      name="reorderactionsColumn"
   />
 
+  <adapter
+     for="zope.interface.Interface
+          zope.publisher.interfaces.browser.IBrowserRequest
+          Products.urban.browser.table.interfaces.IEventAttachmentsTable"
+     factory=".column.ReorderActionsColumn"
+     provides="z3c.table.interfaces.IColumn"
+     name="reorderactionsColumn"
+  />
+
   <adapter
      for="zope.interface.Interface
           zope.publisher.interfaces.browser.IBrowserRequest

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/browser/table/interfaces.py

@@ -161,6 +161,12 @@ class ILicenceAttachmentsTable(IAttachmentsTable):
     """
 
 
+class IEventAttachmentsTable(IAttachmentsTable):
+    """
+    Marker interface for a table displaying all attachments nested in licence events.
+    """
+
+
 class IInternalOpinionServicesTable(Interface):
     """
     Marker interface for a table displaying internal services for opinion requests.

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/browser/table/urbantable.py

@@ -264,6 +264,19 @@ class NestedAttachmentsTable(UrbanTable, SequenceTable):
     startBatchingAt = 9999
 
 
+class EventAttachmentsTable(UrbanTable, SequenceTable):
+    """
+    Render nested attachments from subfolders.
+    """
+
+    implements(interfaces.IEventAttachmentsTable)
+
+    sortOn = None
+    cssClasses = {"table": "listing nosort largetable"}
+    batchSize = 9999
+    startBatchingAt = 9999
+
+
 class InternalOpinionServicesTable(SequenceTable):
     """
     Render nested attachments from subfolders.

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/browser/urbaneventviews.py

@@ -11,7 +11,7 @@ from Products.urban.browser.licence.licenceview import LicenceView
 from Products.urban.browser.table.urbantable import ApplicantTable
 from Products.urban.browser.table.urbantable import ApplicantHistoryTable
 from Products.urban.browser.table.urbantable import DocumentsTable
-from Products.urban.browser.table.urbantable import AttachmentsTable
+from Products.urban.browser.table.urbantable import EventAttachmentsTable
 from Products.urban.browser.table.urbantable import ClaimantsTable
 from Products.urban.browser.table.urbantable import RecipientsCadastreTable
 from Products.urban.interfaces import IGenericLicence
@@ -30,8 +30,11 @@ from zope.interface import Interface
 
 import csv
 import collections
+import logging
 import re
 
+logger = logging.getLogger("Urban Event")
+
 claimants_csv_fieldnames = [
     "personTitle",
     "name1",
@@ -171,7 +174,7 @@ class UrbanEventView(BrowserView):
         if not attachments:
             return ""
 
-        table = AttachmentsTable(self.context, self.request, values=attachments)
+        table = EventAttachmentsTable(self.context, self.request, values=attachments)
         table.update()
         return table.render()
 
@@ -506,16 +509,47 @@ class ImportRecipientListingForm(form.Form):
 
         self.handle_data_to_add_recipients(recipient_args)
 
+    def secondary_extract_proprio(self, proprio):
+        country_pattern = (
+            r"^\d{10,11}\s.*\s\((?:\d{4}-\d{2}-\d{2})?\)\sAdr:\s(?P<country>[A-Z]{2})"
+        )
+        match_country = re.match(country_pattern, proprio)
+        if not match_country:
+            return None
+        pattern_mapping = {
+            "FR": (
+                r"^(?P<id>\d{10,11})\s(?P<name>.*)\s"
+                r"\((?P<dob>(?:\d{4}-\d{2}-\d{2})?)\)\s"
+                r"Adr:\s(?P<country>[A-Z]{2})\s+"
+                r"(?P<number>\d+[\s\/-]?[a-zA-Z]?(?:Bis)?\s?\d*),?\s+"
+                r"(?P<street>.+?)\s(?P<zipcode>\d{5})\s+(?P<city>.+)$"
+            )
+        }
+        country_code = match_country.groupdict()["country"]
+        if country_code not in pattern_mapping:
+            return None
+        match = re.match(pattern_mapping[country_code], proprio)
+        return match
+
     def extract_proprio(self, proprios, capakey, parcel_nature):
         proprio_list = proprios.split(";")
         errors = []
         proprios = []
         for proprio in proprio_list:
-            pattern = "^(?P<id>\d{10,11})\s(?P<name>.*)\s\((?P<dob>(?:\d{4}-\d{2}-\d{2})?)\)\sAdr:\s(?P<country>[A-Z]{2})\s(?P<zipcode>\d{4,5})\s+(?P<city>[A-ZÈÉÁÀÖÔ\s-]+)\s+(?P<street>.+?)\s+(?P<number>\d+[\s\/]?[a-zA-Z]?)$"
-            match = re.match(pattern, proprio.strip())
+            pattern_be = (
+                r"^(?P<id>\d{10,11})\s(?P<name>.*)\s"
+                r"\((?P<dob>(?:\d{4}-\d{2}-\d{2})?)\)\s"
+                r"Adr:\s(?P<country>[A-Z]{2})\s(?P<zipcode>\d{4,5})\s+"
+                r"(?P<city>[A-ZÈÉÊËÁÀÂÖÔÏÎÚÙÛÜŸÇ\s-]+)\s+"
+                r"(?P<street>.+?)\s+(?P<number>\d+[\s\/-]?[a-zA-Z]?\s?\d*)$"
+            )
+            match = re.match(pattern_be, proprio.strip())
             if not match:
-                errors.append(proprio)
-                continue
+                second_match = self.secondary_extract_proprio(proprio.strip())
+                if not second_match:
+                    errors.append(proprio)
+                    continue
+                match = second_match
             match_dict = match.groupdict()
             match_dict["capakey"] = capakey
             match_dict["parcel_nature"] = parcel_nature
@@ -556,10 +590,16 @@ class ImportRecipientListingForm(form.Form):
                 errors += error
             recipient_args += proprio_list
         if errors:
+            errors = [error.decode("utf-8") for error in errors]
             msg = _(
-                "Couldn't import this(these) owner(s): ${owners}",
+                u"Couldn't import this(these) owner(s): ${owners}",
                 mapping={"owners": "; ".join(list(set(errors)))},
             )
+            logger.warning(
+                u"Couldn't import this(these) owner(s): \n\t{}".format(
+                    "\n\t".join(list(set(errors)))
+                )
+            )
             IStatusMessage(self.request).addStatusMessage(msg, type="warning")
         id_numbers = []
         new_recipient_args = []

Products.urban-2.7.30/src/Products/urban/browser/view_utils/close_task.py

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+
+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 plone import api
+from plone.z3cform.layout import FormWrapper
+from z3c.form import button
+from z3c.form import field
+from z3c.form.form import Form
+from zope import schema
+from zope.interface import Interface
+
+import transaction
+import logging
+
+
+logger = logging.getLogger("Closed task utils view")
+
+
+class ICloseTaskSchema(Interface):
+    folder_manager = schema.List(
+        title=_("Licence Folder Manager"),
+        value_type=schema.Choice(vocabulary="urban.folder_managers"),
+        required=False,
+    )
+
+    licence_type = schema.List(
+        title=_("Licence Types"),
+        value_type=schema.Choice(vocabulary="urban.vocabularies.licence_types"),
+        required=False,
+    )
+
+    review_state = schema.List(
+        title=_("Licence States"),
+        value_type=schema.Choice(vocabulary="plone.app.vocabularies.WorkflowStates"),
+        required=False,
+    )
+
+    force_close_frozen = schema.Bool(
+        title=_("Force close frozen task"), required=False, default=True
+    )
+
+
+class CloseTaskForm(Form):
+    fields = field.Fields(ICloseTaskSchema)
+    ignoreContext = True
+
+    def search_tasks(self, data):
+        query = {
+            "context": api.portal.get()["urban"],
+            "object_provides": IGenericLicence,
+        }
+        licence_type = data.get("licence_type", None)
+        if licence_type:
+            query["portal_type"] = licence_type
+
+        folder_manager = data.get("folder_manager", None)
+        if folder_manager:
+            query["folder_manager"] = folder_manager
+
+        review_state = data.get("review_state", None)
+        if review_state:
+            query["review_state"] = review_state
+
+        brains = api.content.find(**query)
+
+        tasks = [item for brain in brains for item in brain.getObject().getAllTasks()]
+        return tasks
+
+    @button.buttonAndHandler(u"Close")
+    def handleClose(self, action):
+        data, errors = self.extractData()
+        if errors:
+            return False
+        tasks = self.search_tasks(data)
+        force_close_frozen = data.get("force_close_frozen", False)
+        for task in tasks:
+            closed_task = False
+            if task.get_state() == "frozen" and force_close_frozen:
+                task._thaw()
+                closed_task = True
+            task._end()
+            task.reindex_parent_tasks(idxs=["is_solvable_task"])
+            if task.get_state() != "frozen":
+                closed_task = True
+            if closed_task:
+                msg = u"Task closed : {} ({})".format(
+                    safe_unicode(task.Title()), task.get_container().absolute_url()
+                )
+                api.portal.show_message(message=msg, request=self.request)
+                logger.info(msg)
+        transaction.commit()
+
+
+class CloseTaskView(FormWrapper):
+    form = CloseTaskForm
+    index = ViewPageTemplateFile("templates/close_task.pt")

Products.urban-2.7.30/src/Products/urban/browser/view_utils/configure.zcml

@@ -0,0 +1,21 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:plone="http://namespaces.plone.org/plone"
+    i18n_domain="urban">
+
+  <browser:page
+     for="Products.urban.interfaces.IGenericLicence"
+     name="fix-task-uid-error"
+     class=".fix_task_uid_error.FixTaskUidError"
+     permission="cmf.ManagePortal"
+  />
+  
+  <browser:page
+     for="*"
+     name="close-task-utils"
+     class=".close_task.CloseTaskView"
+     permission="cmf.ManagePortal"
+  />
+
+</configure>

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

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+from Products.Five import BrowserView
+from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from imio.schedule.interfaces import TaskConfigNotFound
+from imio.schedule.utils import get_container_tasks
+from plone import api
+
+import logging
+import transaction
+
+
+logger = logging.getLogger("Fix task uid error")
+
+
+def check_if_task_error(task):
+    try:
+        task.get_task_config()
+    except TaskConfigNotFound:
+        return True
+    return False
+
+
+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 get_tasks(self):
+        tasks = get_container_tasks(self.context)
+        task_in_error = [task for task in tasks if check_if_task_error(task)]
+        return task_in_error
+
+    def fix_task(self):
+        form = self.request.form
+        del form["form.submitted"]
+        del form["submit"]
+        for task, new_uid in form.items():
+            task_uid = task.split("-")[0]
+            task_to_fix = api.content.get(UID=task_uid)
+            task_to_fix.task_config_UID = new_uid
+        transaction.commit()

Products.urban-2.7.30/src/Products/urban/browser/view_utils/templates/close_task.pt

@@ -0,0 +1,22 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      lang="en"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="imio.schedule">
+
+<head>
+</head>
+
+<body>
+<metal:main fill-slot="main">
+<metal:main_macro define-macro="main">
+  <metal:body define-macro="body_macro">
+    <div id="task-action">
+      <h1 i18n:translate="">Close tasks</h1>
+      <tal:block replace="structure view/contents"></tal:block>
+    </div>
+  </metal:body>
+</metal:main_macro>
+</metal:main>
+</body>
+</html>

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

@@ -0,0 +1,44 @@
+<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 view/get_tasks">
+           <label tal:attributes="for python:'{}-new_uid'.format(task.UID())" ><span tal:content="task/title">Title</span>
+           (<span tal:content="python:'/'.join(task.getPhysicalPath())">id</span>)
+           Current task_config_UID: <span tal:content="task/task_config_UID">current UID</span></label>
+
+           <div class="field">
+              <label tal:attributes="for python:'{}-new_uid'.format(task.UID())">New task_config_UID</label>
+              <div class="widget">
+                <input type="text" value=""
+                tal:attributes="id python:'{}-new_uid'.format(task.UID());
+                                name python:'{}-new_uid'.format(task.UID());">
+              </div>
+            </div>
+        </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.28 → Products.urban-2.7.30}/src/Products/urban/content/UrbanEventAnnouncement.py

@@ -37,7 +37,7 @@ schema = Schema(
 ##/code-section after-local-schema
 
 UrbanEventAnnouncement_schema = (
-    BaseFolderSchema.copy()
+    OrderedBaseFolderSchema.copy()
     + getattr(UrbanEventInquiry, "schema", Schema(())).copy()
     + schema.copy()
 )
@@ -48,7 +48,7 @@ UrbanEventAnnouncement_schema["eventDate"].widget.visible["view"] = "invisible"
 ##/code-section after-schema
 
 
-class UrbanEventAnnouncement(BaseFolder, UrbanEventInquiry, BrowserDefaultMixin):
+class UrbanEventAnnouncement(OrderedBaseFolder, UrbanEventInquiry, BrowserDefaultMixin):
     """ """
 
     security = ClassSecurityInfo()
@@ -84,7 +84,7 @@ class UrbanEventAnnouncement(BaseFolder, UrbanEventInquiry, BrowserDefaultMixin)
                 },
                 default="You can not delete an UrbanEventAnnouncement if it is not the last!  Remove the last UrbanEventAnnouncements before being able to remove this one!",
             )
-        BaseFolder.manage_beforeDelete(self, item, container)
+        OrderedBaseFolderSchema.manage_beforeDelete(self, item, container)
 
     security.declarePublic("getClaimants")
 

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/content/UrbanEventInquiry.py

@@ -179,7 +179,7 @@ schema = Schema(
 ##/code-section after-local-schema
 
 UrbanEventInquiry_schema = (
-    BaseFolderSchema.copy()
+    OrderedBaseFolderSchema.copy()
     + getattr(UrbanEvent, "schema", Schema(())).copy()
     + schema.copy()
 )
@@ -190,7 +190,7 @@ UrbanEventInquiry_schema["eventDate"].widget.visible["view"] = "invisible"
 ##/code-section after-schema
 
 
-class UrbanEventInquiry(BaseFolder, UrbanEvent, BrowserDefaultMixin):
+class UrbanEventInquiry(OrderedBaseFolder, UrbanEvent, BrowserDefaultMixin):
     """ """
 
     security = ClassSecurityInfo()
@@ -226,7 +226,7 @@ class UrbanEventInquiry(BaseFolder, UrbanEvent, BrowserDefaultMixin):
                 },
                 default="You can not delete an UrbanEventInquiry if it is not the last!  Remove the last UrbanEventInquiries before being able to remove this one!",
             )
-        BaseFolder.manage_beforeDelete(self, item, container)
+        OrderedBaseFolder.manage_beforeDelete(self, item, container)
 
     def getRecipients(self, theObjects=True, onlyActive=False):
         """

{Products.urban-2.7.28 → Products.urban-2.7.30}/src/Products/urban/content/UrbanEventInspectionReport.py

@@ -132,13 +132,13 @@ schema = Schema(
 
 
 UrbanEventInspectionReport_schema = (
-    BaseFolderSchema.copy()
+    OrderedBaseFolderSchema.copy()
     + getattr(UrbanEvent, "schema", Schema(())).copy()
     + schema.copy()
 )
 
 
-class UrbanEventInspectionReport(BaseFolder, UrbanEvent, BrowserDefaultMixin):
+class UrbanEventInspectionReport(OrderedBaseFolder, UrbanEvent, BrowserDefaultMixin):
     """ """
 
     security = ClassSecurityInfo()