Skip to content

Commit 99c392e

Browse files
committed
Код привдён в соответствие с правилами оформления; Отсортированы импорты
1 parent 8e85f18 commit 99c392e

3 files changed

Lines changed: 63 additions & 47 deletions

File tree

projects/admin.py

Lines changed: 51 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from django.contrib import admin
22

33
from projects.models import (
4-
DefaultProjectCover,
5-
Project,
64
Achievement,
75
Collaborator,
6+
DefaultProjectCover,
7+
Project,
88
ProjectLink,
99
ProjectNews,
1010
)
@@ -39,43 +39,55 @@ class ProjectAdmin(admin.ModelAdmin):
3939
)
4040

4141
fieldsets = (
42-
("Основная информация", {
43-
"fields": (
44-
"name",
45-
"description",
46-
"leader",
47-
"industry",
48-
"region",
49-
"step",
50-
"draft",
51-
"is_company",
52-
)
53-
}),
54-
("Для проектов ПД МосПолитеха", {
55-
"fields": (
56-
"track",
57-
"direction",
58-
"specialty",
59-
"actuality",
60-
"goal",
61-
"problem",
62-
)
63-
}),
64-
("Медиа и обложка", {
65-
"fields": (
66-
"presentation_address",
67-
"image_address",
68-
"cover",
69-
"cover_image_address",
70-
)
71-
}),
72-
("Служебные поля", {
73-
"fields": (
74-
"hidden_score",
75-
"datetime_created",
76-
"datetime_updated",
77-
)
78-
}),
42+
(
43+
"Основная информация",
44+
{
45+
"fields": (
46+
"name",
47+
"description",
48+
"leader",
49+
"industry",
50+
"region",
51+
"step",
52+
"draft",
53+
"is_company",
54+
)
55+
},
56+
),
57+
(
58+
"Для проектов ПД МосПолитеха",
59+
{
60+
"fields": (
61+
"track",
62+
"direction",
63+
"specialty",
64+
"actuality",
65+
"goal",
66+
"problem",
67+
)
68+
},
69+
),
70+
(
71+
"Медиа и обложка",
72+
{
73+
"fields": (
74+
"presentation_address",
75+
"image_address",
76+
"cover",
77+
"cover_image_address",
78+
)
79+
},
80+
),
81+
(
82+
"Служебные поля",
83+
{
84+
"fields": (
85+
"hidden_score",
86+
"datetime_created",
87+
"datetime_updated",
88+
)
89+
},
90+
),
7991
)
8092
readonly_fields = ("datetime_created", "datetime_updated")
8193

projects/models.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@
66
from django.db import models
77
from django.db.models import UniqueConstraint
88

9-
109
from core.models import Like, View
1110
from files.models import UserFile
1211
from industries.models import Industry
13-
1412
from projects.constants import VERBOSE_STEPS
1513
from projects.managers import AchievementManager, CollaboratorManager, ProjectManager
1614
from users.models import CustomUser
@@ -55,7 +53,11 @@ def get_random_file(cls):
5553
@classmethod
5654
def get_random_file_link(cls):
5755
# FIXME: this is not efficient, but for ~10 default covers it should be ok
58-
return cls.objects.order_by("?").first().image.link if cls.objects.order_by("?").first().image else None
56+
return (
57+
cls.objects.order_by("?").first().image.link
58+
if cls.objects.order_by("?").first().image
59+
else None
60+
)
5961

6062
class Meta:
6163
verbose_name = "Обложка проекта"
@@ -87,7 +89,9 @@ class Project(models.Model):
8789
name = models.CharField(max_length=256, null=True, blank=True)
8890
description = models.TextField(null=True, blank=True)
8991
region = models.CharField(max_length=256, null=True, blank=True)
90-
step = models.PositiveSmallIntegerField(choices=VERBOSE_STEPS, null=True, blank=True)
92+
step = models.PositiveSmallIntegerField(
93+
choices=VERBOSE_STEPS, null=True, blank=True
94+
)
9195
hidden_score = models.PositiveSmallIntegerField(default=100)
9296

9397
track = models.CharField(

projects/serializers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from django.contrib.auth import get_user_model
2-
from rest_framework import serializers
32
from django.core.cache import cache
3+
from rest_framework import serializers
4+
45
from core.serializers import SkillToObjectSerializer
5-
from core.services import get_views_count, get_likes_count, is_fan
6+
from core.services import get_likes_count, get_views_count, is_fan
67
from core.utils import get_user_online_cache_key
78
from files.serializers import UserFileSerializer
89
from industries.models import Industry
9-
from projects.models import Project, Achievement, Collaborator, ProjectNews
10+
from projects.models import Achievement, Collaborator, Project, ProjectNews
1011
from projects.validators import validate_project
1112
from vacancy.serializers import ProjectVacancyListSerializer
1213

@@ -64,7 +65,6 @@ class Meta:
6465

6566

6667
class ProjectDetailSerializer(serializers.ModelSerializer):
67-
6868
achievements = AchievementListSerializer(many=True, read_only=True)
6969
cover = UserFileSerializer(required=False)
7070
collaborators = CollaboratorSerializer(

0 commit comments

Comments
 (0)