emrt.necd.content 2.5.45__zip → 2.5.47__zip

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.45
+Version: 2.5.47
 Summary: Content-types for EMRT-NECD Review Tool
 Home-page: https://github.com/eea/emrt.necd.content/
 Author: Mikel Larreategi
@@ -15,9 +15,17 @@ Description: Introduction
         Changelog
         =========
         
+        2.5.47 (2024-04-11)
+        
+        - Bug #268428 - Unable to take extract from test site
+        
+        2.5.46 (2024-02-09)
+        
+        - Feature #260974 - Possibility to recall obs after sending to approval
+        
         2.5.45 (2024-02-08)
         
-        - Task #260968 - Reminder button needs to be developed so the Lead Reviews can use it close to the deadline
+        - Feature #260968 - Reminder button needs to be developed so the Lead Reviews can use it close to the deadline
         
         2.5.44 (2024-02-06)
         

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/docs/HISTORY.txt

@@ -1,9 +1,17 @@
 Changelog
 =========
 
+2.5.47 (2024-04-11)
+
+- Bug #268428 - Unable to take extract from test site
+
+2.5.46 (2024-02-09)
+
+- Feature #260974 - Possibility to recall obs after sending to approval
+
 2.5.45 (2024-02-08)
 
-- Task #260968 - Reminder button needs to be developed so the Lead Reviews can use it close to the deadline
+- Feature #260968 - Reminder button needs to be developed so the Lead Reviews can use it close to the deadline
 
 2.5.44 (2024-02-06)
 

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt/necd/content/browser/statechange.py

@@ -183,11 +183,10 @@ class DenyFinishObservationReasonForm(Form):
 class RecallObservation(BrowserView):
     def __call__(self):
         state = api.content.get_state(self.context)
-        transition_id = ""
+        transition_id = "recall-lr"
 
         if state == "conclusions-lr-denied":
             self.context.closing_deny_comments = ""
-            transition_id = "recall-lr"
 
         elif state == "close-requested":
             self.context.closing_comments = ""
@@ -195,12 +194,15 @@ class RecallObservation(BrowserView):
                 "esd-review-workflow", []
             )
 
-            prev_state = observation_history[-2]['review_state']
+            state_history = [hist["review_state"] for hist in observation_history]
 
-            if prev_state == "conclusions":
-                transition_id = "recall-se-conclusions"
-            elif prev_state == "conclusions-lr-denied":
-                transition_id = "recall-se-conclusions-lr-denied"
+            for prev_state in reversed(state_history):
+                if prev_state == "conclusions":
+                    transition_id = "recall-se-conclusions"
+                    break
+                elif prev_state == "conclusions-lr-denied":
+                    transition_id = "recall-se-conclusions-lr-denied"
+                    break
 
         with api.env.adopt_roles(["Manager"]):
             api.content.transition(obj=self.context, transition=transition_id)

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt/necd/content/profiles/default/metadata.xml

@@ -1,5 +1,5 @@
 <metadata>
-  <version>2.5.45</version>
+  <version>2.5.47</version>
     <dependencies>
         <dependency>profile-plone.app.dexterity:default</dependency>
         <dependency>profile-plone.app.ldap:ldap</dependency>

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt/necd/content/profiles/default/workflows/esd-review-workflow/definition.xml

@@ -379,7 +379,7 @@
   </guard>
  </transition>
  <transition transition_id="recall-se" title="Recall from finish observation request." new_state="" trigger="USER" before_script="" after_script="">
-   <action url="%(content_url)s/recall-observation?workflow_action=recall-se" category="workflow" icon="">Recall</action>
+   <action url="%(content_url)s/recall-observation?workflow_action=recall-se" category="workflow" icon="">Recall finalisation request</action>
    <guard>
      <guard-role>SectorExpert</guard-role>
    </guard>

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt/necd/content/reviewfolder.py

@@ -9,6 +9,7 @@ from AccessControl import getSecurityManager, Unauthorized
 from DateTime import DateTime
 from plone import api
 from plone import directives
+from plone.app.textfield.value import RichTextValue
 from plone.app.content.browser.tableview import Table
 from plone.batching import Batch
 from plone.dexterity.content import Container
@@ -44,6 +45,7 @@ import html2text
 from emrt.necd.content.utils import get_vocabulary_value
 from emrt.necd.content.utils import user_has_ldap_role
 from emrt.necd.content.utils import reduce_text
+from emrt.necd.content.utils import richtext2text
 from emrt.necd.content.utilities.interfaces import IUserIsMS
 from emrt.necd.content.utilities.interfaces import ISetupReviewFolderRoles
 from emrt.necd.content.utilities.interfaces import IGetLDAPWrapper
@@ -723,7 +725,11 @@ class ExportReviewFolderForm(form.Form, ReviewFolderMixin):
                     last_question_id = comment_ids[-1] if comment_ids else "-"
                     row.append(last_question_id)
                 else:
-                    row.append(safe_unicode(observation[key]))
+                    field_value = observation[key]
+                    if isinstance(field_value, RichTextValue):
+                        row.append(richtext2text(field_value, self.context))
+                    else:
+                        row.append(safe_unicode(field_value))
 
             if base_len == 0:
                 base_len = len(row)

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt/necd/content/upgrades/configure.zcml

@@ -784,4 +784,17 @@
 
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+    source="2.5.45"
+    destination="2.5.46"
+    profile="emrt.necd.content:default">
+
+    <genericsetup:upgradeDepends
+      title="Import workflows"
+      description="[refs #260974] Recall 'close-requested' observation by SR."
+      import_steps="workflow"
+      />
+
+  </genericsetup:upgradeSteps>
+
 </configure>

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt/necd/content/utils.py

@@ -5,6 +5,8 @@ from itertools import chain
 from operator import itemgetter
 import concurrent.futures
 
+import html2text
+
 import plone.api as api
 
 from zope.component import getUtility
@@ -139,6 +141,12 @@ def render_rich_text_value(context, obj):
         return obj.text
 
 
+def richtext2text(value, context):
+    html_value = value.output_relative_to(context)
+    output_text = html2text.html2text(html_value)
+    return safe_unicode(output_text)
+
+
 def safer_unicode(text):
     """ Attempt to fix mixed latin1 + utf-8. """
     try:

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/emrt.necd.content.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: emrt.necd.content
-Version: 2.5.45
+Version: 2.5.47
 Summary: Content-types for EMRT-NECD Review Tool
 Home-page: https://github.com/eea/emrt.necd.content/
 Author: Mikel Larreategi
@@ -15,9 +15,17 @@ Description: Introduction
         Changelog
         =========
         
+        2.5.47 (2024-04-11)
+        
+        - Bug #268428 - Unable to take extract from test site
+        
+        2.5.46 (2024-02-09)
+        
+        - Feature #260974 - Possibility to recall obs after sending to approval
+        
         2.5.45 (2024-02-08)
         
-        - Task #260968 - Reminder button needs to be developed so the Lead Reviews can use it close to the deadline
+        - Feature #260968 - Reminder button needs to be developed so the Lead Reviews can use it close to the deadline
         
         2.5.44 (2024-02-06)
         

{emrt.necd.content-2.5.45 → emrt.necd.content-2.5.47}/setup.py

@@ -3,7 +3,7 @@ import os
 from setuptools import find_packages
 from setuptools import setup
 
-VERSION = "2.5.45"
+VERSION = "2.5.47"
 
 
 setup(