0001-formdef-add-internal-identifier-attribute-separated-.patch

Frédéric Péters, 19 juillet 2017 23:39

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

Subject: [PATCH 1/2] formdef: add internal identifier attribute, separated
 from url_name (#15663)

This will allow changing url name behaviour without impacting on storage
matters.

 tests/test_admin_pages.py | 18 +++++++++------
 tests/test_formdef.py     |  8 ++++---
 tests/test_sql.py         |  2 +-
 wcs/admin/forms.py        |  5 ++--
 wcs/formdef.py            | 59 +++++++++++++++++++++++++++++++++++------------
 5 files changed, 64 insertions(+), 28 deletions(-)

         assert resp.location == 'http://example.net/backoffice/forms/1/'
         resp = resp.follow()
         assert FormDef.get(1).name == 'new title'
         assert FormDef.get(1).url_name == 'new-title'
         assert FormDef.get(1).url_name == 'form-title'
         assert FormDef.get(1).internal_identifier == 'new-title'
     def test_form_category(pub):
         create_superuser(pub)
-...
         resp = resp.forms[0].submit()
         assert FormDef.count() == 1
         # import the same formdef a second time, make sure the urlname is not
         # reused
         # import the same formdef a second time, make sure url name and internal
         # identifier are not reused
         resp = app.get('/backoffice/forms/')
         resp = resp.click(href='import')
         resp.forms[0]['file'] = Upload('formdef.wcs', formdef_xml)
-...
         assert FormDef.count() == 2
         assert FormDef.get(1).url_name == 'form-title'
         assert FormDef.get(2).url_name == 'form-title-1'
         assert FormDef.get(1).internal_identifier == 'form-title'
         assert FormDef.get(2).internal_identifier == 'form-title-1'
         # import a formdef with an url_name that doesn't match its title,
         # it should be updated to match.
         # import a formdef with an url name that doesn't match its title,
         # it should be kept intact.
         formdef.url_name = 'xxx-other-form-title'
         formdef_xml = ET.tostring(formdef.export_to_xml(include_id=True))
-...
         resp = resp.click(href='import')
         resp.forms[0]['file'] = Upload('formdef.wcs', formdef_xml)
         resp = resp.forms[0].submit()
         assert FormDef.get(3).url_name == 'form-title-2'
         assert FormDef.get(3).url_name == 'xxx-other-form-title'
         assert FormDef.get(3).internal_identifier == 'form-title-2'
         # import an invalid file
         resp = app.get('/backoffice/forms/')
-...
         app = login(get_app(pub))
         resp = app.get('/backoffice/forms/%s/' % formdef_id)
         resp = resp.click(href='overwrite')
         resp = resp.click(href='overwrite', index=0)
         resp.forms[0]['file'] = Upload('formdef.wcs', formdef_xml)
         resp = resp.forms[0].submit()
         assert 'The form removes and changes fields' in resp.body

         formdef.store()
         assert FormDef.get(formdef.id).name == 'foo'
         assert FormDef.get(formdef.id).url_name == 'foo'
         assert FormDef.get(formdef.id).internal_identifier == 'foo'
         formdef.name = 'bar'
         formdef.store()
         assert FormDef.get(formdef.id).name == 'bar'
         assert FormDef.get(formdef.id).url_name == 'bar'
         assert FormDef.get(formdef.id).url_name == 'foo'
         assert FormDef.get(formdef.id).internal_identifier == 'bar'
         # makes sure the url_name doesn't change if there are submitted forms
         # makes sure the internal_name doesn't change if there are submitted forms
         formdef.data_class()().store()
         formdef.name = 'baz'
         formdef.store()
         assert FormDef.get(formdef.id).name == 'baz'
         assert FormDef.get(formdef.id).url_name == 'bar' # didn't change
         assert FormDef.get(formdef.id).internal_identifier == 'bar' # didn't change
     def test_substitution_variables():
         formdef = FormDef()

         formdef.name = 'tests2'
         formdef.store()
         assert formdef.url_name == 'tests2'
         assert formdef.url_name == 'tests'
         formdef.name = 'tests'
         formdef.store()

             return redirect('.')
         def overwrite_by_formdef(self, new_formdef):
             # keep current formdef id, url_name and sql table name
             # keep current formdef id, url_name, internal identifier and sql table name
             new_formdef.id = self.formdef.id
             new_formdef.internal_identifier = self.formdef.internal_identifier
             new_formdef.url_name = self.formdef.url_name
             new_formdef.table_name = self.formdef.table_name
             # keep currently assigned category and workflow
-...
                     form.set_error('file', msg)
                 raise ValueError()
             formdef.url_name = None # a new one will be set in .store()
             formdef.internal_identifier = None # a new one will be set in .store()
             formdef.disabled = True
             formdef.store()
             get_session().message = ('info',

         description = None
         keywords = None
         url_name = None
         internal_identifier = None # mostly for pickle
         table_name = None # for SQL only
         fields = None
         category_id = None
-...
         # declarations for serialization
         TEXT_ATTRIBUTES = ['name', 'url_name', 'description', 'keywords',
                 'publication_date', 'expiration_date',
                 'publication_date', 'expiration_date', 'internal_identifier',
                 'disabled_redirection',]
         BOOLEAN_ATTRIBUTES = ['discussion', 'detailed_emails', 'disabled',
                 'only_allow_one', 'enable_tracking_codes', 'confirmation',
-...
                 self.table_name = sql.get_formdef_table_name(self)
                 changed = True
             if not self.internal_identifier:
                 self.internal_identifier = self.url_name
             if self.max_field_id is None and self.fields:
                 self.max_field_id = max([lax_int(x.id) for x in self.fields])
                 changed = True
-...
                 actions = sql.do_formdef_tables(self)
             else:
                 cls = new.classobj(self.url_name.title(), (FormData,),
                             {'_names': 'form-%s' % self.url_name,
                             {'_names': 'form-%s' % self.internal_identifier,
                              '_formdef': self})
                 actions = []
             setattr(sys.modules['formdef'], self.url_name.title(), cls)
-...
             return str(field_id)
         def get_new_url_name(self):
             new_url_name = simplify(self.name)
             new_url_name = simplify(self.name, space='-')
             base_new_url_name = new_url_name
             suffix_no = 0
             while True:
                 try:
                     formdef = self.get_by_urlname(new_url_name, ignore_migration=True)
                     obj = self.get_on_index(new_url_name, 'url_name', ignore_migration=True)
                 except KeyError:
                     break
                 if formdef.id == self.id:
                 if obj.id == self.id:
                     break
                 suffix_no += 1
                 new_url_name = '%s-%s' % (base_new_url_name, suffix_no)
             return new_url_name
         def get_new_internal_identifier(self):
             new_internal_identifier = simplify(self.name)
             base_new_internal_identifier = new_internal_identifier
             suffix_no = 0
             while True:
                 try:
                     formdef = self.get_by_urlname(new_internal_identifier, ignore_migration=True)
                 except KeyError:
                     break
                 if formdef.id == self.id:
                     break
                 suffix_no += 1
                 new_internal_identifier = '%s-%s' % (base_new_internal_identifier, suffix_no)
             return new_internal_identifier
         @classmethod
         def get_new_id(cls, create=False):
             keys = cls.keys()
-...
                 sql.formdef_wipe()
         def store(self):
             new_url_name = self.get_new_url_name()
             if not self.url_name:
                 self.url_name = new_url_name
             if new_url_name != self.url_name:
                 # title changed, url will be changed only if the formdef is
                 # currently being imported (self.id is None) or if there are not
                 # yet any submitted forms
                 data_class = self.data_class()
                 if self.id is None or data_class().count() == 0:
                     self.url_name = new_url_name
             if self.url_name is None:
                 # set url name if it's not yet there
                 self.url_name = self.get_new_url_name()
             new_internal_identifier = self.get_new_internal_identifier()
             if not self.internal_identifier:
                 self.internal_identifier = new_internal_identifier
             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)
                 # or if there are not yet any submitted forms
                 if self.id is None or self.data_class().count() == 0:
                     self.internal_identifier = new_internal_identifier
             self.last_modification_time = time.localtime()
             if get_request() and get_request().user:
                 self.last_modification_user_id = str(get_request().user.id)
-...
             formdef = cls.import_from_xml_tree(tree, charset=charset,
                     include_id=include_id)
             if formdef.url_name:
                 try:
                     obj = cls.get_on_index(formdef.url_name, 'url_name', ignore_migration=True)
                 except KeyError:
                     pass
                 else:
                     formdef.url_name = formdef.get_new_url_name()
             # fix max_field_id if necessary
             if formdef.max_field_id is not None:
                 max_field_id = max([lax_int(x.id) for x in formdef.fields])
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-formdef-add-internal-identifier-attribute-separated-.patch