Merge pull request 'Fix admin template table name and description ordering bug' (#107) from fix-failing-tests into release
Reviewed-on: https://gitea.pangea.org/trustchain-oc1-orchestral/IdHub/pulls/107
This commit is contained in:
commit
76a1d5b793
|
@ -235,11 +235,25 @@ class TemplateTable(tables.Table):
|
||||||
orderable=False,
|
orderable=False,
|
||||||
verbose_name="Delete schema")
|
verbose_name="Delete schema")
|
||||||
|
|
||||||
_name = tables.Column(verbose_name="Name")
|
name = tables.Column()
|
||||||
_description = tables.Column(verbose_name="Description")
|
description = tables.Column()
|
||||||
|
|
||||||
|
def order_name(self, queryset, is_descending):
|
||||||
|
queryset = Schemas.objects.order_by(
|
||||||
|
("-" if is_descending else "") + "_name"
|
||||||
|
)
|
||||||
|
|
||||||
|
return (queryset, True)
|
||||||
|
|
||||||
|
def order_description(self, queryset, is_descending):
|
||||||
|
queryset = Schemas.objects.order_by(
|
||||||
|
("-" if is_descending else "") + "_description"
|
||||||
|
)
|
||||||
|
|
||||||
|
return (queryset, True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Schemas
|
model = Schemas
|
||||||
template_name = "idhub/custom_table.html"
|
template_name = "idhub/custom_table.html"
|
||||||
fields = ("created_at", "file_schema", "name", "_description",
|
fields = ("created_at", "file_schema", "name", "description",
|
||||||
"view_schema", "delete_schema")
|
"view_schema", "delete_schema")
|
||||||
|
|
Loading…
Reference in a new issue