0001-misc-give-unique-identifiers-to-backoffice-fields-17.patch

Frédéric Péters, 08 avril 2019 19:21

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

Subject: [PATCH] misc: give unique identifiers to backoffice fields (#17375)

 tests/test_admin_pages.py | 11 ++++---
 wcs/sql.py                | 63 +++++++++++++++++++++------------------
 wcs/workflows.py          |  5 +---
 3 files changed, 40 insertions(+), 39 deletions(-)

         resp = resp.follow()
         workflow = Workflow.get(workflow.id)
         assert len(workflow.backoffice_fields_formdef.fields) == 2
         assert workflow.backoffice_fields_formdef.fields[0].id == 'bo1'
         assert workflow.backoffice_fields_formdef.fields[1].id == 'bo2'
         first_field_id = workflow.backoffice_fields_formdef.fields[0].id
         assert workflow.backoffice_fields_formdef.fields[1].id != first_field_id
         # check there's no prefill field
         resp = app.get('/backoffice/workflows/1/backoffice-fields/fields/bo2/')
         resp = app.get('/backoffice/workflows/1/backoffice-fields/fields/%s/' % workflow.backoffice_fields_formdef.fields[1].id)
         assert not 'prefill$type' in resp.form.fields.keys()
         # add a title field
-...
         resp = resp.form.submit()
         workflow = Workflow.get(workflow.id)
         assert len(workflow.backoffice_fields_formdef.fields) == 3
         assert workflow.backoffice_fields_formdef.fields[2].id == 'bo3'
         # check backoffice fields are available in set backoffice fields action
         resp = app.get('/backoffice/workflows/1/')
-...
         assert 'foobar2' in options
         assert 'foobar3' not in options
         resp.form['fields$element0$field_id'] = 'bo1'
         resp.form['fields$element0$field_id'] = first_field_id
         resp.form['fields$element0$value$value_text'] = 'Hello'
         resp = resp.form.submit('submit')
         workflow = Workflow.get(workflow.id)
         assert workflow.possible_status[0].items[0].fields == [{'field_id': 'bo1', 'value': 'Hello'}]
         assert workflow.possible_status[0].items[0].fields == [{'field_id': first_field_id, 'value': 'Hello'}]
     def test_workflows_functions(pub):
         create_superuser(pub)

         return name
     def get_field_id(field):
         return 'f' + str(field.id).replace('-', '_')
     def parse_clause(clause):
         # returns a three-elements tuple with:
         #  - a list of SQL 'WHERE' clauses
-...
             sql_type = SQL_TYPE_MAPPING.get(field.key, 'varchar')
             if sql_type is None:
                 continue
             needed_fields.add('f%s' % field.id)
             if 'f%s' % field.id not in existing_fields:
             needed_fields.add(get_field_id(field))
             if get_field_id(field) not in existing_fields:
                 cur.execute('''ALTER TABLE %s ADD COLUMN %s %s''' % (
                                         table_name,
                                         'f%s' % field.id,
                                         get_field_id(field),
                                         sql_type))
             if field.store_display_value:
                 needed_fields.add('f%s_display' % field.id)
                 if 'f%s_display' % field.id not in existing_fields:
                 needed_fields.add('%s_display' % get_field_id(field))
                 if '%s_display' % get_field_id(field) not in existing_fields:
                     cur.execute('''ALTER TABLE %s ADD COLUMN %s varchar''' % (
                                             table_name, 'f%s_display' % field.id))
                                             table_name,
                                             '%s_display' % get_field_id(field)))
             if field.store_structured_value:
                 needed_fields.add('f%s_structured' % field.id)
                 if 'f%s_structured' % field.id not in existing_fields:
                 if '%s_structured' % get_field_id(field) not in existing_fields:
                     cur.execute('''ALTER TABLE %s ADD COLUMN %s bytea''' % (
                                             table_name, 'f%s_structured' % field.id))
                                             table_name,
                                             '%s_structured' % get_field_id(field)))
         for field in (formdef.geolocations or {}).keys():
             column_name = 'geoloc_%s' % field
