0x2620/phantasmobile
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: 0x2620:6efa5b7900dcbcb7d1462404102d68f1b44308bd
Branches Tags
0x2620:main
..
compare: 0x2620:44ab4334272d66895d99610d0b64858ae0192a3d
Branches Tags
0x2620:main

No commits in common. "6efa5b7900dcbcb7d1462404102d68f1b44308bd" and "44ab4334272d66895d99610d0b64858ae0192a3d" have entirely different histories.
6efa5b7900 ... 44ab433427

2 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/item/views.py
View file

@ -8,7 +8,7 @@ from django.shortcuts import render
from django.db.models import Q from django.db.models import Q
from django.utils.html import mark_safe from django.utils.html import mark_safe
from django.conf import settings from django.conf import settings
from django.http import HttpResponse, Http404 from django.http import HttpResponse
from . import models from . import models
from . import tasks from . import tasks
@ -19,10 +19,6 @@ from ..utils import default_context
TS_FORMAT = "%Y-%m-%dT%H:%M:%S" TS_FORMAT = "%Y-%m-%dT%H:%M:%S"
def get_now():
return timezone.make_aware(datetime.now(), timezone.get_default_timezone())
def index(request): def index(request):
context = default_context(request) context = default_context(request)
now = request.GET.get("now") now = request.GET.get("now")
@ -30,7 +26,7 @@ def index(request):
now = datetime.strptime(now, TS_FORMAT) now = datetime.strptime(now, TS_FORMAT)
now = timezone.make_aware(now, timezone.get_default_timezone()) now = timezone.make_aware(now, timezone.get_default_timezone())
elif request.user.is_staff: elif request.user.is_staff:
now = get_now() now = timezone.make_aware(datetime.now(), timezone.get_default_timezone())
else: else:
now = None now = None
week, archive = models.Item.public(now) week, archive = models.Item.public(now)
@ -54,10 +50,6 @@ def archive(request):
def item(request, id): def item(request, id):
context = default_context(request) context = default_context(request)
item = models.Item.objects.get(id=id) item = models.Item.objects.get(id=id)
if not request.user.is_staff and (
not item.published or item.published >= get_now()
):
raise Http404
context['item'] = item context['item'] = item
qs = item.comments.order_by('created') qs = item.comments.order_by('created')
if not request.user.is_staff: if not request.user.is_staff:
@ -90,7 +82,7 @@ def comment(request):
if request.user.is_authenticated: if request.user.is_authenticated:
comment.user = request.user comment.user = request.user
if comment.user.has_perm('app.item.can_post_comment'): if comment.user.has_perm('app.item.can_post_comment'):
comment.published = get_now() comment.published = timezone.now()
else: else:
comment.name = data['name'] comment.name = data['name']
comment.email = data['email'] comment.email = data['email']
@ -108,7 +100,7 @@ def publish_comment(request):
data = json.loads(request.body) data = json.loads(request.body)
if request.user.is_staff: if request.user.is_staff:
comment = models.Comment.objects.get(id=data['comment']) comment = models.Comment.objects.get(id=data['comment'])
comment.published = get_now() comment.published = timezone.now()
comment.save() comment.save()
if comment.data.get("moderator_ts"): if comment.data.get("moderator_ts"):
account = settings.SIGNAL_ACCOUNT account = settings.SIGNAL_ACCOUNT

2
app/templates/index.html
View file

@ -11,7 +11,7 @@
{% endfor %} {% endfor %}
{% if archive %} {% if archive %}
<div class="archive"> <div class="archive">
<a href="/archive/">previous weeks</a> <a href="/archive/">older items</a>
</div> </div>
{% endif %} {% endif %}
</div> </div>