From 7cac4157c635d32b1a741f56bd4c3d773d91347d Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Fri, 7 Oct 2022 12:32:39 -0500 Subject: [PATCH] Revert --- dmoj/settings.py | 4 -- dmoj/urls.py | 5 --- judge/models/interface.py | 5 +-- judge/views/organization.py | 67 ++++++++++++-------------------- judge/views/problem.py | 4 -- requirements.txt | 2 +- templates/organization/form.html | 3 +- templates/user/base-users.html | 2 +- 8 files changed, 30 insertions(+), 62 deletions(-) diff --git a/dmoj/settings.py b/dmoj/settings.py index 8aa3db7..7a42b06 100644 --- a/dmoj/settings.py +++ b/dmoj/settings.py @@ -405,10 +405,6 @@ DATABASES = { "default": { "ENGINE": "django.db.backends.sqlite3", "NAME": os.path.join(BASE_DIR, "db.sqlite3"), - 'USER': 'dmoj', - 'PASSWORD': 'YES', - 'HOST': 'localhost', - 'PORT': '', }, } diff --git a/dmoj/urls.py b/dmoj/urls.py index fcfd424..255a951 100644 --- a/dmoj/urls.py +++ b/dmoj/urls.py @@ -665,11 +665,6 @@ urlpatterns = [ organization.EditOrganizationBlog.as_view(), name="edit_organization_blog", ), - # url( - # r"^/blog/deleting$", - # organization.PendingBlogs.as_view(), - # name="organization_pending_blogs", - # ), url( r"^/blog/pending$", organization.PendingBlogs.as_view(), diff --git a/judge/models/interface.py b/judge/models/interface.py index a45c24a..24b05de 100644 --- a/judge/models/interface.py +++ b/judge/models/interface.py @@ -1,6 +1,4 @@ -from email.policy import default import re -from tabnanny import verbose from django.core.exceptions import ValidationError from django.db import models @@ -98,7 +96,8 @@ class BlogPost(models.Model): return self.title def get_absolute_url(self): - return reverse("blog_post", args=(self.id , self.slug)) + return reverse("blog_post", args=(self.id, self.slug)) + def can_see(self, user): if self.visible and self.publish_on <= timezone.now(): if not self.is_organization_private: diff --git a/judge/views/organization.py b/judge/views/organization.py index 3d3371c..0414516 100644 --- a/judge/views/organization.py +++ b/judge/views/organization.py @@ -1,10 +1,8 @@ -from ast import Delete, arg from itertools import chain from django import forms from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin -from django.contrib.auth.models import User from django.core.cache import cache from django.core.cache.utils import make_template_fragment_key from django.core.exceptions import PermissionDenied @@ -19,7 +17,7 @@ from django.http import ( HttpResponseBadRequest, ) from django.shortcuts import get_object_or_404 -from django.urls import reverse , reverse_lazy +from django.urls import reverse from django.utils import timezone from django.utils.html import format_html from django.utils.functional import cached_property @@ -32,7 +30,6 @@ from django.views.generic import ( UpdateView, View, CreateView, - DeleteView, ) from django.views.generic.detail import ( SingleObjectMixin, @@ -134,7 +131,7 @@ class OrganizationMixin(OrganizationBase): def dispatch(self, request, *args, **kwargs): try: - self.organization_id = int(kwargs["pk"] ) + self.organization_id = int(kwargs["pk"]) self.organization = get_object_or_404(Organization, id=self.organization_id) except Http404: key = kwargs.get(self.slug_url_kwarg, None) @@ -933,8 +930,8 @@ class EditOrganizationContest( problem_form.save() for problem_form in problem_formset.deleted_objects: problem_form.delete() - super().post(request, *args, **kwargs) - return HttpResponseRedirect(reverse("organization_contests", args=(self.organization_id,self.organization.slug) )) + return super().post(request, *args, **kwargs) + self.object = self.contest return self.render_to_response( self.get_context_data( @@ -1039,7 +1036,7 @@ class EditOrganizationBlog( MemberOrganizationMixin, UpdateView, ): - template_name = "organization/blog/edit.html" + template_name = "organization/blog/add.html" model = BlogPost def get_form_class(self): @@ -1065,10 +1062,6 @@ class EditOrganizationBlog( _("Not allowed to edit this blog"), ) - def delete_blog(self , request , *args , **kwargs): - self.blog_id = kwargs["blog_pk"] - BlogPost.objects.get(pk = self.blog_id).delete() - def get(self, request, *args, **kwargs): res = self.setup_blog(request, *args, **kwargs) if res: @@ -1079,13 +1072,7 @@ class EditOrganizationBlog( res = self.setup_blog(request, *args, **kwargs) if res: return res - if request.POST['action'] == 'Delete': - self.create_notification("Delete blog") - self.delete_blog(request , *args , **kwargs) - cur_url = reverse("organization_pending_blogs", args=(self.organization_id,self.organization.slug) ) - return HttpResponseRedirect(cur_url) - else: - return super().post(request, *args, **kwargs) + return super().post(request, *args, **kwargs) def get_object(self): return self.blog @@ -1093,36 +1080,32 @@ class EditOrganizationBlog( def get_title(self): return _("Edit blog %s") % self.object.title - def create_notification(self,action): - blog = BlogPost.objects.get(pk=self.blog_id) - link = reverse( - "edit_organization_blog", - args=[self.organization.id, self.organization.slug, self.blog_id], - ) - html = ( - f'{blog.title} - {self.organization.name}' - ) - post_authors = blog.authors.all() - posible_user = self.organization.admins.all() | post_authors - for user in posible_user: - if user.id == self.request.profile.id: - continue - notification = Notification( - owner=user, - author=self.request.profile, - category= action, - html_link=html, - ) - notification.save() - def form_valid(self, form): with transaction.atomic(), revisions.create_revision(): res = super(EditOrganizationBlog, self).form_valid(form) revisions.set_comment(_("Edited from site")) revisions.set_user(self.request.user) - self.create_notification("Edit blog") + + link = reverse( + "edit_organization_blog", + args=[self.organization.id, self.organization.slug, self.object.id], + ) + html = ( + f'{self.object.title} - {self.organization.name}' + ) + for user in self.organization.admins.all(): + if user.id == self.request.profile.id: + continue + notification = Notification( + owner=user, + author=self.request.profile, + category="Edit blog", + html_link=html, + ) + notification.save() return res + class PendingBlogs( LoginRequiredMixin, TitleMixin, diff --git a/judge/views/problem.py b/judge/views/problem.py index a328733..ba9790c 100644 --- a/judge/views/problem.py +++ b/judge/views/problem.py @@ -290,19 +290,15 @@ class ProblemDetail(ProblemMixin, SolvedProblemMixin, CommentedDetailView): except ObjectDoesNotExist: pass try: - print(self.request.LANGUAGE_CODE) - print(ProblemTranslation.objects.last().__dict__) translation = self.object.translations.get( language=self.request.LANGUAGE_CODE ) except ProblemTranslation.DoesNotExist: - print('DNE') context["title"] = self.object.name context["language"] = settings.LANGUAGE_CODE context["description"] = self.object.description context["translated"] = False else: - print('E') context["title"] = translation.name context["language"] = self.request.LANGUAGE_CODE context["description"] = translation.description diff --git a/requirements.txt b/requirements.txt index b6bc5ee..0743316 100644 --- a/requirements.txt +++ b/requirements.txt @@ -38,4 +38,4 @@ lupa websocket-client python-memcached numpy -pandas +pandas \ No newline at end of file diff --git a/templates/organization/form.html b/templates/organization/form.html index 89241da..f23df3c 100644 --- a/templates/organization/form.html +++ b/templates/organization/form.html @@ -21,6 +21,5 @@ {% endif %} {% endfor %} - - + \ No newline at end of file diff --git a/templates/user/base-users.html b/templates/user/base-users.html index e62c550..608d8fc 100644 --- a/templates/user/base-users.html +++ b/templates/user/base-users.html @@ -10,7 +10,7 @@ {% block users_media %}{% endblock %} {% endblock %} -{% block body %}z +{% block body %}
{% if page_obj and page_obj.num_pages > 1 %}