diff --git a/appcreator/management/commands/custom_import.py b/appcreator/management/commands/custom_import.py index e9cac86..93c2c14 100644 --- a/appcreator/management/commands/custom_import.py +++ b/appcreator/management/commands/custom_import.py @@ -96,4 +96,4 @@ def handle(self, *args, **kwargs): related_tablet.mentioned_in_pub.add(bib_item) except: continue - # print(related_tablet.mentioned_in_pub.all()) + print(related_tablet.mentioned_in_pub.all()) diff --git a/archiv/models.py b/archiv/models.py index 84b3d51..827a1c0 100644 --- a/archiv/models.py +++ b/archiv/models.py @@ -612,6 +612,7 @@ class Tablet(models.Model): help_text="whatever", ).set_extra( is_public=True, + data_lookup="Place of issue", ) mentioned_place = models.ManyToManyField( "Place", diff --git a/archiv/static/img/handcopy.jpg b/archiv/static/img/handcopy.jpg new file mode 100644 index 0000000..b26c772 Binary files /dev/null and b/archiv/static/img/handcopy.jpg differ diff --git a/archiv/static/img/project_background.jpg b/archiv/static/img/project_background.jpg new file mode 100644 index 0000000..fca28db Binary files /dev/null and b/archiv/static/img/project_background.jpg differ diff --git a/archiv/tables.py b/archiv/tables.py index 2de7458..74f2a68 100644 --- a/archiv/tables.py +++ b/archiv/tables.py @@ -14,18 +14,18 @@ class ArchivTable(tables.Table): - id = tables.LinkColumn(verbose_name='ID') + name = tables.LinkColumn(verbose_name='Name') merge = MergeColumn(verbose_name='keep | remove', accessor='pk') class Meta: model = Archiv - sequence = ('id',) + sequence = ('name', 'alt_name', 'part_of',) attrs = {"class": "table table-responsive table-hover"} class BibliographyTable(tables.Table): - id = tables.LinkColumn(verbose_name='ID') + title = tables.LinkColumn() merge = MergeColumn(verbose_name='keep | remove', accessor='pk') mentioned_place = tables.columns.ManyToManyColumn() mentioned_archive = tables.columns.ManyToManyColumn() @@ -33,7 +33,7 @@ class BibliographyTable(tables.Table): class Meta: model = Bibliography - sequence = ('id',) + sequence = ('title', 'short_title', 'publication_year', 'author',) attrs = {"class": "table table-responsive table-hover"} diff --git a/archiv/templates/archiv/generic_detail.html b/archiv/templates/archiv/generic_detail.html index 2facd6e..e83e3a4 100644 --- a/archiv/templates/archiv/generic_detail.html +++ b/archiv/templates/archiv/generic_detail.html @@ -149,8 +149,8 @@