Projet

Général

Profil

0001-misc-make-sure-admin-permissions-are-set-as-strings-.patch

Frédéric Péters, 11 juin 2015 11:04

Télécharger (1,81 ko)

Voir les différences:

Subject: [PATCH] misc: make sure admin permissions are set as strings (#7529)

 tests/test_backoffice_pages.py | 8 ++++++++
 wcs/publisher.py               | 7 +++++++
 2 files changed, 15 insertions(+)
tests/test_backoffice_pages.py
140 140
    assert not 'Forms Workshop' in resp.body
141 141
    assert 'Workflows Workshop' in resp.body
142 142

  
143
    # check role id int->str migration
144
    pub.cfg['admin-permissions'] = {'workflows': [int(x.id) for x in Role.select()]}
145
    pub.write_cfg()
146
    resp = app.get('/backoffice/')
147
    assert 'Management' in resp.body
148
    assert not 'Forms Workshop' in resp.body
149
    assert 'Workflows Workshop' in resp.body
150

  
143 151
def test_backoffice_forms(pub):
144 152
    create_superuser(pub)
145 153
    create_environment(set_receiver=False)
wcs/publisher.py
130 130
        if request:
131 131
            request.response.charset = self.site_charset
132 132

  
133
        # make sure permissions are set using strings
134
        if self.cfg.get('admin-permissions'):
135
            for key in self.cfg['admin-permissions'].keys():
136
                if not self.cfg['admin-permissions'][key]:
137
                    continue
138
                self.cfg['admin-permissions'][key] = [str(x) for x in self.cfg['admin-permissions'][key]]
139

  
133 140
        import wcs.workflows
134 141
        wcs.workflows.load_extra()
135 142

  
136
-