From 4a2217c528fcd7d9c7ee42845d5cb2be70ebe514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Sun, 29 Mar 2020 11:34:45 +0200 Subject: [PATCH] hidden -> public --- sdbs_pile/pile/admin.py | 4 +-- .../migrations/0006_auto_20200329_1132.py | 27 +++++++++++++++++++ sdbs_pile/pile/models.py | 4 +-- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 sdbs_pile/pile/migrations/0006_auto_20200329_1132.py diff --git a/sdbs_pile/pile/admin.py b/sdbs_pile/pile/admin.py index d5286ec..4dad353 100644 --- a/sdbs_pile/pile/admin.py +++ b/sdbs_pile/pile/admin.py @@ -32,8 +32,8 @@ class DocumentExternalListFilter(admin.SimpleListFilter): class DocumentAdmin(admin.ModelAdmin): exclude = ('is_removed',) - list_display = ('title', 'author', 'published', 'hidden', 'filed_under') - list_filter = ('tags', 'hidden', DocumentExternalListFilter) + list_display = ('title', 'author', 'published', 'public', 'filed_under') + list_filter = ('tags', 'public', DocumentExternalListFilter) search_fields = ('title', 'author', 'published') @staticmethod diff --git a/sdbs_pile/pile/migrations/0006_auto_20200329_1132.py b/sdbs_pile/pile/migrations/0006_auto_20200329_1132.py new file mode 100644 index 0000000..13cf9df --- /dev/null +++ b/sdbs_pile/pile/migrations/0006_auto_20200329_1132.py @@ -0,0 +1,27 @@ +# Generated by Django 3.0.4 on 2020-03-29 09:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pile', '0005_auto_20200320_1329'), + ] + + operations = [ + migrations.RemoveField( + model_name='document', + name='hidden', + ), + migrations.AddField( + model_name='document', + name='public', + field=models.BooleanField(default=True), + ), + migrations.AlterField( + model_name='document', + name='tags', + field=models.ManyToManyField(blank=True, related_name='documents', to='pile.Tag'), + ), + ] diff --git a/sdbs_pile/pile/models.py b/sdbs_pile/pile/models.py index a2022e5..5492165 100644 --- a/sdbs_pile/pile/models.py +++ b/sdbs_pile/pile/models.py @@ -25,7 +25,7 @@ class DocumentManager(models.Manager): def get_queryset(self): query_set = super().get_queryset().filter(is_removed=False) if not self._include_hidden: - return query_set.filter(hidden=False) + return query_set.filter(public=True) return query_set def untagged(self): @@ -39,7 +39,7 @@ class Document(SoftDeletableModel): published = models.CharField(max_length=128, null=False, blank=True) external_url = models.URLField(null=True, blank=True) file = models.FileField(null=True, blank=True, storage=FileSystemStorage(location='docs')) - hidden = models.BooleanField(default=False, null=False, blank=False) + public = models.BooleanField(default=True, null=False, blank=False) tags = models.ManyToManyField(Tag, related_name="documents", blank=True) uploaded = models.DateTimeField(auto_now_add=True, null=True)