Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 77cbfd0
Author: Roman <roman.kysil@redturtle.it>
Date:   Fri Oct 13 18:04:14 2023 +0200

    Update redturtle.prenotazioni verison to 2.1.3

commit e4f3034
Author: Roman <roman.kysil@redturtle.it>
Date:   Fri Oct 13 17:44:14 2023 +0200

    Fixed imports

commit 5ec0e3c
Author: Roman <roman.kysil@redturtle.it>
Date:   Fri Oct 13 17:28:59 2023 +0200

    Squashed commit of the following:

    commit 3b5583c
    Author: Roman <roman.kysil@redturtle.it>
    Date:   Fri Oct 13 17:27:53 2023 +0200

        Update redturtle.prenotazioni version

    commit ea11622
    Author: Roman <72063601+folix-01@users.noreply.github.com>
    Date:   Fri Oct 13 14:29:48 2023 +0200

        Add the contact info to @bookable-uo-list response (#27)

        * Add the contact info to @bookable-uo-list response

        * Update src/design/plone/ioprenoto/restapi/services/bookable_list/get.py

        Co-authored-by: Mauro Amico <mauro.amico@gmail.com>

        * Use python syntax

        * Update src/design/plone/ioprenoto/restapi/services/bookable_list/get.py

        Co-authored-by: Mauro Amico <mauro.amico@gmail.com>

        ---------

        Co-authored-by: Mauro Amico <mauro.amico@gmail.com>

    commit e2ceb8c
    Author: Roman <roman.kysil@redturtle.it>
    Date:   Wed Oct 11 09:37:56 2023 +0200

        Add changelog

    commit 65911f2
    Author: Roman <roman.kysil@redturtle.it>
    Date:   Wed Oct 11 09:05:01 2023 +0200

        Align with redturtle.prenotazioni>=2.0.1 version
  • Loading branch information
folix-01 committed Oct 13, 2023
1 parent eeeb809 commit ed19313
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ Changelog
1.1.9 (unreleased)
------------------

- Nothing changed yet.
- Compatibilize with the 2.1.3redturtle.prenotazioni version.
[folix-01]


1.1.8 (2023-10-13)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"z3c.jbot",
"plone.api>=1.8.4",
"plone.app.dexterity",
"redturtle.prenotazioni >= 2.1.1",
"redturtle.prenotazioni>=2.1.3",
"design.plone.policy",
],
extras_require={
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
from plone import api
from plone.restapi.interfaces import ISerializeToJson
from plone.restapi.interfaces import ISerializeToJsonSummary
from plone.restapi.serializer.dxcontent import SerializeFolderToJson
from plone.restapi.serializer.summary import DefaultJSONSummarySerializer
from redturtle.prenotazioni.content.prenotazioni_folder import IPrenotazioniFolder
from redturtle.prenotazioni.content.prenotazioni_folder import (
IPrenotazioniFolder,
)
from redturtle.prenotazioni.restapi.serializers.adapters.prenotazioni_folder import (
PrenotazioniFolderSerializer,
)
from zope.component import adapter
from zope.interface import implementer

Expand Down Expand Up @@ -38,7 +42,7 @@ def __call__(self, *args, **kwargs):

@implementer(ISerializeToJson)
@adapter(IPrenotazioniFolder, IDesignPloneIoprenotoLayer)
class SerializePrenotazioniFolderToJson(SerializeFolderToJson):
class SerializePrenotazioniFolderToJson(PrenotazioniFolderSerializer):
def __call__(self, *args, **kwargs):
resp = super().__call__(*args, **kwargs)
if not api.user.has_permission(
Expand Down

0 comments on commit ed19313

Please sign in to comment.