0001-backoffice-move-categories-to-be-under-forms-7457.patch

Frédéric Péters, 28 juillet 2019 09:50

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

Subject: [PATCH] backoffice: move categories to be under forms (#7457)

 tests/test_admin_pages.py | 52 +++++++++++++++++++++++----------------
 wcs/admin/categories.py   |  4 +++
 wcs/admin/forms.py        |  6 ++++-
 wcs/backoffice/root.py    |  7 +++---
 4 files changed, 44 insertions(+), 25 deletions(-)

     def test_categories(pub):
         create_superuser(pub)
         app = login(get_app(pub))
         app.get('/backoffice/categories/')
         resp = app.get('/backoffice/forms/categories/')
     def test_categories_legacy_urls(pub):
         create_superuser(pub)
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/')
         assert resp.location.endswith('/backoffice/forms/categories/')
         resp = app.get('/backoffice/categories/1')
         assert resp.location.endswith('/backoffice/forms/categories/1')
         resp = app.get('/backoffice/categories/1/')
         assert resp.location.endswith('/backoffice/forms/categories/1/')
     def test_categories_new(pub):
         create_superuser(pub)
-...
         app = login(get_app(pub))
         # go to the page and cancel
         resp = app.get('/backoffice/categories/')
         resp = app.get('/backoffice/forms/categories/')
         resp = resp.click('New Category')
         resp = resp.forms[0].submit('cancel')
         assert resp.location == 'http://example.net/backoffice/categories/'
         assert resp.location == 'http://example.net/backoffice/forms/categories/'
         # go to the page and add a category
         resp = app.get('/backoffice/categories/')
         resp = app.get('/backoffice/forms/categories/')
         resp = resp.click('New Category')
         resp.forms[0]['name'] = 'a new category'
         resp.forms[0]['description'] = 'description of the category'
         resp = resp.forms[0].submit('submit')
         assert resp.location == 'http://example.net/backoffice/categories/'
         assert resp.location == 'http://example.net/backoffice/forms/categories/'
         resp = resp.follow()
         assert 'a new category' in resp.body
         resp = resp.click('a new category')
-...
         category.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/1/')
         resp = app.get('/backoffice/forms/categories/1/')
         assert 'no form associated to this category' in resp.body
         resp = resp.click(href='edit')
         assert resp.forms[0]['name'].value == 'foobar'
         resp.forms[0]['description'] = 'category description'
         resp = resp.forms[0].submit('submit')
         assert resp.location == 'http://example.net/backoffice/categories/'
         assert resp.location == 'http://example.net/backoffice/forms/categories/'
         resp = resp.follow()
         resp = resp.click('foobar')
         assert '<h2>foobar' in resp.body
-...
         category.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/1/')
         resp = app.get('/backoffice/forms/categories/1/')
         resp = resp.click(href='edit')
         assert resp.forms[0]['name'].value == 'foobar'
-...
         assert 'This name is already used' in resp.body
         resp = resp.forms[0].submit('cancel')
         assert resp.location == 'http://example.net/backoffice/categories/'
         assert resp.location == 'http://example.net/backoffice/forms/categories/'
     def test_categories_with_formdefs(pub):
         Category.wipe()
-...
         FormDef.wipe()
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/1/')
         resp = app.get('/backoffice/forms/categories/1/')
         assert 'form bar' not in resp.body
         formdef = FormDef()
-...
         formdef.category_id = category.id
         formdef.store()
         resp = app.get('/backoffice/categories/1/')
         resp = app.get('/backoffice/forms/categories/1/')
         assert 'form bar' in resp.body
         assert 'no form associated to this category' not in resp.body
-...
         FormDef.wipe()
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/1/')
         resp = app.get('/backoffice/forms/categories/1/')
         resp = resp.click(href='delete')
         resp = resp.forms[0].submit('cancel')
         assert resp.location == 'http://example.net/backoffice/categories/1/'
         assert resp.location == 'http://example.net/backoffice/forms/categories/1/'
         assert Category.count() == 1
         resp = app.get('/backoffice/categories/1/')
         resp = app.get('/backoffice/forms/categories/1/')
         resp = resp.click(href='delete')
         resp = resp.forms[0].submit()
         assert resp.location == 'http://example.net/backoffice/categories/'
         assert resp.location == 'http://example.net/backoffice/forms/categories/'
         resp = resp.follow()
         assert Category.count() == 0
-...
         app = login(get_app(pub))
         # this URL is used for editing from the frontoffice, there's no link
         # pointing to it in the admin.
         resp = app.get('/backoffice/categories/1/description')
         resp = app.get('/backoffice/forms/categories/1/description')
         assert resp.forms[0]['description'].value == 'category description'
         resp.forms[0]['description'] = 'updated description'
         # check cancel doesn't save the change
         resp2 = resp.forms[0].submit('cancel')
         assert resp2.location == 'http://example.net/backoffice/categories/1/'
         assert resp2.location == 'http://example.net/backoffice/forms/categories/1/'
         assert Category.get(1).description == 'category description'
         # check submit does it properly
         resp2 = resp.forms[0].submit('submit')
         assert resp2.location == 'http://example.net/backoffice/categories/1/'
         assert resp2.location == 'http://example.net/backoffice/forms/categories/1/'
         resp2 = resp2.follow()
         assert Category.get(1).description == 'updated description'
-...
         category.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/')
         resp = app.get('/backoffice/forms/categories/')
         resp = resp.click('New Category')
         resp.forms[0]['name'] = 'foobar'
         resp = resp.forms[0].submit('submit')
-...
         category.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/categories/update_order?order=1;2;3;')
         resp = app.get('/backoffice/forms/categories/update_order?order=1;2;3;')
         categories = Category.select()
         Category.sort_by_position(categories)
         assert [x.id for x in categories] == ['1', '2', '3']
         resp = app.get('/backoffice/categories/update_order?order=3;1;2;')
         resp = app.get('/backoffice/forms/categories/update_order?order=3;1;2;')
         categories = Category.select()
         Category.sort_by_position(categories)
         assert [x.id for x in categories] == ['3', '1', '2']

wcs/admin/categories.py
230	230	def _q_lookup(self, component):
231	231	get_response().breadcrumb.append( ('categories/', _('Categories')) )
232	232	return CategoryPage(component)
	233
	234	def _q_traverse(self, path):
	235	get_response().breadcrumb.append(('forms/', _('Forms')))
	236	return super(CategoriesDirectory, self)._q_traverse(path)

     from wcs.forms.root import qrcode
     from fields import FieldDefPage, FieldsDirectory
     from .categories import CategoriesDirectory
     from .data_sources import NamedDataSourcesDirectory
     from .logged_errors import LoggedErrorsDirectory
-...
     class FormsDirectory(AccessControlled, Directory):
         _q_exports = ['', 'new', ('import', 'p_import'),
                 ('data-sources', 'data_sources')]
                 'categories', ('data-sources', 'data_sources')]
         categories = CategoriesDirectory()
         data_sources = NamedDataSourcesDirectoryInForms()
         formdef_page_class = FormDefPage
