Skip to content

Commit 53d81ce

Browse files
olyapka84olyapka84
committed
linter done
1 parent 2c1c1c8 commit 53d81ce

File tree

12 files changed

+70
-46
lines changed

12 files changed

+70
-46
lines changed

‎ruff.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
line-length = 88
1+
line-length = 80
22
exclude = [
33
"migrations",
44
"task_manager/settings.py",
55
".venv",
66
]
7+
8+
[lint]
9+
select = ["E", "F"]

‎task_manager/labels/views.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ class LabelDeleteView(LoginRequiredMixin, DeleteView):
4848
def post(self, request, *args, **kwargs):
4949
label = self.get_object()
5050
if label.labeled_tasks.exists():
51-
messages.error(request, "Невозможно удалить метку, потому что она используется")
51+
messages.error(request,
52+
"Невозможно удалить метку, "
53+
"потому что она используется")
5254
return redirect("labels:index")
5355

5456
response = super().post(request, *args, **kwargs)

‎task_manager/statuses/urls.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
urlpatterns = [
77
path("", StatusListView.as_view(), name="statuses_index"),
88
path("create/", StatusCreateView.as_view(), name="statuses_create"),
9-
path("<int:pk>/update/", StatusUpdateView.as_view(), name="statuses_update"),
10-
path("<int:pk>/delete/", StatusDeleteView.as_view(), name="statuses_delete"),
9+
path("<int:pk>/update/", StatusUpdateView.as_view(),
10+
name="statuses_update"),
11+
path("<int:pk>/delete/", StatusDeleteView.as_view(),
12+
name="statuses_delete"),
1113
]

‎task_manager/statuses/views.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from django.shortcuts import redirect
44
from django.urls import reverse_lazy
55
from django.views.generic import ListView, CreateView, UpdateView, DeleteView
6-
from django.db.models import ProtectedError
76

87
from .models import Status
98
from .forms import StatusForm
@@ -49,7 +48,9 @@ class StatusDeleteView(LoginRequiredMixin, DeleteView):
4948
def post(self, request, *args, **kwargs):
5049
status = self.get_object()
5150
if status.tasks.exists():
52-
messages.error(request, "Невозможно удалить статус, потому что он используется")
51+
messages.error(request,
52+
"Невозможно удалить статус, "
53+
"потому что он используется")
5354
return redirect("statuses_index")
5455
response = super().post(request, *args, **kwargs)
5556
messages.success(request, "Статус успешно удален")

‎task_manager/tasks/filters.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ class Meta:
3737
fields = ["status", "executor", "label", "self_tasks"]
3838

3939
def __init__(self, data=None, queryset=None, request=None, **kwargs):
40-
super().__init__(data=data, queryset=queryset, request=request, **kwargs)
40+
super().__init__(data=data, queryset=queryset,
41+
request=request, **kwargs)
4142
self.request = request
4243
self.filters["executor"].field.label_from_instance = (
43-
lambda u: (u.get_full_name().strip() if (u.get_full_name() or "").strip() else u.username)
44+
lambda u: (u.get_full_name().strip()
45+
if (u.get_full_name() or "").strip() else u.username)
4446
)
4547

4648
def filter_self_tasks(self, queryset, name, value):

