From 16982d012cd77c700c80ee5c1154e0841ea4ac7d Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Mon, 20 Jun 2016 11:54:18 +0200 Subject: [PATCH] do not anonymise agents in evolutions (fixes #11432) It allows making statistics on agents. --- wcs/formdata.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wcs/formdata.py b/wcs/formdata.py index 7b8d099..9ea8dfa 100644 --- a/wcs/formdata.py +++ b/wcs/formdata.py @@ -158,17 +158,17 @@ class Evolution(object): } if self.status: data['status'] = self.status[3:] - if not anonymise: + if self.who != '_submitter': try: - if self.who != '_submitter': - user = get_publisher().user_class.get(self.who) + user = get_publisher().user_class.get(self.who) except KeyError: pass else: - if user: - data['who'] = user.get_json_export_dict() - if self.comment: - data['comment'] = self.comment + data['who'] = user.get_json_export_dict() + elif not anonymise and user: + data['who'] = user.get_json_export_dict() + if self.comment and not anonymise: + data['comment'] = self.comment parts = [] for part in self.parts or []: if hasattr(part, 'get_json_export_dict'): -- 2.1.4