esdrt.content 1.74.3__zip → 1.74.5__zip

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: esdrt.content
-Version: 1.74.3
+Version: 1.74.5
 Summary: Content-types for ESD Review Tool
 Home-page: https://github.com/eea/esdrt.content/
 Author: Mikel Larreategi
@@ -15,8 +15,20 @@ Description: Introduction
         Changelog
         =========
         
+        1.74.5 (2024-02-16)
+        -------------------
+        - Task: #265134 - Adding flags to the export function
+          [batradav]
+        
+        1.74.4 (2024-01-05)
+        -------------------
+        - Feature: #261306 - Create new conclusion flag
+        - Feature: #261305 - Create new description flag
+          [batradav]
+        
         1.74.3 (2023-02-22)
         -------------------
+        - BAD RELEASE
         - Bug #241804 - Observation history timeline not displaying all actions
           [batradav]
         

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/docs/HISTORY.txt

@@ -1,8 +1,20 @@
 Changelog
 =========
 
+1.74.5 (2024-02-16)
+-------------------
+- Task: #265134 - Adding flags to the export function
+  [batradav]
+
+1.74.4 (2024-01-05)
+-------------------
+- Feature: #261306 - Create new conclusion flag
+- Feature: #261305 - Create new description flag
+  [batradav]
+
 1.74.3 (2023-02-22)
 -------------------
+- BAD RELEASE
 - Bug #241804 - Observation history timeline not displaying all actions
   [batradav]
 

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/esdrt/content/observation.py

@@ -393,7 +393,7 @@ class Observation(dexterity.Container):
                 self._vocabulary_value("esdrt.content.highlight", h)
                 for h in self.highlight
             ]
-            return u", ".join(highlight)
+            return u", ".join([x for x in highlight if x])
         return u""
 
     def finish_reason_value(self):

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/esdrt/content/profiles/default/esdrtvocabularies/highlight.csv

@@ -5,6 +5,7 @@ recalc-same,Recalculation (compared to same year submission)
 unfccc,UNFCCC recommendation
 lulucf-regulation,LULUCF Regulation
 2019-refinement,2019 Refinement
+article-37-4a,Article 37 (4a)
 ur,Union recommendation
 psi,Potential significant issue (PSI) (step 1)
 ptc,Potential technical correction (PTC) (step 2)
@@ -14,3 +15,4 @@ rev-est,Revised estimate
 recommendation,Recommendation
 point-of-attention-lulucf-step2,Point of Attention (LULUCF Step 2)
 potential-follow-up,Potential Follow-Up
+lulucf-recommendation,LULUCF Recommendation

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/esdrt/content/reviewfolder.py

@@ -183,6 +183,7 @@ class IReviewFolder(plone.directives.form.Schema, IImageScaleTraversable):
         fields=[
             "excluded_highlights",
             "internal_highlights",
+            "highlights_access_roles",
             "enable_key_category",
             "enable_steps",
         ]
@@ -203,6 +204,14 @@ class IReviewFolder(plone.directives.form.Schema, IImageScaleTraversable):
         required=False,
     )
 
+    # [refs #261305 #261306]
+    highlights_access_roles = Text(
+        title=u"Protect highlights with required role",
+        description=u"One per line, space separated between highlight id and roles, roles are comma separated.",
+        default=u"",
+        required=False,
+    )
+
     # [refs #159091]
     enable_key_category = Bool(
         title=u"Show 'Key category'",
@@ -519,7 +528,7 @@ EXPORT_FIELDS = OrderedDict(
         ("review_year", "Review Year"),
         ("year", "Inventory year"),
         ("gas_value", "GAS"),
-        ("get_highlight", "Highlight"),
+        ("get_highlight", "Description flags"),
         ("overview_status", "Status"),
         ("observation_phase", "Step"),
         ("observation_finalisation_reason_step1", "Conclusion step 1"),
@@ -653,10 +662,22 @@ class ExportReviewFolderForm(form.Form, ReviewFolderMixin):
             return super(ExportReviewFolderForm, self).render()
 
     def translate_highlights(self, highlights):
-        return [
-            self._vocabulary_value("esdrt.content.highlight", highlight)
+        values = [
+            self._highlight_vocabulary_value("esdrt.content.highlight", highlight)
             for highlight in highlights
         ]
+        return [v for v in values if v]
+
+    def _highlight_vocabulary_value(self, vocabulary, term):
+        vocab_factory = getUtility(IVocabularyFactory, name=vocabulary)
+        vocabulary = vocab_factory(self)
+        if not term:
+            return u""
+        try:
+            value = vocabulary.getTerm(term)
+            return value.title
+        except LookupError:
+            return None
 
     def _vocabulary_value(self, vocabulary, term):
         vocab_factory = getUtility(IVocabularyFactory, name=vocabulary)

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/esdrt/content/vocabularies.py

@@ -14,6 +14,21 @@ def mk_term(key, value):
     return SimpleVocabulary.createTerm(key, key, value)
 
 
+def permissions_to_dict(text):
+    result = {}
+
+    text = text.strip()
+
+    if text:
+        for entry in [x.strip() for x in text.split("\n")]:
+            try:
+                highlight_id, role_string = [x.strip() for x in entry.split(" ", 1)]
+                result[highlight_id] = [x.strip() for x in role_string.split(",")]
+            except ValueError:
+                continue
+
+    return result
+
 @implementer(IVocabularyFactory)
 class MSVocabulary(object):
 
@@ -113,6 +128,10 @@ class Highlight(object):
             # [refs #159094]
             excluded_highlights = getattr(
                 context, "excluded_highlights", []) or []
+            
+            # [refs #261305 #261306]
+            highlights_access_roles = permissions_to_dict(getattr(context, "highlights_access_roles", "") or "")
+            user_roles = api.user.get_roles(obj=context)
 
             for key, value in voc.getVocabularyLines():
                 # [refs #159093]
@@ -123,6 +142,10 @@ class Highlight(object):
                 if key in excluded_highlights:
                     continue
 
+                # [refs #261305 #261306]
+                if highlights_access_roles.get(key) and not set(highlights_access_roles[key]).intersection(user_roles):
+                    continue
+
                 terms.append(SimpleVocabulary.createTerm(key, key, value))
 
         return SimpleVocabulary(terms)

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/esdrt.content.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: esdrt.content
-Version: 1.74.3
+Version: 1.74.5
 Summary: Content-types for ESD Review Tool
 Home-page: https://github.com/eea/esdrt.content/
 Author: Mikel Larreategi
@@ -15,8 +15,20 @@ Description: Introduction
         Changelog
         =========
         
+        1.74.5 (2024-02-16)
+        -------------------
+        - Task: #265134 - Adding flags to the export function
+          [batradav]
+        
+        1.74.4 (2024-01-05)
+        -------------------
+        - Feature: #261306 - Create new conclusion flag
+        - Feature: #261305 - Create new description flag
+          [batradav]
+        
         1.74.3 (2023-02-22)
         -------------------
+        - BAD RELEASE
         - Bug #241804 - Observation history timeline not displaying all actions
           [batradav]
         

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/esdrt.content.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ docs/HISTORY.txt
 docs/INSTALL.txt
 docs/LICENSE.GPL
 docs/LICENSE.txt
+esdrt/.DS_Store
 esdrt/__init__.py
 esdrt.content.egg-info/PKG-INFO
 esdrt.content.egg-info/SOURCES.txt

{esdrt.content-1.74.3 → esdrt.content-1.74.5}/setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import find_packages
 from setuptools import setup
 
-version = "1.74.3"
+version = "1.74.5"
 
 setup(
     name="esdrt.content",