0001-export-evolutions-in-form-API-10820.patch

Benjamin Dauvergne, 04 mai 2016 00:01

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

Subject: [PATCH] export evolutions in form API (#10820)

 wcs/formdata.py            | 32 +++++++++++++++++++++++++++-----
 wcs/users.py               | 11 +++++++++++
 wcs/wf/register_comment.py |  6 ++++++
 wcs/wf/wscall.py           |  8 ++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

                 l.append(p.view())
             return l
         def get_json_export_dict(self, user):
             data = {
                 'status': self.status,
                 'time': self.time,
+            }
             try:
                 if self.who != '_submitter':
                     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
             parts = []
             for part in self.parts or []:
                 if hasattr(part, 'get_json_export_dict'):
                     parts.append(part.get_json_export_dict())
             if parts:
                 data['parts'] = parts
             return data
     class FormData(StorableObject):
         _names = 'XX'
-...
                     user = None
                     break
             if user:
                 data['user'] = {'id': user.id, 'name': user.display_name}
                 if user.email:
                     data['user']['email'] = user.email
                 if user.name_identifiers:
                     data['user']['NameID'] = user.name_identifiers
                 data['user'] = user.get_json_export_dict()
             data['fields'] = get_json_dict(self.formdef.fields, self.data,
                     include_files=include_files)
-...
                 'channel': self.get_submission_channel_label(),
+            }
             if self.evolution:
                 data['evolution'] = [evo.get_json_export_dict(user) for evo in self.evolution]
             return data
         def export_to_json(self, include_files=True):

                 return self.__dict__['form_data'].get(attr[1:])
             raise AttributeError()
         def get_json_export_dict(self):
             data = {
                 'id': self.id,
                 'name': self.display_name,
+            }
             if self.email:
                 data['email'] = self.email
             if self.name_identifiers:
                 data['NameID'] = self.name_identifiers
             return data
     Substitutions.register('session_user', category=N_('User'), comment=N_('Session User'))
     Substitutions.register('session_user_display_name', category=N_('User'), comment=N_('Session User Display Name'))

                                 [(x or htmltext('</p><p>')) for x in self.content.splitlines()]) + \
                        htmltext('</p>')
         def get_json_export_dict(self):
             return {
                 'type': 'journal-evolution',
                 'content': self.content,
+            }
     class RegisterCommenterWorkflowStatusItem(WorkflowStatusItem):
         description = N_('Record in Log')

             r += htmltext('</div>')
             return r.getvalue()
         def get_json_export_dict(self):
             return {
                 'type': 'wscall-error',
                 'summary': self.summary,
                 'label': self.label,
                 'data': self.data,
+            }
     class WebserviceCallStatusItem(WorkflowStatusItem):
         description = N_('Webservice Call')
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-export-evolutions-in-form-API-10820.patch