lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'LQDJudge:master' into master

Browse source
This commit is contained in:
Phuoc Anh Kha Le 2023-12-29 21:10:29 -06:00 • committed by GitHub
commit 949e63d10f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
judge/jinja2/social.py
View file

@ -48,5 +48,9 @@ for name, template, url_func in SHARES:
@registry.function @registry.function
def recaptcha_init(language=None): def recaptcha_init(language=None):
return get_template("snowpenguin/recaptcha/recaptcha_init.html").render( return get_template("snowpenguin/recaptcha/recaptcha_init.html").render(
{"explicit": False, "language": language} {
"explicit": False,
"language": language,
"recaptcha_host": "https://google.com",
}
) )

4
judge/views/comment.py
View file

@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
from django.contrib.auth.context_processors import PermWrapper from django.contrib.auth.context_processors import PermWrapper
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.db import IntegrityError, transaction from django.db import IntegrityError
from django.db.models import Q, F, Count, FilteredRelation from django.db.models import Q, F, Count, FilteredRelation
from django.db.models.functions import Coalesce from django.db.models.functions import Coalesce
from django.db.models.expressions import F, Value from django.db.models.expressions import F, Value
@ -242,7 +242,7 @@ class CommentEditAjax(LoginRequiredMixin, CommentMixin, UpdateView):
add_mention_notifications(comment) add_mention_notifications(comment)
comment.revision_count = comment.versions.count() + 1 comment.revision_count = comment.versions.count() + 1
comment.save(update_fields=["revision_count"]) comment.save(update_fields=["revision_count"])
with transaction.atomic(), revisions.create_revision(): with revisions.create_revision():
revisions.set_comment(_("Edited from site")) revisions.set_comment(_("Edited from site"))
revisions.set_user(self.request.user) revisions.set_user(self.request.user)
return super(CommentEditAjax, self).form_valid(form) return super(CommentEditAjax, self).form_valid(form)