mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-01 06:29:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into production

Browse source
This commit is contained in:
Mouse Reeve 2021-01-18 12:01:33 -08:00
commit 41d9fe9d9d
3 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/migrations/0037_auto_20210118_1900.py → bookwyrm/migrations/0037_auto_20210118_1954.py
View file

@ -1,4 +1,4 @@
# Generated by Django 3.0.7 on 2021-01-18 19:00 # Generated by Django 3.0.7 on 2021-01-18 19:54
from django.db import migrations, models from django.db import migrations, models
@ -17,6 +17,6 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='user', model_name='user',
name='email', name='email',
field=models.EmailField(max_length=254, unique=True), field=models.EmailField(max_length=254, null=True, unique=True),
), ),
] ]

18
bookwyrm/migrations/0038_auto_20210118_1951.py
View file

@ -1,18 +0,0 @@
# Generated by Django 3.0.7 on 2021-01-18 19:51
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('bookwyrm', '0037_auto_20210118_1900'),
]
operations = [
migrations.AlterField(
model_name='user',
name='email',
field=models.EmailField(max_length=254, null=True, unique=True),
),
]

2
bookwyrm/views/helpers.py
View file

@ -36,6 +36,8 @@ def is_bookworm_request(request):
def object_visible_to_user(viewer, obj): def object_visible_to_user(viewer, obj):
''' is a user authorized to view an object? ''' ''' is a user authorized to view an object? '''
if not obj:
return False
if viewer == obj.user or obj.privacy in ['public', 'unlisted']: if viewer == obj.user or obj.privacy in ['public', 'unlisted']:
return True return True
if obj.privacy == 'followers' and \ if obj.privacy == 'followers' and \