mirror of
https://gitlab.com/megazordpobeda/DataRush.git
synced 2026-05-23 02:47:10 +00:00
change markdown editor in admin (now I use https://github.com/pylixm/django-mdeditor)
This commit is contained in:
@@ -4,6 +4,7 @@ from apps.task.models import (
|
|||||||
CompetitionTask,
|
CompetitionTask,
|
||||||
CompetitionTaskAttachment,
|
CompetitionTaskAttachment,
|
||||||
CompetitionTaskSubmission,
|
CompetitionTaskSubmission,
|
||||||
|
CompetitionTaskCriteria
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@@ -12,12 +13,17 @@ class CompletionAttachmentInline(admin.StackedInline):
|
|||||||
extra = 0
|
extra = 0
|
||||||
|
|
||||||
|
|
||||||
|
class CompetitionCriteriaInline(admin.StackedInline):
|
||||||
|
model = CompetitionTaskCriteria
|
||||||
|
extra = 0
|
||||||
|
|
||||||
|
|
||||||
@admin.register(CompetitionTask)
|
@admin.register(CompetitionTask)
|
||||||
class CompetitionTaskAdmin(admin.ModelAdmin):
|
class CompetitionTaskAdmin(admin.ModelAdmin):
|
||||||
list_display = ("title", "type", "points")
|
list_display = ("title", "type", "points")
|
||||||
filter_horizontal = ("reviewers",)
|
filter_horizontal = ("reviewers",)
|
||||||
list_filter = ("type",)
|
list_filter = ("type",)
|
||||||
inlines = (CompletionAttachmentInline,)
|
inlines = (CompletionAttachmentInline, CompetitionCriteriaInline,)
|
||||||
|
|
||||||
|
|
||||||
@admin.register(CompetitionTaskSubmission)
|
@admin.register(CompetitionTaskSubmission)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ from uuid import uuid4
|
|||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Count, Q
|
from django.db.models import Count, Q
|
||||||
from martor.models import MartorField
|
from martor.models import MartorField
|
||||||
|
from mdeditor.fields import MDTextField
|
||||||
|
|
||||||
from apps.competition.models import Competition
|
from apps.competition.models import Competition
|
||||||
from apps.core.models import BaseModel
|
from apps.core.models import BaseModel
|
||||||
@@ -25,7 +26,7 @@ class CompetitionTask(BaseModel):
|
|||||||
competition = models.ForeignKey(Competition, on_delete=models.CASCADE,
|
competition = models.ForeignKey(Competition, on_delete=models.CASCADE,
|
||||||
verbose_name="привязанное соревнование")
|
verbose_name="привязанное соревнование")
|
||||||
title = models.CharField(verbose_name="заголовок", max_length=50)
|
title = models.CharField(verbose_name="заголовок", max_length=50)
|
||||||
description = MartorField(verbose_name="описание")
|
description = MDTextField(verbose_name="описание")
|
||||||
max_attempts = models.PositiveSmallIntegerField(null=True, blank=True,
|
max_attempts = models.PositiveSmallIntegerField(null=True, blank=True,
|
||||||
verbose_name="максимальное кол-во попыток")
|
verbose_name="максимальное кол-во попыток")
|
||||||
type = models.CharField(
|
type = models.CharField(
|
||||||
@@ -89,6 +90,13 @@ class CompetitionTaskCriteria(BaseModel):
|
|||||||
verbose_name="максимальное кол-во баллов"
|
verbose_name="максимальное кол-во баллов"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = "критерий"
|
||||||
|
verbose_name_plural = "критерии"
|
||||||
|
|
||||||
|
|
||||||
class CompetitionTaskAttachment(BaseModel):
|
class CompetitionTaskAttachment(BaseModel):
|
||||||
def file_upload_at(instance, filename) -> str:
|
def file_upload_at(instance, filename) -> str:
|
||||||
|
|||||||
@@ -271,6 +271,8 @@ DEFAULT_CHARSET = "utf-8"
|
|||||||
|
|
||||||
FORCE_SCRIPT_NAME = None
|
FORCE_SCRIPT_NAME = None
|
||||||
|
|
||||||
|
X_FRAME_OPTIONS = "SAMEORIGIN"
|
||||||
|
|
||||||
INTERNAL_IPS = env(
|
INTERNAL_IPS = env(
|
||||||
"DJANGO_INTERNAL_IPS",
|
"DJANGO_INTERNAL_IPS",
|
||||||
list,
|
list,
|
||||||
@@ -440,6 +442,7 @@ INSTALLED_APPS = [
|
|||||||
"minio_storage",
|
"minio_storage",
|
||||||
"tinymce",
|
"tinymce",
|
||||||
"martor",
|
"martor",
|
||||||
|
"mdeditor",
|
||||||
# Internal apps
|
# Internal apps
|
||||||
"apps.core",
|
"apps.core",
|
||||||
"apps.user",
|
"apps.user",
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ urlpatterns = [
|
|||||||
path("tinymce/", include("tinymce.urls")),
|
path("tinymce/", include("tinymce.urls")),
|
||||||
# martor
|
# martor
|
||||||
path("martor/", include("martor.urls")),
|
path("martor/", include("martor.urls")),
|
||||||
|
# mdeditor
|
||||||
|
path(r'mdeditor/', include('mdeditor.urls')),
|
||||||
# Admin urls
|
# Admin urls
|
||||||
path("admin/", admin.site.urls),
|
path("admin/", admin.site.urls),
|
||||||
# API urls
|
# API urls
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ dependencies = [
|
|||||||
"django-extensions>=3.2.3",
|
"django-extensions>=3.2.3",
|
||||||
"django-guid>=3.5.0",
|
"django-guid>=3.5.0",
|
||||||
"django-health-check>=3.18.3",
|
"django-health-check>=3.18.3",
|
||||||
|
"django-mdeditor>=0.1.20",
|
||||||
"django-minio-storage>=0.5.7",
|
"django-minio-storage>=0.5.7",
|
||||||
"django-ninja>=1.3.0",
|
"django-ninja>=1.3.0",
|
||||||
"django-pagedown>=2.2.1",
|
"django-pagedown>=2.2.1",
|
||||||
|
|||||||
Reference in New Issue
Block a user