Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

services/backend/api/v1/achievement/schemas.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from ninja import ModelSchema, Schema
 from pydantic import Field
 
@@ -19,6 +21,7 @@ class UserAchievementSchema(Schema):
     name: str = Field(..., alias="achievement.name")
     description: str = Field(..., alias="achievement.description")
     icon: str = Field(..., alias="achievement.icon")
+    received_at: datetime
 
     class Meta:
         model = UserAchievement

services/backend/apps/task/admin.py

@@ -48,9 +48,6 @@ class CompetitionTaskSubmissionAdmin(admin.ModelAdmin):
     def has_add_permission(self, request, obj=None):
         return False
 
-    def has_delete_permission(self, request, obj=None):
-        return False
-
 
 class CompetitionTaskInline(admin.StackedInline):
     model = CompetitionTask

services/backend/config/urls.py

@@ -12,10 +12,6 @@ admin.site.index_title = "DataRush"
 
 
 urlpatterns = [
-    # tinymce
-    path("tinymce/", include("tinymce.urls")),
-    # martor
-    path("martor/", include("martor.urls")),
     # mdeditor
     path(r'mdeditor/', include('mdeditor.urls')),
     # Admin urls