0001-management-add-link-to-form-carddef-page-in-sidebar-.patch

Lauréline Guérin, 03 janvier 2022 11:57

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

Subject: [PATCH] management: add link to form/carddef page in sidebar (#58671)

 tests/admin_pages/test_workflow.py      |  1 +
 tests/backoffice_pages/test_all.py      | 18 ++++++++++++++++--
 tests/backoffice_pages/test_carddata.py | 16 +++++++++++++++-
 wcs/admin/forms.py                      |  2 +-
 wcs/admin/workflows.py                  | 14 ++++----------
 wcs/api.py                              |  4 ++--
 wcs/backoffice/data_management.py       |  1 +
 wcs/backoffice/management.py            | 12 ++++++++++++
 wcs/formdef.py                          |  2 +-
 wcs/workflows.py                        | 11 +++++++++++
 10 files changed, 64 insertions(+), 17 deletions(-)

tests/admin_pages/test_workflow.py
3165	3165	app.get('/backoffice/workflows/categories/', status=403)
3166	3166	app.get('/backoffice/workflows/data-sources/', status=403)
3167	3167	app.get('/backoffice/workflows/mail-templates/', status=403)
	3168	app.get('/backoffice/workflows/%s/' % workflow.id, status=403)
3168	3169
3169	3170	# no import into other category
3170	3171	workflow_xml = ET.tostring(workflow.export_to_xml(include_id=True))

         assert resp.pyquery.find('body.section-management')
     def test_admin_form_page(pub):
         create_superuser(pub)
         FormDef.wipe()
         formdef = FormDef()
         formdef.name = 'form title'
         formdef.fields = []
         formdef.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/management/form-title/')
         assert 'backoffice/forms/1/' in resp
         assert 'backoffice/workflows/_default/' in resp
     def test_backoffice_listing(pub):
         create_superuser(pub)
         create_environment(pub)
-...
         resp = app.get(create_formdata['source_formdef'].get_url(backoffice=True))
         # click on first available formdata
         resp = resp.click(href='%s/' % formdata.id)
         resp = resp.click('%s-%s' % (create_formdata['source_formdef'].id, formdata.id))
         target_data_class = create_formdata['target_formdef'].data_class()
         assert target_data_class.count() == 0
         # resubmit it through backoffice submission
-...
         resp = app.get(create_formdata['source_formdef'].get_url(backoffice=True))
         # click on first available formdata
         resp = resp.click(href='%s/' % formdata.id)
         resp = resp.click('%s-%s' % (create_formdata['source_formdef'].id, formdata.id))
         target_data_class = create_formdata['target_formdef'].data_class()
         assert target_data_class.count() == 0
         # resubmit it through backoffice submission

     from wcs.workflows import ChoiceWorkflowStatusItem, Workflow
     from ..utilities import clean_temporary_pub, create_temporary_pub, get_app, login
     from .test_all import create_user
     from .test_all import create_superuser, create_user
     def pytest_generate_tests(metafunc):
-...
         clean_temporary_pub()
     def test_admin_card_page(pub):
         create_superuser(pub)
         CardDef.wipe()
         carddef = CardDef()
         carddef.name = 'foo'
         carddef.fields = []
         carddef.store()
         app = login(get_app(pub))
         resp = app.get('/backoffice/data/foo/')
         assert 'backoffice/cards/1/' in resp
         assert 'backoffice/workflows/_carddef_default/' in resp
     def test_carddata_management(pub):
         CardDef.wipe()
         user = create_user(pub)

         def _q_lookup(self, component):
             directory = self.formdef_page_class(component)
             if not directory.formdef.is_managed_by(get_request().user):
             if not directory.formdef.has_user_access(get_request().user):
                 raise AccessForbiddenError()
             return directory

         def _q_lookup(self, component):
             directory = WorkflowPage(component)
             global_access = is_global_accessible()
             if directory.workflow.id not in ('_default', '_carddef_default') and not global_access:
                 user_roles = set(get_request().user.get_roles())
                 management_roles = set()
                 if directory.workflow.category:
                     management_roles = {
                         x.id for x in getattr(directory.workflow.category, 'management_roles') or []
+                    }
                 if not management_roles.intersection(user_roles):
                     raise errors.AccessForbiddenError()
             if directory.workflow.id in ('_default', '_carddef_default'):
                 return directory
             if not directory.workflow.has_user_access(get_request().user):
                 raise errors.AccessForbiddenError()
             return directory
         def p_import(self):

             return super().check_access(api_name=api_name)
         def schema(self):
             if is_url_signed() or self.formdef.is_managed_by(get_user_from_api_query_string()):
             if is_url_signed() or self.formdef.has_user_access(get_user_from_api_query_string()):
                 get_response().set_content_type('application/json')
                 return self.formdef.export_to_json()
             raise AccessForbiddenError()
-...
             self.formdef = formdef
         def schema(self):
             if is_url_signed() or self.formdef.is_managed_by(get_user_from_api_query_string()):
             if is_url_signed() or self.formdef.has_user_access(get_user_from_api_query_string()):
                 get_response().set_content_type('application/json')
                 return self.formdef.export_to_json()
             raise AccessForbiddenError()

wcs/backoffice/data_management.py
103	103	admin_permission = 'cards'
104	104	formdef_class = CardDef
105	105	search_label = _('Search in card content')
	106	formdef_view_label = _('View Card')
106	107
107	108	@property
108	109	def add(self):

         admin_permission = 'forms'
         formdef_class = FormDef
         search_label = _('Search in form content')
         formdef_view_label = _('View Form')
         WCS_SYNC_EXPORT_LIMIT = 100  # Arbitrary threshold
         def __init__(self, component=None, formdef=None, view=None, update_breadcrumbs=True):
-...
                 or self.formdef.category.has_permission('statistics', get_request().user)
             ):
                 r += htmltext(' <li class="stats"><a href="stats">%s</a></li>') % _('Statistics')
             if self.formdef.has_user_access(get_request().user):
                 r += htmltext(' <li><a href="%s">%s</a></li>') % (
                     self.formdef.get_admin_url(),
                     self.formdef_view_label,
+                )
             if self.formdef.workflow.has_user_access(get_request().user):
                 r += htmltext(' <li><a href="%s">%s</a></li>') % (
                     self.formdef.workflow.get_admin_url(),
                     _('View Workflow'),
+                )
             return r.getvalue()
         def get_formdata_sidebar(self, qs=''):

             return sql.get_formdef_new_id(id_start=id_start)
         def is_managed_by(self, user):
         def has_user_access(self, user):
             if get_publisher().get_backoffice_root().is_global_accessible(self.backoffice_section):
                 return True
             if not user:

             criterias = [Contains('slug', slugs)]
             return list(MailTemplate.select(criterias, order_by='name'))
         def has_user_access(self, user):
             if get_publisher().get_backoffice_root().is_global_accessible('workflows'):
                 return True
             if not user:
                 return False
             if not self.category_id:
                 return False
             management_roles = {x.id for x in getattr(self.category, 'management_roles') or []}
             user_roles = set(user.get_roles())
             return management_roles.intersection(user_roles)
     class XmlSerialisable:
         node_name = None
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-management-add-link-to-form-carddef-page-in-sidebar-.patch