Merge pull request #30 from eea/develop

Develop
eea · Feb 14, 2022 · d8e600a · d8e600a
2 parents 5821289 + 0994450
commit d8e600a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Products/Reportek/EnvelopeCustomDataflows.py b/Products/Reportek/EnvelopeCustomDataflows.py
@@ -1538,17 +1538,18 @@ def get_previous_deliveries(self):
         }
         # Get all the company collections
         colls = self.get_company_collections()
-
-        # Filter out collections when there's no Add Envelopes permission
-        for k in envs.keys():
-            c_colls = [col for col in colls.get(k, [])
-                       if getSecurityManager().checkPermission('Add Envelopes',
-                                                               col)]
-            for col in c_colls:
-                if col.company_id == self.company_id:
-                    envs[k] = envs[k] + \
-                        [env for env in col.objectValues(
-                            'Report Envelope')]
+        if colls:
+            # Filter out collections when there's no Add Envelopes permission
+            for k in envs.keys():
+                c_colls = [col for col in colls.get(k, [])
+                           if getSecurityManager().checkPermission(
+                                'Add Envelopes',
+                                col)]
+                for col in c_colls:
+                    if col.company_id == self.company_id:
+                        envs[k] = envs[k] + \
+                            [env for env in col.objectValues(
+                                'Report Envelope')]
 
         return envs
 

diff --git a/Products/Reportek/version.txt b/Products/Reportek/version.txt
@@ -1 +1 @@
-4.12
+4.13
diff --git a/Products/Reportek/zpt/envelope/macros.zpt b/Products/Reportek/zpt/envelope/macros.zpt
@@ -26,6 +26,7 @@
         <tal:block define="dummy_var python:request.RESPONSE.setHeader('Refresh','60')" />
         <a tal:condition="python: context.is_cancellable(item.getId())"
            tal:attributes="href string:cancel_activity?workitem_id=${item/id}"
+           class="cancel-activity"
            onclick="confirm_cancel(event)" i18n:translate="">Cancel</a>
       </tal:block>
       <tal:block condition="not:python:item.actor == 'openflow_engine'"