Skip to content

Commit 78a355b

Browse files
committed
Fix ruff format
1 parent fa5e74a commit 78a355b

15 files changed

Lines changed: 65 additions & 53 deletions

File tree

task_manager/labels/admin.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
from django.contrib import admin
2-
3-
# Register your models here.

task_manager/labels/tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
from django.test import TestCase
2-
3-
# Create your tests here.

task_manager/labels/views.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ def get_label(self):
5858
def get(self, request, *args, **kwargs):
5959
label = self.get_label()
6060
form = LabelForm(instance=label)
61-
return render(request, self.template, self.get_context_data(form, label))
61+
return render(
62+
request, self.template, self.get_context_data(form, label)
63+
)
6264

6365
def post(self, request, *args, **kwargs):
6466
label = self.get_label()
@@ -69,7 +71,9 @@ def post(self, request, *args, **kwargs):
6971
_("Label successfully changed"))
7072
form.save()
7173
return redirect('/labels/')
72-
return render(request, self.template, self.get_context_data(form, label))
74+
return render(
75+
request, self.template, self.get_context_data(form, label)
76+
)
7377

7478

7579
class DeleteView(CustomLoginRequiredMixin):
@@ -88,13 +92,18 @@ def get_context_data(self, label):
8892

8993
def get(self, request, *args, **kwargs):
9094
label = self.get_label()
91-
return render(request, 'labels/delete.html', self.get_context_data(label))
95+
return render(
96+
request, 'labels/delete.html', self.get_context_data(label)
97+
)
9298

9399
def post(self, request, *args, **kwargs):
94100
label = self.get_label()
95101
if label:
96102
if Task.objects.filter(labels=label).exists():
97-
messages.error(request, _("Cannot delete label because it is in use."))
103+
messages.error(
104+
request,
105+
_("Cannot delete label because it is in use.")
106+
)
98107
return redirect('/labels/')
99108
else:
100109
label.delete()

task_manager/mixins.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ def test_func(self):
2424
return self.get_user() == self.request.user
2525

2626
def handle_no_permission(self):
27-
messages.add_message(self.request,
28-
messages.ERROR,
29-
_("You do not have permission to modify this user."))
27+
messages.add_message(
28+
self.request,
29+
messages.ERROR,
30+
_("You do not have permission to modify this user.")
31+
)
3032
return redirect('/users/')

task_manager/statuses/admin.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
from django.contrib import admin
2-
3-
# Register your models here.

task_manager/statuses/tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
from django.test import TestCase
2-
3-
# Create your tests here.

task_manager/statuses/views.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ def get_status(self):
5858
def get(self, request, *args, **kwargs):
5959
status = self.get_status()
6060
form = StatusForm(instance=status)
61-
return render(request, self.template, self.get_context_data(form, status))
61+
return render(request, self.template,
62+
self.get_context_data(form, status))
6263

6364
def post(self, request, *args, **kwargs):
6465
status = self.get_status()
@@ -69,7 +70,8 @@ def post(self, request, *args, **kwargs):
6970
_("Status successfully changed"))
7071
form.save()
7172
return redirect('/statuses/')
72-
return render(request, self.template, self.get_context_data(form, status))
73+
return render(request, self.template,
74+
self.get_context_data(form, status))
7375

7476

7577
class DeleteView(CustomLoginRequiredMixin):
@@ -88,13 +90,16 @@ def get_context_data(self, status):
8890

8991
def get(self, request, *args, **kwargs):
9092
status = self.get_status()
91-
return render(request, 'statuses/delete.html', self.get_context_data(status))
93+
return render(request, 'statuses/delete.html',
94+
self.get_context_data(status))
9295

9396
def post(self, request, *args, **kwargs):
9497
status = self.get_status()
9598
if status:
9699
if Task.objects.filter(status=status).exists():
97-
messages.error(request, _("Cannot delete status because it is in use."))
100+
messages.error(
101+
request, _("Cannot delete status because it is in use.")
102+
)
98103
return redirect('/statuses/')
99104
else:
100105
status.delete()

task_manager/tasks/admin.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
from django.contrib import admin
2-
3-
# Register your models here.

task_manager/tasks/forms.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ def __init__(self, *args, **kwargs):
2121
# Создаем список выбора с пустым элементом и полными именами
2222
users = User.objects.order_by('id')
2323
choices = [('', '---------')] # Пустой выбор
24-
choices += [(user.id, f"{user.first_name} {user.last_name}") for user in users]
24+
choices += [
25+
(user.id, f"{user.first_name} {user.last_name}") for user in users
26+
]
2527

2628
# Настраиваем виджет
2729
self.fields['executor'].widget = forms.Select(choices=choices)

task_manager/tasks/models.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88

99

1010
class Task(models.Model):
11-
name = models.CharField(max_length=150, unique=True, verbose_name=_("Name"))
12-
description = models.TextField(null=True, blank=True, verbose_name=_("Description"))
13-
status = models.ForeignKey(Status, on_delete=models.PROTECT, verbose_name=_("Status"))
14-
author = models.ForeignKey(User, related_name='authored_tasks', on_delete=models.PROTECT,
11+
name = models.CharField(max_length=150, unique=True,
12+
verbose_name=_("Name"))
13+
description = models.TextField(null=True, blank=True,
14+
verbose_name=_("Description"))
15+
status = models.ForeignKey(Status, on_delete=models.PROTECT,
16+
verbose_name=_("Status"))
17+
author = models.ForeignKey(User, related_name='authored_tasks',
18+
on_delete=models.PROTECT,
1519
verbose_name=_("Author"))
1620
executor = models.ForeignKey(
1721
User,

0 commit comments

Comments
 (0)