‎task_manager/tasks/forms.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ class Meta:
1111
fields = ["name", "description", "status", "executor", "labels"]
1212
widgets = {
1313
"name": forms.TextInput(attrs={"class": "form-control"}),
14-
"description": forms.Textarea(attrs={"class": "form-control", "rows": 4}),
14+
"description": forms.Textarea(attrs={"class": "form-control",
15+
"rows": 4}),
1516
"status": forms.Select(attrs={"class": "form-select"}),
1617
"executor": forms.Select(attrs={"class": "form-select"}),
17-
"labels": forms.SelectMultiple(attrs={"class": "form-select", "size": 5}),
18+
"labels": forms.SelectMultiple(attrs={"class": "form-select",
19+
"size": 5}),
1820
}
1921
labels = {
2022
"name": "Имя",

‎task_manager/tasks/models.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@
88
class Task(models.Model):
99
name = models.CharField(max_length=150)
1010
description = models.TextField(blank=True)
11-
status = models.ForeignKey(Status, on_delete=models.PROTECT, related_name="tasks")
12-
author = models.ForeignKey(User, on_delete=models.PROTECT, related_name="created_tasks")
13-
executor = models.ForeignKey(User, on_delete=models.PROTECT, null=True, blank=True, related_name="executed_tasks")
11+
status = models.ForeignKey(Status, on_delete=models.PROTECT,
12+
related_name="tasks")
13+
author = models.ForeignKey(User, on_delete=models.PROTECT,
14+
related_name="created_tasks")
15+
executor = models.ForeignKey(User, on_delete=models.PROTECT, null=True,
16+
blank=True, related_name="executed_tasks")
1417
created_at = models.DateTimeField(auto_now_add=True)
15-
labels = models.ManyToManyField(Label, related_name="labeled_tasks", blank=True)
18+
labels = models.ManyToManyField(Label, related_name="labeled_tasks",
19+
blank=True)
1620

1721
class Meta:
1822
ordering = ["id"]

‎task_manager/users/forms.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,21 @@ class CustomUserCreationForm(UserCreationForm):
1919

2020
class Meta(UserCreationForm.Meta):
2121
model = User
22-
fields = ('username', 'first_name', 'last_name', 'password1', 'password2')
22+
fields = ('username', 'first_name',
23+
'last_name', 'password1', 'password2')
2324
labels = {
2425
'username': 'Имя пользователя',
2526
'password1': 'Пароль',
2627
'password2': 'Подтверждение пароля',
2728
}
2829
help_texts = {
2930
'username': (
30-
'Не более 150 символов. Допустимы буквы, цифры и символы: @/./+/-/_.'
31+
'Не более 150 символов.'
32+
'Допустимы буквы, цифры и символы: @/./+/-/_.'
3133
),
3234
'password1': (
33-
'Пароль должен содержать минимум 8 символов и не быть слишком простым.'
35+
'Пароль должен содержать минимум 8 символов'
36+
'и не быть слишком простым.'
3437
),
3538
'password2': (
3639
'Для подтверждения введите, пожалуйста, пароль ещё раз.'

‎task_manager/users/urls.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
from django.urls import path, reverse_lazy
2-
from django.contrib.auth import views as auth_views
1+
from django.urls import path
32
from .views import (
43
UserListView,
54
UserUpdateView,

‎task_manager/users/views.py‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@ class UserListView(ListView):
2222
class OnlySelfMixin(UserPassesTestMixin):
2323
def test_func(self):
2424
obj = self.get_object()
25-
return self.request.user.is_authenticated and obj.pk == self.request.user.pk
25+
return (self.request.user.is_authenticated and
26+
obj.pk == self.request.user.pk)
2627

2728
def handle_no_permission(self):
2829
if not self.request.user.is_authenticated:
29-
messages.error(self.request, "Вы не авторизованы! Пожалуйста, выполните вход.")
30+
messages.error(self.request,
31+
"Вы не авторизованы! Пожалуйста, выполните вход.")
3032
return super().handle_no_permission()
31-
messages.error(self.request, "У вас нет прав для изменения другого пользователя.")
33+
messages.error(self.request,
34+
"У вас нет прав для изменения другого пользователя.")
3235
return redirect("users:list")
3336

3437

@@ -73,7 +76,8 @@ def form_valid(self, form):
7376
p2 = form.cleaned_data.get("password2")
7477
if p1 or p2:
7578
if not p1 or not p2:
76-
form.add_error("password2", "Пожалуйста, введите пароль дважды.")
79+
form.add_error("password2",
80+
"Пожалуйста, введите пароль дважды.")
7781
return self.form_invalid(form)
7882
if p1 != p2:
7983
form.add_error("password2", "Введённые пароли не совпадают.")
@@ -95,7 +99,9 @@ def post(self, request, *args, **kwargs):
9599
user = self.get_object()
96100
if (hasattr(user, "created_tasks") and user.created_tasks.exists()) or \
97101
(hasattr(user, "executed_tasks") and user.executed_tasks.exists()):
98-
messages.error(request, "Невозможно удалить пользователя, потому что он используется")
102+
messages.error(request,
103+
"Невозможно удалить пользователя, "
104+
"потому что он используется")
99105
return redirect("users:list")
100106
messages.success(request, "Пользователь успешно удален")
101107
return super().post(request, *args, **kwargs)

0 commit comments

Comments
 (0)