0001-general-keep-submission-context-additional-details-8.patch

Frédéric Péters, 21 septembre 2015 16:14

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

Subject: [PATCH] general: keep submission context additional details (#8306)

 wcs/api.py                          |  2 ++
 wcs/backoffice/management.py        | 31 +++++++++++++++++++++++++++++++
 wcs/backoffice/submission.py        | 27 +++++++++++++++++++--------
 wcs/formdata.py                     |  1 +
 wcs/forms/root.py                   |  5 ++++-
 wcs/qommon/static/css/dc2/admin.css |  9 +++++++++
 wcs/sql.py                          | 19 ++++++++++++++++---
 7 files changed, 82 insertions(+), 12 deletions(-)

                 formdata.backoffice_submission = True
             else:
                 formdata.user_id = user.id
             if json_input.get('context'):
                 formdata.extra_submission_context = json_input['context']
             formdata.store()
             if self.formdef.enable_tracking_codes:
                 code = get_publisher().tracking_code_class()

             return html_top('management', title)
         def _q_index(self):
             get_response().filter['sidebar'] = self.get_sidebar()
             return self.status()
         def get_sidebar(self):
             return self.get_extra_context_bar()
         def get_extra_context_bar(self):
             formdata = self.filled
             if not formdata.extra_submission_context:
                 return ''
             r = TemplateIO(html=True)
             extra_context = formdata.extra_submission_context or {}
             r += htmltext('<div class="extra-context">')
             if extra_context.get('channel'):
                 channel_labels = {
                     'mail': _('Mail'),
+                }
                 r += htmltext('<h3>%s</h3>') % '%s: %s' % (
                         _('Channel'), channel_labels.get(extra_context.get('channel'), '?'))
             if extra_context.get('thumbnail_url'):
                 r += htmltext('<p class="thumbnail"><img src="%s" alt=""/></p>'
                         ) % extra_context.get('thumbnail_url')
             if extra_context.get('user_id'):
                 r += htmltext('<h3>%s</h3>') % _('Associated User')
                 r += htmltext('<p>%s</p>') % get_publisher().user_class.get(
                         extra_context.get('user_id')).display_name
             if extra_context.get('comments'):
                 r += htmltext('<h3>%s</h3>') % _('Comments')
                 r += htmltext('<p>%s</p>') % extra_context.get('comments')
             r += htmltext('</div>')
             return r.getvalue()
     class FakeField(object):
         def __init__(self, id, type_, label):

     from wcs.categories import Category
     from wcs.forms.root import FormPage as PublicFormFillPage
     from .management import FormBackOfficeStatusPage
     class FormFillPage(PublicFormFillPage):
         def html_top(self, *args, **kwargs):
-...
         def get_sidebar(self, data):
             r = TemplateIO(html=True)
             formdata = None
             draft_formdata_id = data.get('draft_formdata_id')
             if draft_formdata_id:
                 formdata = self.formdef.data_class().get(draft_formdata_id)
             if self.formdef.enable_tracking_codes:
                 draft_formdata_id = data.get('draft_formdata_id')
                 r += htmltext('<h3>%s</h3>') % _('Tracking Code')
                 tracking_code = None
                 if draft_formdata_id:
                     formdata = self.formdef.data_class().get(draft_formdata_id)
                     if formdata.tracking_code:
                         tracking_code = formdata.tracking_code
                 if tracking_code:
                     r += htmltext('<p>%s</p>') % tracking_code
                 if formdata and formdata.tracking_code:
                     tracking_code = formdata.tracking_code
                     r += htmltext('<p>%s</p>') % formdata.tracking_code
                 else:
                     r += htmltext('<p>-</p>')
             if formdata and formdata.extra_submission_context:
                 r += FormBackOfficeStatusPage(self.formdef, formdata).get_extra_context_bar()
             return r.getvalue()
         def form_side(self, step_no, page_no=0, log_detail=None, data=None, editing=None):
-...
             filled.backoffice_submission = True
             filled.store()
             magictoken = get_request().form.get('magictoken')
             form_data = get_session().get_by_magictoken(magictoken, {})
             draft_formdata_id = form_data.get('draft_formdata_id')
             if draft_formdata_id:
                 old_draft_formdata = self.formdef.data_class().get(draft_formdata_id)
                 filled.extra_submission_context = old_draft_formdata.extra_submission_context
             self.keep_tracking_code(filled)
             get_session().remove_magictoken(get_request().form.get('magictoken'))

wcs/formdata.py
158	158	editable_by = None
159	159	tracking_code = None
160	160	backoffice_submission = False
	161	extra_submission_context = None
161	162
162	163	workflow_data = None
163	164	workflow_roles = None

                 if get_request().form.has_key('mt'):
                     magictoken = get_request().form['mt']
                     data = session.get_by_magictoken(magictoken, {})
                     session.remove_magictoken(magictoken)
                     if not get_request().is_in_backoffice():
                         # don't remove magictoken as the backoffice agent may get
                         # the page reloaded.
                         session.remove_magictoken(magictoken)
                     if data:
                         # create a new one since the other has been exposed in a url
                         magictoken = randbytes(8)

     	background: #eee;
+    }
     div.extra-context p.thumbnail {
     	text-align: center;
+    }
     div.extra-context p.thumbnail img {
     	box-shadow: 0 0 3px black;
     	transform: rotate(2deg);
+    }
     @media print {
     	div#sidebar {
     		display: none;

             'status', 'workflow_data', 'id_display', 'fts', 'page_no',
             'anonymised', 'workflow_roles', 'workflow_roles_array',
             'concerned_roles_array', 'tracking_code',
             'actions_roles_array', 'backoffice_submission'])
             'actions_roles_array', 'backoffice_submission',
             'extra_submission_context'])
         # migrations
         if not 'fts' in existing_fields:
