Projet

Général

Profil

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

Benjamin Dauvergne, 29 janvier 2022 15:22

Télécharger (4,52 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              | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 15 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
    
  





  77
  77
  
    

  		




  78
  78
  
    
    class Meta(Table.Meta):

  		




  79
  79
  
    
        model = User

  		




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

  		




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

  		




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

  		




  82
  82
  
    
        sequence = ('link', '...')

  		




  83
  83
  
    
        empty_text = _('None')

  		




  ......




  150
  150
  
    

  		




  151
  151
  
    

  		




  152
  152
  
    
class OUTable(Table):

  		




  153
  
  
    
    name = tables.Column(verbose_name=_('label'))

  		




  
  153
  
    
    name = tables.LinkColumn(

  		




  
  154
  
    
        viewname='a2-manager-ou-detail', kwargs={'pk': A('pk')}, accessor='name', verbose_name=_('label')

  		




  
  155
  
    
    )

  		




  154
  156
  
    
    default = tables.BooleanColumn()

  		




  155
  157
  
    

  		




  156
  158
  
    
    class Meta(Table.Meta):

  		




  157
  159
  
    
        model = OrganizationalUnit

  		




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

  		




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

  		




  159
  161
  
    
        fields = ('name', 'slug', 'default')

  		




  160
  162
  
    
        empty_text = _('None')

  		




  161
  163
  
    

  		




  ......




  190
  192
  
    

  		




  191
  193
  
    
    class Meta(Table.Meta):

  		




  192
  194
  
    
        model = Role

  		




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

  		




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

  		




  194
  196
  
    
        fields = ('name', 'ou')

  		




  195
  197
  
    
        empty_text = _('None')

  		




  196
  198
  
    
        order_by = ('name',)

  		




  ......




  216
  218
  
    

  		




  217
  219
  
    
    class Meta(Table.Meta):

  		




  218
  220
  
    
        model = Role

  		




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

  		




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

  		




  220
  222
  
    
        fields = ('name', 'ou')

  		




  221
  223
  
    
        empty_text = _('None')

  		




  222
  224
  
    
        order_by = ('name', 'ou')

  		




  223
  225
  
    

  		




  224
  226
  
    

  		




  225
  227
  
    
class ServiceTable(Table):

  		




  
  228
  
    
    name = tables.LinkColumn(

  		




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

  		




  
  230
  
    
    )

  		




  226
  231
  
    
    ou = tables.Column()

  		




  227
  
  
    
    name = tables.Column()

  		




  228
  232
  
    
    slug = tables.Column()

  		




  229
  233
  
    

  		




  230
  234
  
    
    class Meta(Table.Meta):

  		




  231
  235
  
    
        model = Service

  		




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

  		




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

  		




  233
  237
  
    
        fields = ('ou', 'name', 'slug')

  		




  234
  238
  
    
        empty_text = _('None')

  		




  235
  239
  
    
        order_by = ('ou', 'name', 'slug')

  		




  236
  240
  
    

  		




  237
  241
  
    

  		




  238
  242
  
    
class ServiceRolesTable(Table):

  		




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

  		




  
  243
  
    
    name = tables.LinkColumn(

  		




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

  		




  
  245
  
    
    )

  		




  240
  246
  
    

  		




  241
  247
  
    
    class Meta(Table.Meta):

  		




  242
  248
  
    
        model = Role

  		




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

  		




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

  		




  244
  250
  
    
        fields = ('name',)

  		




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

  		




  246
  252
  
    

  		




  ......




  252
  258
  
    

  		




  253
  259
  
    
    class Meta(Table.Meta):

  		




  254
  260
  
    
        model = OIDCAuthorization

  		




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

  		




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

  		




  256
  262
  
    
        fields = ('client', 'created', 'expired')

  		




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

  		




  258
  264
  
    

  		




  ......




  274
  280
  
    

  		




  275
  281
  
    
    class Meta(Table.Meta):

  		




  276
  282
  
    
        model = Role

  		




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

  		




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

  		




  278
  284
  
    
        fields = ('name', 'ou')

  		




  279
  285
  
    
        empty_text = _('None')

  		




  280
  
  
    
-