Merge remote-tracking branch 'origin/main' into PARAF-359_file_added_to_same_session_again

Author: gbastien

CHANGES.rst

@@ -29,6 +29,8 @@ Changelog
   [chris-adam]
 - Added external watchers for esign sessions.
   [chris-adam, sgeulette]
+- Added possibility to have elements of the same context to belong to different sessions.
+  [chris-adam]
 - Manage file added again to same session, data is updated.
   [gbastien]
 

src/imio/esign/browser/templates/macros.pt

@@ -1,10 +1,10 @@
 <tr metal:define-macro="session_id" i18n:domain="imio.esign">
     <td class="table_widget_label"><label i18n:translate="">Session ID</label></td>
     <td class="table_widget_value" tal:define="can_link python:view.can_display_sessions_listing_link()">
-        <span tal:condition="not: can_link" tal:content="python: session['id']">25452</span>
+        <span tal:condition="not: can_link" tal:content="python: session_id">25452</span>
         <a tal:condition="can_link" href="#" target="_blank"
-           tal:content="python: session['id']"
-           tal:attributes="href python:'{}#{}'.format(view.session_listing_url, session['id'])">25452 - College</a>
+           tal:content="python: session_id"
+           tal:attributes="href python:'{}#{}'.format(view.session_listing_url, session_id)">25452 - College</a>
     </td>
 </tr>
 <tr metal:define-macro="state" i18n:domain="imio.esign">
@@ -40,7 +40,7 @@
 <tr metal:define-macro="signers" i18n:domain="imio.esign">
     <td class="table_widget_label"><label i18n:translate="">Signers</label></td>
     <td class="table_widget_value">
-        <table id="context_viewlet_signers_table" class="no-border no-style-table listing"
+        <table class="context_viewlet_signers_table no-border no-style-table listing"
                  tal:define="signers python:session.get('signers', [])">
             <thead>
             <tr>

src/imio/esign/browser/templates/session_info.pt

@@ -12,30 +12,37 @@
     </div>
     <div id="collapsible-session-info"
          tal:attributes="class python: view.collapsible_content_css_default()">
-      <div class="collapsible-inner-content session-info-container"
-           tal:define="template python: context.unrestrictedTraverse('@@esign-macros').index;
-                       session python: view.session">
-        <div class="session-info-column">
-            <table id="context_viewlet_session_table" class="no-style-table table-view-widgets">
-                <tbody>
-                <tal:block tal:repeat="macro_name python:view.get_table_rows(1)">
-                    <metal:render_cell use-macro="python: template.macros[macro_name]" />
-                </tal:block>
-                </tbody>
-            </table>
-        </div>
+      <tal:loop repeat="session_infos python:view.sessions.items()">
+        <div class="collapsible-inner-content session-info-container"
+             tal:attributes="class python:'collapsible-inner-content session-info-container ' + classOddEven"
+             tal:define="oddrow repeat/session_infos/odd;
+                         classOddEven python: oddrow and 'even' or 'odd';
+                         template python: context.unrestrictedTraverse('@@esign-macros').index">
+          <tal:session_defines define="session_id python: session_infos[0];
+                                       session python: session_infos[1]">
+            <div class="session-info-column">
+                <table tal:attributes="id string:context_viewlet_session_table_${session_id}" class="no-style-table table-view-widgets">
+                    <tbody>
+                    <tal:block tal:repeat="macro_name python:view.get_table_rows(1)">
+                        <metal:render_cell use-macro="python: template.macros[macro_name]" />
+                    </tal:block>
+                    </tbody>
+                </table>
+            </div>
 