-...
         if not 'backoffice_submission' in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN backoffice_submission boolean''' % table_name)
         if not 'extra_submission_context' in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN extra_submission_context bytea''' % table_name)
         # add new fields
         for field in formdef.fields:
             assert field.id is not None
-...
             ('actions_roles_array', 'text[]'),
             ('tracking_code', 'varchar'),
             ('backoffice_submission', 'boolean'),
             ('extra_submission_context', 'bytea'),
+        ]
         def __init__(self, id=None):
-...
                     'anonymised': self.anonymised,
                     'tracking_code': self.tracking_code,
                     'backoffice_submission': self.backoffice_submission,
                     'extra_submission_context': self.extra_submission_context,
+            }
             if self.receipt_time:
                 sql_dict['receipt_time'] = datetime.datetime.fromtimestamp(time.mktime(self.receipt_time)),
-...
             else:
                 sql_dict['workflow_roles'] = None
                 sql_dict['workflow_roles_array'] = None
             if self.extra_submission_context:
                 sql_dict['extra_submission_context'] = bytearray(cPickle.dumps(self.extra_submission_context))
             else:
                 sql_dict['extra_submission_context'] = None
             sql_dict['concerned_roles_array'] = [str(x) for x in self.concerned_roles if x]
             sql_dict['actions_roles_array'] = [str(x) for x in self.actions_roles if x]
-...
                 o.workflow_data = cPickle.loads(str(o.workflow_data))
             if o.workflow_roles:
                 o.workflow_roles = cPickle.loads(str(o.workflow_roles))
             if o.extra_submission_context:
                 o.extra_submission_context = cPickle.loads(str(o.extra_submission_context))
             o.data = cls._row2obdata(row, cls._formdef)
             return o
         _row2ob = classmethod(_row2ob)
-...
         return result
     SQL_LEVEL = 7
     SQL_LEVEL = 8
     def migrate_global_views(conn, cur):
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
-...
             migrate_views(conn, cur)
             for formdef in FormDef.select():
                 formdef.data_class().rebuild_security()
         if sql_level < 7:
         if sql_level < 8:
             # 7: add backoffice_submission to tables and views
             # 8: add extra_submission_context to tables
             migrate_views(conn, cur)
         cur.execute('''UPDATE wcs_meta SET value = %s WHERE key = %s''', (
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-general-keep-submission-context-additional-details-8.patch