Projet

Général

Profil

0001-manager-correct-model-field-on-tables-47408.patch

Nicolas Roche, 06 octobre 2020 19:52

Télécharger (3,55 ko)

Voir les différences:

Subject: [PATCH] manager: correct model field on tables (#47408)

 src/authentic2/manager/tables.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
src/authentic2/manager/tables.py
108 108
    name = tables.LinkColumn(viewname='a2-manager-role-members',
109 109
                             kwargs={'pk': A('pk')},
110 110
                             accessor='name', verbose_name=_('label'))
111 111
    ou = tables.Column()
112 112
    member_count = tables.Column(verbose_name=_('Direct member count'),
113 113
                                 orderable=False)
114 114

  
115 115
    class Meta:
116
        models = get_role_model()
116
        model = get_role_model()
117 117
        attrs = {'class': 'main', 'id': 'role-table'}
118 118
        fields = ('name', 'ou', 'member_count')
119 119

  
120 120

  
121 121
class PermissionTable(tables.Table):
122 122
    operation = tables.Column()
123 123
    scope = tables.Column()
124 124
    target = tables.Column()
......
155 155
        '{%% if not record.has_perm %%}disabled '
156 156
        'title="{%% trans "%s" %%}"{%% endif %%} '
157 157
        '{%% if not record.can_manage_members %%}disabled '
158 158
        'title="{%% trans "%s" %%}"{%% endif %%}/>' % (ugettext_noop('You are not authorized to manage this role'), ugettext_noop('This role is synchronised from LDAP, changing members is not allowed.')),
159 159
        verbose_name=_('Member'),
160 160
        order_by=('member', 'via', 'name'))
161 161

  
162 162
    class Meta:
163
        models = get_role_model()
163
        model = get_role_model()
164 164
        attrs = {'class': 'main', 'id': 'role-table'}
165
        fields = ('name', 'ou')
165 166
        empty_text = _('None')
166 167
        order_by = ('name',)
167 168

  
168 169

  
169 170
class UserRolesTable(tables.Table):
170 171
    name = tables.LinkColumn(viewname='a2-manager-role-members',
171 172
                             kwargs={'pk': A('pk')},
172 173
                             accessor='name', verbose_name=_('label'))
......
174 175
    via = tables.TemplateColumn(
175 176
        '{% if not record.member %}{% for rel in record.child_relation.all %}'
176 177
        '{{ rel.child }} {% if not forloop.last %}, {% endif %}{% endfor %}'
177 178
        '{% endif %}',
178 179
        verbose_name=_('Inherited from'),
179 180
        orderable=False)
180 181

  
181 182
    class Meta:
182
        models = get_role_model()
183
        model = get_role_model()
183 184
        attrs = {'class': 'main', 'id': 'role-table'}
184 185
        fields = ('name', 'ou')
185 186
        empty_text = _('None')
186 187
        order_by = ('name', 'ou')
187 188

  
188 189

  
189 190
class ServiceTable(tables.Table):
190 191
    ou = tables.Column()
191 192
    name = tables.Column()
192 193
    slug = tables.Column()
193 194

  
194 195
    class Meta:
195
        models = Service
196
        model = Service
196 197
        attrs = {'class': 'main', 'id': 'service-table'}
197 198
        empty_text = _('None')
198 199
        order_by = ('ou', 'name', 'slug')
199 200

  
200 201

  
201 202
class ServiceRolesTable(tables.Table):
202 203
    name = tables.Column(accessor='name', verbose_name=_('name'))
203 204

  
204 205
    class Meta:
205
        models = get_role_model()
206
        model = get_role_model()
206 207
        attrs = {'class': 'main', 'id': 'service-role-table'}
207 208
        fields = ('name',)
208 209
        empty_text = _('No access restriction. All users are allowed to connect to this service.')
209 210

  
210 211

  
211 212
class UserAuthorizationsTable(tables.Table):
212 213
    client = tables.Column()
213 214
    created = tables.Column()
214
-