-        <div class="session-info-column">
-            <table id="context_viewlet_session_signers" class="no-style-table table-view-widgets">
-                <tbody>
-                <tal:block tal:repeat="macro_name python:view.get_table_rows(2)">
-                    <metal:render_cell use-macro="python: template.macros[macro_name]" />
-                </tal:block>
-                </tbody>
-            </table>
+            <div class="session-info-column">
+                <table tal:attributes="id string:context_viewlet_session_signers_${session_id}" class="no-style-table table-view-widgets">
+                    <tbody>
+                    <tal:block tal:repeat="macro_name python:view.get_table_rows(2)">
+                        <metal:render_cell use-macro="python: template.macros[macro_name]" />
+                    </tal:block>
+                    </tbody>
+                </table>
+            </div>
+        </tal:session_defines>
         </div>
-        <script>$('table#context_viewlet_signers_table').each(setoddeven);</script>
-      </div>
+      </tal:loop>
+    <script>$('table.context_viewlet_signers_table').each(setoddeven);</script>
     </div>
   </div>
 

src/imio/esign/browser/views.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from AccessControl import Unauthorized
+from copy import deepcopy
 from datetime import datetime
 from datetime import timedelta
 from imio.esign import _
@@ -12,6 +13,7 @@
 from imio.esign.config import get_registry_signing_users_email_content
 from imio.esign.utils import create_external_session
 from imio.esign.utils import get_session_annotation
+from imio.esign.utils import get_sessions_for
 from imio.esign.utils import get_state_description
 from imio.esign.utils import remove_session
 from imio.helpers.content import uuidToObject
@@ -206,23 +208,25 @@ def sessions_collection_uid(self):
     def render(self):
         """Render the viewlet."""
         if self.request.form.get("c1[]", None) == self.sessions_collection_uid:
-            if self.session:
+            if self.sessions:
                 return self.index()
             return self.sessions_listing_view(self.context, self.request).render_table()
         return ""
 
     @property
-    def session(self):
-        session = None
+    def sessions(self):
         session_id = self.request.form.get("esign_session_id[]", None)
-        if not session_id:
-            return
+        try:
+            session_id = int(session_id)
+        except (TypeError, ValueError):
+            return []
         sessions = get_session_annotation()["sessions"]
-        session = sessions.get(int(session_id))
+        session = sessions.get(session_id)
         if not session:
-            return
+            return []
+        session = deepcopy(session)
         session["id"] = session_id
-        return session
+        return [session]
 
     def get_table_rows(self, column):
         """Get the table rows following the column"""
@@ -252,27 +256,22 @@ def get_state_description(self, state):
 
 
 class ItemSessionInfoViewlet(FacetedSessionInfoViewlet):
-    """Show selected session info for an item."""
+    """Show session info for all sessions linked to a context item."""
 
     def available(self):
         """Global availability of the viewlet."""
         return True
 
     def render(self):
         """Render the viewlet."""
-        if self.session:
+        if self.sessions:
             return self.index()
         return ""
 
     @property
-    def session(self):
-        annot = get_session_annotation()
-        for f_uid in annot["c_uids"].get(self.context.UID(), []):
-            if f_uid in annot["uids"]:
-                session = annot["sessions"].get(annot["uids"][f_uid], {})
-                session["id"] = annot["uids"][f_uid]
-                return session
-        return {}
+    def sessions(self):
+        """Return all sessions that contain files from this context."""
+        return get_sessions_for(self.context.UID())
 
 
 @implementer(IPublishTraverse)
@@ -420,12 +419,17 @@ def filter_user(self, user_data):
             portal_type="held_position",
             userid=user_data["userid"],
         )
-        if not hps:
-            return False
         for hp in hps:
             hp_obj = hp.getObject()
             if base_hasattr(hp_obj, "usages") and "signer" in hp_obj.usages:
                 return True
+
+        user_obj = api.user.get(userid=user_data["userid"])
+        if user_obj:
+            for group in api.group.get_groups(user=user_obj):
+                if group.getId().endswith("watchers"):
+                    return True
+
         return False
 
     def get_users_data(self):
@@ -515,7 +519,7 @@ def _get_selected_userids(self):
         # Parse JSON array
         try:
             return json.loads(selected)
-        except (json.JSONDecodeError, ValueError, TypeError):
+        except (ValueError, TypeError):
             return []
 
     def _download_csv(self):