Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project_rates/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def get(self, request, *args, **kwargs):
for project in projects_serializer.data:
filled_values = 0
for criteria in project["criterias"]:
if criteria.get("value", None):
if criteria["name"] == "Комментарий" or criteria.get("value", None):
filled_values += 1

if filled_values == len(project["criterias"]):
Expand Down
5 changes: 5 additions & 0 deletions users/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,8 @@ class UserAchievementAdmin(admin.ModelAdmin):
class UserLinkAdmin(admin.ModelAdmin):
list_display = ("id", "user", "link")
list_display_links = ("id", "user", "link")


@admin.register(Expert)
class ExpertAdmin(admin.ModelAdmin):
list_display = ("id", "user")
21 changes: 21 additions & 0 deletions users/migrations/0046_expert_programs.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 4.2.3 on 2024-02-26 15:22

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("partner_programs", "0004_auto_20231230_0002"),
("users", "0045_alter_customuser_v2_speciality"),
]

operations = [
migrations.AddField(
model_name="expert",
name="programs",
field=models.ManyToManyField(
blank=True, related_name="experts", to="partner_programs.partnerprogram"
),
),
]
4 changes: 4 additions & 0 deletions users/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@ class Expert(AbstractUserWithRole):
preferred_industries = models.CharField(max_length=4096, null=True, blank=True)
useful_to_project = models.TextField(blank=True)

programs = models.ManyToManyField(
"partner_programs.PartnerProgram", related_name="experts", blank=True
)

class Meta(TypedModelMeta):
verbose_name = "Эксперт"
verbose_name_plural = "Эксперты"
Expand Down
12 changes: 11 additions & 1 deletion users/permissions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
from rest_framework.exceptions import PermissionDenied
from rest_framework.permissions import BasePermission, SAFE_METHODS

from users.models import Expert


class IsAchievementOwnerOrReadOnly(BasePermission):
"""
Expand All @@ -18,4 +21,11 @@ class IsExpert(BasePermission):
"""

def has_permission(self, request, view):
return request.user.user_type == 3
user = request.user
program_id = view.kwargs.get("program_id")

if not user.user_type == 3:
raise PermissionDenied("User is not an expert")
if not Expert.objects.filter(programs__id=program_id, user=user).exists():
raise PermissionDenied("You don't have permission to rate this program")
return True