From dd2b1663826ed69800f353992745cd85a47cdfc6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 11 Jan 2023 19:21:40 -0800 Subject: [PATCH] Revert "Add Website field to author" --- bookwyrm/activitypub/book.py | 1 - bookwyrm/forms/author.py | 2 -- .../migrations/0173_auto_20221228_1436.py | 33 ------------------- bookwyrm/models/author.py | 5 +-- bookwyrm/models/book.py | 2 +- bookwyrm/templates/author/author.html | 10 +----- bookwyrm/templates/author/edit_author.html | 4 --- 7 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 bookwyrm/migrations/0173_auto_20221228_1436.py diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index d3aca4471..745aa3aab 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -92,4 +92,3 @@ class Author(BookData): bio: str = "" wikipediaLink: str = "" type: str = "Author" - website: str = "" diff --git a/bookwyrm/forms/author.py b/bookwyrm/forms/author.py index 5b54a07b5..3d71d4034 100644 --- a/bookwyrm/forms/author.py +++ b/bookwyrm/forms/author.py @@ -15,7 +15,6 @@ class AuthorForm(CustomForm): "aliases", "bio", "wikipedia_link", - "website", "born", "died", "openlibrary_key", @@ -32,7 +31,6 @@ class AuthorForm(CustomForm): "wikipedia_link": forms.TextInput( attrs={"aria-describedby": "desc_wikipedia_link"} ), - "website": forms.TextInput(attrs={"aria-describedby": "desc_website"}), "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}), "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}), "openlibrary_key": forms.TextInput( diff --git a/bookwyrm/migrations/0173_auto_20221228_1436.py b/bookwyrm/migrations/0173_auto_20221228_1436.py deleted file mode 100644 index 1f6e1d87e..000000000 --- a/bookwyrm/migrations/0173_auto_20221228_1436.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2.16 on 2022-12-28 14:36 - -import bookwyrm.models.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0172_alter_user_preferred_language"), - ] - - operations = [ - migrations.AddField( - model_name="author", - name="website", - field=bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - migrations.AlterField( - model_name="author", - name="isfdb", - field=bookwyrm.models.fields.CharField(blank=True, max_length=6, null=True), - ), - migrations.AlterField( - model_name="author", - name="isni", - field=bookwyrm.models.fields.CharField( - blank=True, max_length=19, null=True - ), - ), - ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 78381a65e..b1d0510c9 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -17,15 +17,12 @@ class Author(BookDataModel): max_length=255, blank=True, null=True, deduplication_field=True ) isni = fields.CharField( - max_length=19, blank=True, null=True, deduplication_field=True + max_length=255, blank=True, null=True, deduplication_field=True ) gutenberg_id = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) isfdb = fields.CharField( - max_length=6, blank=True, null=True, deduplication_field=True - ) - website = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) # idk probably other keys would be useful here? diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index c44d47dd9..a5be51a29 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -58,7 +58,7 @@ class BookDataModel(ObjectMixin, BookWyrmModel): max_length=255, blank=True, null=True, deduplication_field=True ) isfdb = fields.CharField( - max_length=6, blank=True, null=True, deduplication_field=True + max_length=255, blank=True, null=True, deduplication_field=True ) search_vector = SearchVectorField(null=True) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 62947eec0..ade654568 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -28,7 +28,7 @@ {% firstof author.aliases author.born author.died as details %} - {% firstof author.wikipedia_link author.website author.openlibrary_key author.inventaire_id author.isni author.isfdb as links %} + {% firstof author.wikipedia_link author.openlibrary_key author.inventaire_id author.isni author.isfdb as links %} {% if details or links %}
{% if details %} @@ -73,14 +73,6 @@
{% endif %} - {% if author.website %} -
- - {% trans "Website" %} - -
- {% endif %} - {% if author.isni %}
diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html index 12ddc4d28..54b547a3b 100644 --- a/bookwyrm/templates/author/edit_author.html +++ b/bookwyrm/templates/author/edit_author.html @@ -57,10 +57,6 @@ {% include 'snippets/form_errors.html' with errors_list=form.wikipedia_link.errors id="desc_wikipedia_link" %} -

{{ form.website }}

- - {% include 'snippets/form_errors.html' with errors_list=form.website.errors id="desc_website" %} -