Merge branch 'develop' into wip/1.2

This commit is contained in:
Ben Thomson 2021-12-14 11:29:57 +08:00
commit 82f727dab1
2 changed files with 25 additions and 1 deletions

View File

@ -22,3 +22,15 @@ columns:
valueFrom: count
default: 0
sortable: false
created_at:
label: backend::lang.user.created_at
searchable: true
invisible: true
type: datetime
updated_at:
label: backend::lang.user.updated_at
searchable: true
invisible: true
type: datetime

View File

@ -14,7 +14,7 @@ columns:
description:
label: backend::lang.user.role.description_field
searchable: yes
searchable: true
users_count:
label: backend::lang.user.role.users_count
@ -22,3 +22,15 @@ columns:
valueFrom: count
default: 0
sortable: false
created_at:
label: backend::lang.user.created_at
searchable: true
invisible: true
type: datetime
updated_at:
label: backend::lang.user.updated_at
searchable: true
invisible: true
type: datetime