-...
             sql_type = SQL_TYPE_MAPPING.get(field.key, 'varchar')
             if sql_type is None:
                 continue
             needed_fields.add('f%s' % field.id)
             if 'f%s' % field.id not in existing_fields:
             needed_fields.add(get_field_id(field))
             if get_field_id(field) not in existing_fields:
                 cur.execute('''ALTER TABLE %s ADD COLUMN %s %s''' % (
                                         table_name,
                                         'f%s' % field.id,
                                         get_field_id(field),
                                         sql_type))
             if field.store_display_value:
                 needed_fields.add('f%s_display' % field.id)
                 if 'f%s_display' % field.id not in existing_fields:
                 needed_fields.add('%s_display' % get_field_id(field))
                 if '%s_display' % get_field_id(field) not in existing_fields:
                     cur.execute('''ALTER TABLE %s ADD COLUMN %s varchar''' % (
                                             table_name, 'f%s_display' % field.id))
                                             table_name, '%s_display' % get_field_id(field)))
             if field.store_structured_value:
                 needed_fields.add('f%s_structured' % field.id)
                 if 'f%s_structured' % field.id not in existing_fields:
                 needed_fields.add('%s_structured' % get_field_id(field))
                 if '%s_structured' % get_field_id(field) not in existing_fields:
                     cur.execute('''ALTER TABLE %s ADD COLUMN %s bytea''' % (
                                             table_name, 'f%s_structured' % field.id))
                                             table_name, '%s_structured' % get_field_id(field)))
         # migrations
         if not 'fts' in existing_fields:
-...
         column_names = {}
         for field in formdef.get_all_fields():
             field_key = 'f%s' % field.id
             field_key = get_field_id(field)
             if field.type in ('page', 'title', 'subtitle', 'comment'):
                 continue
             if field.varname:
-...
                 # doesn't contain invalid characters.
                 field_name = 'f_%s' % get_name_as_sql_identifier(field.varname)[:50]
             else:
                 field_name = 'f%s_%s' % (field.id, get_name_as_sql_identifier(field.label))
                 field_name = '%s_%s' % (get_field_id(field), get_name_as_sql_identifier(field.label))
                 field_name = field_name[:50]
             if field_name in column_names:
                 # it may happen that the same varname is used on multiple fields
-...
             column_names[field_name] = 1
             view_fields.append((field_key, field_name))
             if field.store_display_value:
                 field_key = 'f%s_display' % field.id
                 field_key = '%s_display' % get_field_id(field)
                 view_fields.append((field_key, field_name + '_display'))
         view_fields.append(('''ARRAY(SELECT status FROM %s_evolutions '''\
-...
                         value = bytearray(cPickle.dumps(value, protocol=2))
                     elif sql_type == 'boolean':
                         pass
                 sql_dict['f%s' % field.id] = value
                 sql_dict[get_field_id(field)] = value
                 if field.store_display_value:
                     sql_dict['f%s_display' % field.id] = data.get('%s_display' % field.id)
                     sql_dict['%s_display' % get_field_id(field)] = data.get('%s_display' % field.id)
                 if field.store_structured_value:
                     sql_dict['f%s_structured' % field.id] = bytearray(
                     sql_dict['%s_structured' % get_field_id(field)] = bytearray(
                             cPickle.dumps(data.get('%s_structured' % field.id), protocol=2))
             return sql_dict
-...
                 sql_type = SQL_TYPE_MAPPING.get(field.key, 'varchar')
                 if sql_type is None:
                     continue
                 data_fields.append('f%s' % field.id)
                 data_fields.append(get_field_id(field))
                 if field.store_display_value:
                     data_fields.append('f%s_display' % field.id)
                     data_fields.append('%s_display' % get_field_id(field))
                 if field.store_structured_value:
                     data_fields.append('f%s_structured' % field.id)
                     data_fields.append('%s_structured' % get_field_id(field))
             return data_fields
         @classmethod
-...
                 sql_type = SQL_TYPE_MAPPING.get(field.key, 'varchar')
                 if sql_type is None:
                     continue
                 data_fields.append('f%s' % field.id)
                 data_fields.append(get_field_id(field))
                 if field.store_display_value:
                     data_fields.append('f%s_display' % field.id)
                     data_fields.append('%s_display' % get_field_id(field))
                 if field.store_structured_value:
                     data_fields.append('f%s_structured' % field.id)
                     data_fields.append('%s_structured' % get_field_id(field))
             return data_fields
         @classmethod

             self.workflow = workflow
             if workflow.backoffice_fields_formdef and workflow.backoffice_fields_formdef.fields:
                 self.fields = self.workflow.backoffice_fields_formdef.fields
                 self.max_field_id = max([int(x.id[len(self.field_prefix):]) for x in self.fields])
             else:
                 self.fields = []
                 self.max_field_id = 0
         def get_new_field_id(self):
             self.max_field_id += 1
             return '%s%s' % (self.field_prefix, self.max_field_id)
             return '%s%s' % (self.field_prefix, str(uuid.uuid4()))
         def store(self):
             self.workflow.backoffice_fields_formdef = self
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-give-unique-identifiers-to-backoffice-fields-17.patch