eea.volto.policy 5.7__zip → 6.0__zip

{eea.volto.policy-5.7/eea.volto.policy.egg-info → eea.volto.policy-6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.volto.policy
-Version: 5.7
+Version: 6.0
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.volto.policy
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,20 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+6.0 - (2024-12-05)
+---------------------------
+* Change: Fix plone.app.vocabularies.Users to work with Creators and Contributors Field
+  [avoinea - refs #274362]
+* Fix: Context Navigation title becoming undefined on Edit when deleting a manually added title
+  [ichim-david - refs #280463]
+
+5.8 - (2024-11-26)
+---------------------------
+* Feature: added getObjSize info for File portal_type used to get file size information
+  [ichim-david - refs #280463]
+* Bug fix: fixed title of the initial navigation item when `side_title_nav` isn't set 
+  [ichim-david - refs #280463]
+
 5.7 - (2024-11-24)
 ---------------------------
 * Change: Improve svg upgrade step to know which svgs are fixed and not revisit them

{eea.volto.policy-5.7 → eea.volto.policy-6.0}/docs/HISTORY.txt

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+6.0 - (2024-12-05)
+---------------------------
+* Change: Fix plone.app.vocabularies.Users to work with Creators and Contributors Field
+  [avoinea - refs #274362]
+* Fix: Context Navigation title becoming undefined on Edit when deleting a manually added title
+  [ichim-david - refs #280463]
+
+5.8 - (2024-11-26)
+---------------------------
+* Feature: added getObjSize info for File portal_type used to get file size information
+  [ichim-david - refs #280463]
+* Bug fix: fixed title of the initial navigation item when `side_title_nav` isn't set 
+  [ichim-david - refs #280463]
+
 5.7 - (2024-11-24)
 ---------------------------
 * Change: Improve svg upgrade step to know which svgs are fixed and not revisit them

{eea.volto.policy-5.7 → eea.volto.policy-6.0}/eea/volto/policy/overrides.zcml

@@ -10,4 +10,9 @@
             permission="zope.Public" />
     </configure>
 
+  <utility
+    factory=".vocabularies.principals.UsersFactory"
+    name="plone.app.vocabularies.Users"
+    />
+
 </configure>

{eea.volto.policy-5.7 → eea.volto.policy-6.0}/eea/volto/policy/restapi/services/contextnavigation/get.py

@@ -150,7 +150,6 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
                 state = ""
             else:
                 state = api.content.get_state(root)
-
             res["items"].append(
                 {
                     "@id": root.absolute_url(),
@@ -164,7 +163,7 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
                     "normalized_id": normalized_id,
                     "thumb": "",
                     # set title to side_nav_title if available
-                    "title": getattr(root, "side_nav_title", root_title),
+                    "title": getattr(root, "side_nav_title", "") or root_title,
                     "type": root_type,
                     "review_state": state,
                 }
@@ -174,6 +173,13 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
 
         return res
 
+    def title(self):
+        """ title """
+        # Allow to have empty title without Navigation fallback
+        name = self.data.name
+        # handle bug where empty title is set to undefined from Volto
+        return name if name != "undefined" else self.data.title
+
     def recurse(self, children, level, bottomLevel):
         """Recurse through the navigation tree"""
         res = []
@@ -185,11 +191,12 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
 
         for node in children:
             brain = node["item"]
+            is_file = node["portal_type"] == "File"
 
             icon = ""
 
             if show_icons:
-                if node["portal_type"] == "File":
+                if is_file:
                     icon = self.getMimeTypeIcon(node)
 
             has_thumb = brain.getIcon
@@ -216,8 +223,9 @@ class EEANavigationPortletRenderer(original_get.NavigationPortletRenderer):
                 "normalized_id": node["normalized_id"],
                 "review_state": node["review_state"] or "",
                 "thumb": thumb,
-                "title": node.get("side_nav_title", node["Title"]),
+                "title": getattr(node, "side_nav_title", "") or node["Title"],
                 "type": node["normalized_portal_type"],
+                "getObjSize": brain.getObjSize if is_file else "",
             }
 
             if node.get("nav_title", False):

eea.volto.policy-6.0/eea/volto/policy/version.txt

@@ -0,0 +1 @@
+6.0

eea.volto.policy-6.0/eea/volto/policy/vocabularies/principals.py

@@ -0,0 +1,33 @@
+""" Vocabulary for users.
+"""
+from plone import api
+from plone.app.vocabularies.principals import UsersFactory as BaseUsersFactory
+from plone.app.vocabularies.principals import PrincipalsVocabulary
+from zope.schema.vocabulary import SimpleTerm
+from zope.component.hooks import getSite
+from Products.CMFCore.utils import getToolByName
+
+
+class UsersFactory(BaseUsersFactory):
+    """ Factory creating a UsersVocabulary
+    """
+    @property
+    def items(self):
+        """Return a list of users"""
+        if not self.should_search(query=""):
+            return
+        acl_users = getToolByName(getSite(), "acl_users")
+        userids = set(u.get('id') for u in acl_users.searchUsers())
+        for userid in userids:
+            user = api.user.get(userid)
+            if not user:
+                continue
+            fullname = user.getProperty("fullname", "")
+            if not fullname:
+                continue
+            yield SimpleTerm(userid, userid, fullname)
+
+    def __call__(self, *args, **kwargs):
+        vocabulary = PrincipalsVocabulary(list(self.items))
+        vocabulary.principal_source = self.source
+        return vocabulary

{eea.volto.policy-5.7 → eea.volto.policy-6.0/eea.volto.policy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eea.volto.policy
-Version: 5.7
+Version: 6.0
 Summary: An add-on for Plone
 Home-page: https://github.com/eea/eea.volto.policy
 Author: European Environment Agency: IDM2 A-Team
@@ -128,6 +128,20 @@ EEA_ - European Environment Agency (EU)
 Changelog
 =========
 
+6.0 - (2024-12-05)
+---------------------------
+* Change: Fix plone.app.vocabularies.Users to work with Creators and Contributors Field
+  [avoinea - refs #274362]
+* Fix: Context Navigation title becoming undefined on Edit when deleting a manually added title
+  [ichim-david - refs #280463]
+
+5.8 - (2024-11-26)
+---------------------------
+* Feature: added getObjSize info for File portal_type used to get file size information
+  [ichim-david - refs #280463]
+* Bug fix: fixed title of the initial navigation item when `side_title_nav` isn't set 
+  [ichim-david - refs #280463]
+
 5.7 - (2024-11-24)
 ---------------------------
 * Change: Improve svg upgrade step to know which svgs are fixed and not revisit them

{eea.volto.policy-5.7 → eea.volto.policy-6.0}/eea.volto.policy.egg-info/SOURCES.txt

@@ -204,4 +204,5 @@ eea/volto/policy/upgrades/__init__.py
 eea/volto/policy/upgrades/configure.zcml
 eea/volto/policy/upgrades/upgrade_svgs/upgrade_svg.py
 eea/volto/policy/vocabularies/__init__.py
-eea/volto/policy/vocabularies/configure.zcml
+eea/volto/policy/vocabularies/configure.zcml
+eea/volto/policy/vocabularies/principals.py

eea.volto.policy-5.7/eea/volto/policy/version.txt

@@ -1 +0,0 @@
-5.7