Projet

Général

Profil

0001-manager-use-.clickable-rows-class-59991.patch

Benjamin Dauvergne, 28 mars 2022 12:05

Télécharger (5 ko)

Voir les différences: 

Subject: [PATCH 1/3] manager: use .clickable-rows class (#59991)

And deprecate .plaintable which is now useless.

 .../static/authentic2/manager/css/style.css   |  4 ---
 src/authentic2/manager/tables.py              | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)
src/authentic2/manager/static/authentic2/manager/css/style.css
270 270 
	padding-right: 30px;
271 271 
}
272 272 

  		




  273
  
  
    
table.main.plaintable tr:hover td {

  		




  274
  
  
    
	cursor: default;

  		




  275
  
  
    
}

  		




  276
  
  
    

  		




  277
  273
  
    
a.role-inheritance-view-all {

  		




  278
  274
  
    
    font-style: italic;

  		




  279
  275
  
    
}

  		












  

    
      src/authentic2/manager/tables.py
    
  





  111
  111
  
    

  		




  112
  112
  
    
    class Meta(Table.Meta):

  		




  113
  113
  
    
        model = User

  		




  114
  
  
    
        attrs = {'class': 'main', 'id': 'user-table'}

  		




  
  114
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'user-table'}

  		




  115
  115
  
    
        fields = ('username', 'email', 'first_name', 'last_name', 'ou')

  		




  116
  116
  
    
        sequence = ('get_full_name', '...')

  		




  117
  117
  
    
        empty_text = _('None')

  		




  ......




  150
  150
  
    
    )

  		




  151
  151
  
    

  		




  152
  152
  
    
    class Meta(Table.Meta):

  		




  153
  
  
    
        attrs = {'class': 'main', 'id': 'user-table'}

  		




  
  153
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'user-table'}

  		




  154
  154
  
    
        row_attrs = {

  		




  155
  155
  
    
            "data-pk": lambda record: '%s-%s' % ('user' if isinstance(record, User) else 'role', record.pk)

  		




  156
  156
  
    
        }

  		




  ......




  181
  181
  
    

  		




  182
  182
  
    
    class Meta(Table.Meta):

  		




  183
  183
  
    
        model = Role

  		




  184
  
  
    
        attrs = {'class': 'main', 'id': 'role-table'}

  		




  
  184
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'role-table'}

  		




  185
  185
  
    
        fields = ('name', 'slug', 'ou', 'member_count')

  		




  186
  186
  
    

  		




  187
  187
  
    

  		




  ......




  204
  204
  
    

  		




  205
  205
  
    
    class Meta(Table.Meta):

  		




  206
  206
  
    
        model = OrganizationalUnit

  		




  207
  
  
    
        attrs = {'class': 'main', 'id': 'ou-table'}

  		




  
  207
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'ou-table'}

  		




  208
  208
  
    
        fields = ('name', 'slug', 'default')

  		




  209
  209
  
    
        empty_text = _('None')

  		




  210
  210
  
    

  		




  ......




  248
  248
  
    

  		




  249
  249
  
    
    class Meta(Table.Meta):

  		




  250
  250
  
    
        model = Role

  		




  251
  
  
    
        attrs = {'class': 'main plaintable', 'id': 'role-table'}

  		




  
  251
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'role-table'}

  		




  252
  252
  
    
        fields = ('name', 'ou')

  		




  253
  253
  
    
        empty_text = _('None')

  		




  254
  254
  
    
        order_by = ('name',)

  		




  ......




  282
  282
  
    

  		




  283
  283
  
    
    class Meta(Table.Meta):

  		




  284
  284
  
    
        model = Role

  		




  285
  
  
    
        attrs = {'class': 'main', 'id': 'role-table'}

  		




  
  285
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'role-table'}

  		




  286
  286
  
    
        fields = ('name', 'ou')

  		




  287
  287
  
    
        empty_text = _('None')

  		




  288
  288
  
    
        order_by = ('name', 'ou')

  		




  289
  289
  
    

  		




  290
  290
  
    

  		




  291
  291
  
    
class ServiceTable(Table):

  		




  
  292
  
    
    name = tables.LinkColumn(

  		




  
  293
  
    
        viewname='a2-manager-service',

  		




  
  294
  
    
        kwargs={'service_pk': A('pk')},

  		




  
  295
  
    
        accessor='name',

  		




  
  296
  
    
        verbose_name=_('label'),

  		




  
  297
  
    
    )

  		




  292
  298
  
    
    ou = tables.Column()

  		




  293
  
  
    
    name = tables.Column()

  		




  294
  299
  
    
    slug = tables.Column()

  		




  295
  300
  
    

  		




  296
  301
  
    
    class Meta(Table.Meta):

  		




  297
  302
  
    
        model = Service

  		




  298
  
  
    
        attrs = {'class': 'main', 'id': 'service-table'}

  		




  299
  
  
    
        fields = ('ou', 'name', 'slug')

  		




  
  303
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'service-table'}

  		




  
  304
  
    
        fields = ('name', 'slug', 'ou')

  		




  300
  305
  
    
        empty_text = _('None')

  		




  301
  306
  
    
        order_by = ('ou', 'name', 'slug')

  		




  302
  307
  
    

  		




  303
  308
  
    

  		




  304
  309
  
    
class ServiceRolesTable(Table):

  		




  305
  
  
    
    name = tables.Column(accessor='name', verbose_name=_('name'))

  		




  
  310
  
    
    name = tables.LinkColumn(

  		




  
  311
  
    
        viewname='a2-manager-role-members', kwargs={'pk': A('pk')}, accessor='name', verbose_name=_('label')

  		




  
  312
  
    
    )

  		




  306
  313
  
    

  		




  307
  314
  
    
    class Meta(Table.Meta):

  		




  308
  315
  
    
        model = Role

  		




  309
  
  
    
        attrs = {'class': 'main', 'id': 'service-role-table'}

  		




  
  316
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'service-role-table'}

  		




  310
  317
  
    
        fields = ('name',)

  		




  311
  318
  
    
        empty_text = _('No access restriction. All users are allowed to connect to this service.')

  		




  312
  319
  
    

  		




  ......




  318
  325
  
    

  		




  319
  326
  
    
    class Meta(Table.Meta):

  		




  320
  327
  
    
        model = OIDCAuthorization

  		




  321
  
  
    
        attrs = {'class': 'main plaintable', 'id': 'user-authorizations-table'}

  		




  
  328
  
    
        attrs = {'class': 'main', 'id': 'user-authorizations-table'}

  		




  322
  329
  
    
        fields = ('client', 'created', 'expired')

  		




  323
  330
  
    
        empty_text = _('This user has not granted profile data access to any service yet.')

  		




  324
  331
  
    

  		




  ......




  346
  353
  
    

  		




  347
  354
  
    
    class Meta(Table.Meta):

  		




  348
  355
  
    
        model = Role

  		




  349
  
  
    
        attrs = {'class': 'main plaintable', 'id': 'inheritance-role-table'}

  		




  
  356
  
    
        attrs = {'class': 'main clickable-rows', 'id': 'inheritance-role-table'}

  		




  350
  357
  
    
        fields = ('name', 'ou')

  		




  351
  358
  
    
        empty_text = _('None')

  		




  352
  
  
    
-