0002-formdata-rename-user-param-into-formdata_user-71303.patch
wcs/formdata.py | ||
---|---|---|
202 | 202 |
return part.get_as_plain_text() |
203 | 203 |
return self.comment |
204 | 204 | |
205 |
def get_json_export_dict(self, user, anonymise=False, include_files=True): |
|
205 |
def get_json_export_dict(self, formdata_user, anonymise=False, include_files=True):
|
|
206 | 206 |
data = { |
207 | 207 |
'time': datetime.datetime(*self.time[:6]) if self.time else None, |
208 | 208 |
'last_jump_datetime': self.last_jump_datetime, |
... | ... | |
216 | 216 |
pass |
217 | 217 |
else: |
218 | 218 |
data['who'] = user.get_json_export_dict() |
219 |
elif not anonymise and user: |
|
220 |
data['who'] = user.get_json_export_dict() |
|
219 |
elif not anonymise and formdata_user:
|
|
220 |
data['who'] = formdata_user.get_json_export_dict()
|
|
221 | 221 |
if self.comment and not anonymise: |
222 | 222 |
data['comment'] = self.comment |
223 | 223 |
parts = [] |
... | ... | |
1475 | 1475 |
for evo in self.evolution: |
1476 | 1476 |
evolution.append( |
1477 | 1477 |
evo.get_json_export_dict( |
1478 |
user=None if anonymise else formdata_user,
|
|
1478 |
formdata_user=formdata_user,
|
|
1479 | 1479 |
anonymise=anonymise, |
1480 | 1480 |
include_files=include_files, |
1481 | 1481 |
) |
1482 |
- |