mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-05-14 22:43:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2598 from bookwyrm-social/revert-2555-author_website

Browse source 
Revert "Add Website field to author"
This commit is contained in:
Mouse Reeve 2023-01-11 19:30:41 -08:00 committed by GitHub
parent 60f3f8fcc0 dd2b166382
commit 0f0da0bdbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bookwyrm/activitypub/book.py
View file

@ -92,4 +92,3 @@ class Author(BookData):
bio: str = ""
wikipediaLink: str = ""
type: str = "Author"
website: str = ""

2
bookwyrm/forms/author.py
View file

@ -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(

33
bookwyrm/migrations/0173_auto_20221228_1436.py
View file

@ -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
),
),
]

5
bookwyrm/models/author.py
View file

@ -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?

2
bookwyrm/models/book.py
View file

@ -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)

10
bookwyrm/templates/author/author.html
View file

@ -28,7 +28,7 @@
<meta itemprop="name" content="{{ author.name }}">
{% 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 %}
<div class="column is-3">
{% if details %}
@ -73,14 +73,6 @@
</div>
{% endif %}
{% if author.website %}
<div>
<a itemprop="sameAs" href="{{ author.website }}" rel="nofollow noopener noreferrer" target="_blank">
{% trans "Website" %}
</a>
</div>
{% endif %}
{% if author.isni %}
<div class="mt-1">
<a itemprop="sameAs" href="{{ author.isni_link }}" rel="nofollow noopener noreferrer" target="_blank">

4
bookwyrm/templates/author/edit_author.html
View file

@ -57,10 +57,6 @@
{% include 'snippets/form_errors.html' with errors_list=form.wikipedia_link.errors id="desc_wikipedia_link" %}
<p class="field"><label class="label" for="id_website">{% trans "Website:" %}</label> {{ form.website }}</p>
{% include 'snippets/form_errors.html' with errors_list=form.website.errors id="desc_website" %}
<div class="field">
<label class="label" for="id_born">{% trans "Birth date:" %}</label>
<input type="date" name="born" value="{{ form.born.value|date:'Y-m-d' }}" class="input" id="id_born">