-...
             if has_roles:
                 r += htmltext('<span class="actions">')
                 r += htmltext('<a href="data-sources/">%s</a>') % _('Data sources')
                 if get_publisher().get_backoffice_root().is_accessible('categories'):
                     r += htmltext('<a href="categories/">%s</a>') % _('Categories')
                 r += htmltext('<a href="import" rel="popup">%s</a>') % _('Import')
                 r += htmltext('<a class="new-item" href="new" rel="popup">%s</a>') % _('New Form')
                 r += htmltext('</span>')

         _q_exports = ['', 'pending', 'statistics', ('menu.json', 'menu_json')]
         bounces = wcs.admin.bounces.BouncesDirectory()
         categories = wcs.admin.categories.CategoriesDirectory()
         forms = wcs.admin.forms.FormsDirectory()
         roles = wcs.admin.roles.RolesDirectory()
         settings = wcs.admin.settings.SettingsDirectory()
-...
             ('workflows/', N_('Workflows Workshop')),
             ('users/', N_('Users'), {'check_display_function': roles.is_visible}),
             ('roles/', N_('Roles'), {'check_display_function': roles.is_visible}),
             ('categories/', N_('Categories')),
             ('bounces/', N_('Bounces'), {'check_display_function': bounces.is_visible}),
             ('settings/', N_('Settings')),
+        ]
-...
                 except KeyError:
                     pass
             get_response().add_javascript(['jquery.js', 'qommon.js', 'gadjo.js'])
             if path and path[0] == 'categories':
                 # legacy /backoffice/categories/<...>, redirect.
                 return redirect('/backoffice/forms/' + '/'.join(path))
             return super(RootDirectory, self)._q_traverse(path)
         @classmethod
-...
                 return user_roles.intersection(authorised_roles)
             # if the directory defines a is_accessible method, use it.
             if hasattr(getattr(cls, subdirectory), 'is_accessible'):
             if hasattr(getattr(cls, subdirectory, None), 'is_accessible'):
                 return getattr(cls, subdirectory).is_accessible(get_request().user)
             # as a last resort, for the other directories, the user needs to be
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-backoffice-move-categories-to-be-under-forms-7457.patch