Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions news/SUP-54020.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SUP-54020 Remove `inquirySuspensionPeriods` field from `UrbanTool`
[jchandelle]
18 changes: 0 additions & 18 deletions src/Products/urban/UrbanTool.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,24 +137,6 @@
columns=("condition", "message", "level"),
default=[],
),
DataGridField(
name="inquirySuspensionPeriods",
widget=DataGridWidget(
helper_js=("datagridwidget.js", "datagriddatepicker.js"),
columns={
"from": DateColumn("From", date_format="dd/mm/yy"),
"to": DateColumn("To", date_format="dd/mm/yy"),
},
label=_(
"urban_label_inquirySuspensionPeriods",
default="Inquiry suspension periods",
),
),
allow_oddeven=True,
allow_reorder=False,
schemata="public_settings",
columns=("from", "to"),
),
DataGridField(
name="collegeHolidays",
widget=DataGridWidget(
Expand Down
4 changes: 0 additions & 4 deletions src/Products/urban/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@


validation.register(isReferenceValidator("isReference"))
from validators.validator import isValidInquiryEndDate


validation.register(isValidInquiryEndDate("isValidInvestigationEnd"))
from validators.validator import isInteger


Expand Down
5 changes: 0 additions & 5 deletions src/Products/urban/locales/fr/LC_MESSAGES/urban.po
Original file line number Diff line number Diff line change
Expand Up @@ -3952,11 +3952,6 @@ msgstr "Infrabel"
msgid "urban_label_initials"
msgstr "Initiales"

#. Default: "Inquiry suspension periods"
#: ../UrbanTool.py:148
msgid "urban_label_inquirySuspensionPeriods"
msgstr "Périodes de suspension d'enquêtes"

#. Default: "Inquiry_category"
#: ../content/CODT_UniqueLicenceInquiry.py:45
msgid "urban_label_inquiry_category"
Expand Down
5 changes: 0 additions & 5 deletions src/Products/urban/locales/urban.pot
Original file line number Diff line number Diff line change
Expand Up @@ -3918,11 +3918,6 @@ msgstr ""
msgid "urban_label_initials"
msgstr ""

#. Default: "Inquiry suspension periods"
#: ../UrbanTool.py:148
msgid "urban_label_inquirySuspensionPeriods"
msgstr ""

#. Default: "Inquiry_category"
#: ../content/CODT_UniqueLicenceInquiry.py:45
msgid "urban_label_inquiry_category"
Expand Down
32 changes: 0 additions & 32 deletions src/Products/urban/validators/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,38 +273,6 @@ def __call__(self, value, *args, **kwargs):
)


class isValidInquiryEndDate(object):
"""
Check that the reference is used by a licence
"""

implements(IValidator)

def __init__(self, name):
self.name = name

def __call__(self, value, *args, **kwargs):
if not value:
return 1
portal_urban = api.portal.get_tool("portal_urban")
end_date = DateTime(value)
suspension_periods = portal_urban.getInquirySuspensionPeriods()
for suspension_period in suspension_periods:
suspension_start = DateTime(suspension_period["from"])
suspension_end = DateTime(suspension_period["to"])
if end_date >= suspension_start and end_date < suspension_end + 1:
return translate(
_(
"error_inquiry_suspension",
default=u"The inquiry end date falls during suspension period from {} to {}".format(
suspension_period["from"],
suspension_period["to"],
),
)
)
return 1


class isInteger:
implements(IValidator)

Expand Down