sdbs/pile
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

hidden -> public

Browse source
This commit is contained in:
Tomáš Mládek 2020-03-29 11:34:45 +02:00
parent e95c3f81f5
commit 4a2217c528
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sdbs_pile/pile/admin.py
View file

@ -32,8 +32,8 @@ class DocumentExternalListFilter(admin.SimpleListFilter):
class DocumentAdmin(admin.ModelAdmin): class DocumentAdmin(admin.ModelAdmin):
exclude = ('is_removed',) exclude = ('is_removed',)
list_display = ('title', 'author', 'published', 'hidden', 'filed_under') list_display = ('title', 'author', 'published', 'public', 'filed_under')
list_filter = ('tags', 'hidden', DocumentExternalListFilter) list_filter = ('tags', 'public', DocumentExternalListFilter)
search_fields = ('title', 'author', 'published') search_fields = ('title', 'author', 'published')
@staticmethod @staticmethod

27
sdbs_pile/pile/migrations/0006_auto_20200329_1132.py Normal file
View file

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

4
sdbs_pile/pile/models.py
View file

@ -25,7 +25,7 @@ class DocumentManager(models.Manager):
def get_queryset(self): def get_queryset(self):
query_set = super().get_queryset().filter(is_removed=False) query_set = super().get_queryset().filter(is_removed=False)
if not self._include_hidden: if not self._include_hidden:
return query_set.filter(hidden=False) return query_set.filter(public=True)
return query_set return query_set
def untagged(self): def untagged(self):
@ -39,7 +39,7 @@ class Document(SoftDeletableModel):
published = models.CharField(max_length=128, null=False, blank=True) published = models.CharField(max_length=128, null=False, blank=True)
external_url = models.URLField(null=True, blank=True) external_url = models.URLField(null=True, blank=True)
file = models.FileField(null=True, blank=True, storage=FileSystemStorage(location='docs')) 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) tags = models.ManyToManyField(Tag, related_name="documents", blank=True)
uploaded = models.DateTimeField(auto_now_add=True, null=True) uploaded = models.DateTimeField(auto_now_add=True, null=True)