fix edited_time

This commit is contained in:
Her Email 2023-11-20 19:31:31 -05:00 committed by Henri Dickson
parent 476a8bca35
commit 7a6a8a432b
7 changed files with 70 additions and 10 deletions

View file

@ -0,0 +1,63 @@
# Generated by Django 4.2.7 on 2023-11-21 00:14
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("journal", "0018_shelflogentrypost_shelflogentry_posts_and_more"),
]
operations = [
migrations.AlterField(
model_name="collection",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="collectionmember",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="comment",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="like",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="rating",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="review",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="shelf",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="shelfmember",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="tag",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
migrations.AlterField(
model_name="tagmember",
name="edited_time",
field=models.DateTimeField(auto_now=True),
),
]

View file

@ -235,9 +235,7 @@ class Content(Piece):
default=0 default=0
) # 0: Public / 1: Follower only / 2: Self only ) # 0: Public / 1: Follower only / 2: Self only
created_time = models.DateTimeField(default=timezone.now) created_time = models.DateTimeField(default=timezone.now)
edited_time = models.DateTimeField( edited_time = models.DateTimeField(auto_now=True)
default=timezone.now
) # auto_now=True FIXME revert this after migration
metadata = models.JSONField(default=dict) metadata = models.JSONField(default=dict)
item = models.ForeignKey(Item, on_delete=models.PROTECT) item = models.ForeignKey(Item, on_delete=models.PROTECT)
remote_id = models.CharField(max_length=200, null=True, default=None) remote_id = models.CharField(max_length=200, null=True, default=None)

View file

@ -23,7 +23,7 @@ class List(Piece):
default=0 default=0
) # 0: Public / 1: Follower only / 2: Self only ) # 0: Public / 1: Follower only / 2: Self only
created_time = models.DateTimeField(default=timezone.now) created_time = models.DateTimeField(default=timezone.now)
edited_time = models.DateTimeField(default=timezone.now) edited_time = models.DateTimeField(auto_now=True)
metadata = models.JSONField(default=dict) metadata = models.JSONField(default=dict)
class Meta: class Meta:
@ -148,7 +148,7 @@ class ListMember(Piece):
default=0 default=0
) # 0: Public / 1: Follower only / 2: Self only ) # 0: Public / 1: Follower only / 2: Self only
created_time = models.DateTimeField(default=timezone.now) created_time = models.DateTimeField(default=timezone.now)
edited_time = models.DateTimeField(default=timezone.now) edited_time = models.DateTimeField(auto_now=True)
metadata = models.JSONField(default=dict) metadata = models.JSONField(default=dict)
item = models.ForeignKey(Item, on_delete=models.PROTECT) item = models.ForeignKey(Item, on_delete=models.PROTECT)
position = models.PositiveIntegerField() position = models.PositiveIntegerField()

View file

@ -14,7 +14,7 @@ class Like(Piece): # TODO remove
default=0 default=0
) # 0: Public / 1: Follower only / 2: Self only ) # 0: Public / 1: Follower only / 2: Self only
created_time = models.DateTimeField(default=timezone.now) created_time = models.DateTimeField(default=timezone.now)
edited_time = models.DateTimeField(default=timezone.now) edited_time = models.DateTimeField(auto_now=True)
target = models.ForeignKey(Piece, on_delete=models.CASCADE, related_name="likes") target = models.ForeignKey(Piece, on_delete=models.CASCADE, related_name="likes")
@staticmethod @staticmethod

View file

@ -279,7 +279,6 @@ def collection_edit(request: AuthedHttpRequest, collection_uuid=None):
if form.is_valid(): if form.is_valid():
if not collection: if not collection:
form.instance.owner = request.user.identity form.instance.owner = request.user.identity
form.instance.edited_time = timezone.now()
form.save() form.save()
return redirect( return redirect(
reverse("journal:collection_retrieve", args=[form.instance.uuid]) reverse("journal:collection_retrieve", args=[form.instance.uuid])

View file

@ -1,9 +1,9 @@
cachetools cachetools
dateparser dateparser
discord.py discord.py
django~=4.2.6 django~=4.2.7
django-anymail django-anymail
django-auditlog>=3.0.0-beta.2 django-auditlog>=3.0.0-beta.3
django-bleach django-bleach
django-compressor django-compressor
django-cors-headers django-cors-headers

View file

@ -2,7 +2,7 @@ from django.urls import path
from .views import * from .views import *
app_name = "users" app_name = "takahe"
urlpatterns = [ urlpatterns = [
path("auth/login/", auth_login, name="auth_login"), path("auth/login/", auth_login, name="auth_login"),
path("auth/logout/", auth_logout, name="auth_logout"), path("auth/logout/", auth_logout, name="auth_logout"),