0003-formdata-prefetch-also-users-from-evolutions-71303.patch

Lauréline Guérin, 15 novembre 2022 11:51

Voir les différences: en ligne côte à côte

Subject: [PATCH 3/3] formdata: prefetch also users from evolutions (#71303)

 wcs/backoffice/management.py | 18 ++++++++++++------
 wcs/formdata.py              | 12 ++++++++----
 2 files changed, 20 insertions(+), 10 deletions(-)

             formdef = self.kwargs['formdef_class'].get(self.kwargs['formdef_id'])
             prefetched_users = None
             prefetched_roles = None
             user_ids = list(
                 set(
                     [x.user_id for x in items if x.user_id]
                     + [x.submission_agent_id for x in items if x.submission_agent_id]
+                )
             user_ids = set(
                 [x.user_id for x in items if x.user_id]
                 + [x.submission_agent_id for x in items if x.submission_agent_id]
+            )
             if include_evolution:
                 for item in items:
                     if not item.evolution:
                         continue
                     for evo in item.evolution:
                         if not evo.who or evo.who.startswith('_'):
                             continue
                         user_ids.add(evo.who)
             prefetched_users = {
                 str(x.id): x
                 for x in get_publisher().user_class.get_ids(user_ids, ignore_errors=True)
                 for x in get_publisher().user_class.get_ids(list(user_ids), ignore_errors=True)
                 if x is not None
+            }
             if include_roles:

                     return part.get_as_plain_text()
             return self.comment
         def get_json_export_dict(self, formdata_user, anonymise=False, include_files=True):
         def get_json_export_dict(self, formdata_user, anonymise=False, include_files=True, prefetched_users=None):
             data = {
                 'time': datetime.datetime(*self.time[:6]) if self.time else None,
                 'last_jump_datetime': self.last_jump_datetime,
-...
                 data['status'] = self.status[3:]
             if self.who != '_submitter':
                 try:
                     user = get_publisher().user_class.get(self.who)
                     if prefetched_users is not None:
                         user = prefetched_users.get(str(self.who))
                     else:
                         user = get_publisher().user_class.get(self.who)
                 except KeyError:
                     pass
                 else:
                     user = None
                 if user is not None:
                     data['who'] = user.get_json_export_dict()
             elif not anonymise and formdata_user:
                 data['who'] = formdata_user.get_json_export_dict()
-...
                             formdata_user=formdata_user,
                             anonymise=anonymise,
                             include_files=include_files,
                             prefetched_users=prefetched_users,
+                        )
+                    )
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0003-formdata-prefetch-also-users-from-evolutions-71303.patch