0001-general-directly-apply-formdef-carddef-schema-change.patch

Frédéric Péters, 21 septembre 2021 07:29

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

Subject: [PATCH] general: directly apply formdef/carddef schema changes
 (#57118)

 tests/backoffice_pages/test_all.py |  1 +
 tests/test_formdata.py             | 10 ++++++++++
 wcs/carddef.py                     | 10 ++--------
 wcs/formdef.py                     | 31 +++++++++++++++---------------
 wcs/sql.py                         |  2 +-
 wcs/workflows.py                   |  4 ++--
 6 files changed, 32 insertions(+), 26 deletions(-)

tests/backoffice_pages/test_all.py
1961	1961	formdef = FormDef.get_by_urlname('form-title')
1962	1962	formdef.fields.append(fields.MapField(id='4', label='4th field', type='map'))
1963	1963	formdef.fields.append(fields.MapField(id='5', label='5th field', type='string'))
	1964	formdef.store()
1964	1965	form_class = formdef.data_class()
1965	1966	number31 = [x for x in form_class.select() if x.data['1'] == 'FOO BAR 30'][0]
1966	1967	app = login(get_app(pub))

     def test_form_digest_error(pub):
         FormDef.wipe()
         if pub.is_using_postgresql():
             pub.loggederror_class.wipe()
-...
     def test_lazy_formdata_decimal_filter(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
     def test_lazy_formdata_timesince_filter(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
     def test_lazy_formdata_mathematics_filters(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
     def test_lazy_formdata_add_filters(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
     def test_lazy_formdata_ceil_filter(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
     def test_lazy_formdata_count_as_len_filter(pub):
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
             ),
+        }
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
             'value': repr([{'id': '1', 'text': 'un'}, {'id': '2', 'text': 'deux'}]),
+        }
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'
-...
         pub.cfg['users']['field_name'] = ['3', '4']
         pub.write_cfg()
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'foobar'
         formdef.url_name = 'foobar'

                 cls = types.ClassType(
                     self.data_class_name, (sql.SqlCardData,), {'_formdef': self, '_table_name': table_name}
+                )
                 actions = sql.do_formdef_tables(self)
             else:
                 cls = types.ClassType(
                     self.data_class_name,
                     (CardData,),
                     {'_names': 'card-%s' % self.internal_identifier, '_formdef': self},
+                )
                 actions = []
             setattr(sys.modules['carddef'], self.data_class_name, cls)
             setattr(sys.modules['wcs.carddef'], self.data_class_name, cls)
             if actions:
                 for action in actions:
                     getattr(cls, action)()
             return cls
         @classmethod
-...
                     return True
             return False
         def store(self, comment=None):
         def store(self, comment=None, *args, **kwargs):
             self.roles = self.backoffice_submission_roles
             return super().store(comment=comment)
             return super().store(comment=comment, *args, **kwargs)
         @classmethod
         def get_carddefs_as_data_source(cls):

                 cls = types.ClassType(
                     self.data_class_name, (sql.SqlFormData,), {'_formdef': self, '_table_name': table_name}
+                )
                 actions = sql.do_formdef_tables(self)
             else:
                 cls = types.ClassType(
                     self.data_class_name,
                     (FormData,),
                     {'_names': 'form-%s' % self.internal_identifier, '_formdef': self},
+                )
                 actions = []
             setattr(sys.modules['formdef'], self.data_class_name, cls)
             setattr(sys.modules['wcs.formdef'], self.data_class_name, cls)
             if actions:
                 for action in actions:
                     getattr(cls, action)()
             return cls
         def get_new_field_id(self):
-...
             new_internal_identifier = self.get_new_internal_identifier()
             if not self.internal_identifier:
                 self.internal_identifier = new_internal_identifier
             object_only = kwargs.pop('object_only', False)
             if new_internal_identifier != self.internal_identifier:
                 # title changed, internal identifier will be changed only if
                 # the formdef is currently being imported (self.id is None)
-...
                 if self.id is None or self.data_class().count() == 0:
                     self.internal_identifier = new_internal_identifier
             StorableObject.store(self, *args, **kwargs)
             if object_only:
                 return
             if get_publisher().snapshot_class:
                 get_publisher().snapshot_class.snap(instance=self, comment=comment)
             if get_publisher().is_using_postgresql():
                 from . import sql
                 sql.do_formdef_tables(self, rebuild_views=True, rebuild_global_views=True)
             self.update_storage()
             self.store_related_custom_views()
         def update_storage(self):
             if not get_publisher().is_using_postgresql():
                 return
             from . import sql
             actions = sql.do_formdef_tables(self, rebuild_views=True, rebuild_global_views=True)
             if actions:
                 cls = self.data_class()
                 for action in actions:
                     getattr(cls, action)()
         def store_related_custom_views(self):
             for view in getattr(self, '_custom_views', []):
                 view.formdef = self
-...
         def get_widget_fields(self):
             return [field for field in self.fields or [] if isinstance(field, fields.WidgetField)]
         def rebuild(self):
             if get_publisher().is_using_postgresql():
                 from . import sql
                 sql.do_formdef_tables(self, rebuild_views=True, rebuild_global_views=True)
         @property
         def default_digest_template(self):
             return (self.digest_templates or {}).get('default')

             formdef.id,
             get_name_as_sql_identifier(formdef.url_name)[:30],
+        )
         formdef.store()
         formdef.store(object_only=True)
         return formdef.table_name

                     self.formdefs(ignore_migration=True, order_by='id'),
                     self.carddefs(ignore_migration=True, order_by='id'),
                 ):
                     form.data_class().rebuild_security()
                     if must_update:
                         form.rebuild()
                         form.update_storage()
                     form.data_class().rebuild_security()
             if get_response():
                 get_response().add_after_job(_('Reindexing cards and forms after workflow change'), update)
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-general-directly-apply-formdef-carddef-schema-change.patch