Skip to content

Commit 2211f70

Browse files
committed
Refactoring: deletes
1 parent 5894568 commit 2211f70

6 files changed

Lines changed: 99 additions & 60 deletions

File tree

locale/en/LC_MESSAGES/django.po

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-05-21 21:07+0000\n"
11+
"POT-Creation-Date: 2025-05-22 13:26+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,47 +33,51 @@ msgstr ""
3333
msgid "Name"
3434
msgstr ""
3535

36-
#: task_manager/labels/views.py:23 task_manager/templates/labels/index.html:13
36+
#: task_manager/labels/views.py:24 task_manager/templates/labels/index.html:13
3737
msgid "Create label"
3838
msgstr ""
3939

40-
#: task_manager/labels/views.py:24 task_manager/statuses/views.py:24
40+
#: task_manager/labels/views.py:25 task_manager/statuses/views.py:25
4141
#: task_manager/tasks/views.py:36
4242
msgid "Create"
4343
msgstr ""
4444

45-
#: task_manager/labels/views.py:36
45+
#: task_manager/labels/views.py:37
4646
msgid "Label created successfully"
4747
msgstr ""
4848

49-
#: task_manager/labels/views.py:49
49+
#: task_manager/labels/views.py:50
5050
msgid "Update label"
5151
msgstr ""
5252

53-
#: task_manager/labels/views.py:50 task_manager/statuses/views.py:50
54-
#: task_manager/tasks/views.py:65 task_manager/users/views.py:53
53+
#: task_manager/labels/views.py:51 task_manager/statuses/views.py:51
54+
#: task_manager/tasks/views.py:65 task_manager/users/views.py:54
5555
msgid "Update"
5656
msgstr ""
5757

58-
#: task_manager/labels/views.py:68
58+
#: task_manager/labels/views.py:69
5959
msgid "Label successfully changed"
6060
msgstr ""
6161

62-
#: task_manager/labels/views.py:83
62+
#: task_manager/labels/views.py:84
6363
msgid "Delete label"
6464
msgstr ""
6565

66-
#: task_manager/labels/views.py:84 task_manager/statuses/views.py:84
67-
#: task_manager/tasks/views.py:91 task_manager/users/views.py:89
66+
#: task_manager/labels/views.py:85 task_manager/statuses/views.py:85
67+
#: task_manager/tasks/views.py:91 task_manager/users/views.py:90
6868
msgid "Are you sure you want to delete"
6969
msgstr ""
7070

71-
#: task_manager/labels/views.py:85 task_manager/statuses/views.py:85
72-
#: task_manager/tasks/views.py:92 task_manager/users/views.py:90
71+
#: task_manager/labels/views.py:86 task_manager/statuses/views.py:86
72+
#: task_manager/tasks/views.py:92 task_manager/users/views.py:91
7373
msgid "Yes, delete"
7474
msgstr ""
7575

76-
#: task_manager/labels/views.py:96
76+
#: task_manager/labels/views.py:97
77+
msgid "Cannot delete label because it is in use."
78+
msgstr ""
79+
80+
#: task_manager/labels/views.py:101
7781
msgid "Label successfully deleted"
7882
msgstr ""
7983

@@ -85,28 +89,32 @@ msgstr ""
8589
msgid "You do not have permission to modify this user."
8690
msgstr ""
8791

88-
#: task_manager/statuses/views.py:23
92+
#: task_manager/statuses/views.py:24
8993
#: task_manager/templates/statuses/index.html:13
9094
msgid "Create status"
9195
msgstr ""
9296

93-
#: task_manager/statuses/views.py:36
97+
#: task_manager/statuses/views.py:37
9498
msgid "Status created successfully"
9599
msgstr ""
96100

97-
#: task_manager/statuses/views.py:49
101+
#: task_manager/statuses/views.py:50
98102
msgid "Update status"
99103
msgstr ""
100104

101-
#: task_manager/statuses/views.py:68
105+
#: task_manager/statuses/views.py:69
102106
msgid "Status successfully changed"
103107
msgstr ""
104108

105-
#: task_manager/statuses/views.py:83
109+
#: task_manager/statuses/views.py:84
106110
msgid "Delete status"
107111
msgstr ""
108112

109-
#: task_manager/statuses/views.py:96
113+
#: task_manager/statuses/views.py:97
114+
msgid "Cannot delete status because it is in use."
115+
msgstr ""
116+
117+
#: task_manager/statuses/views.py:101
110118
msgid "Status successfully deleted"
111119
msgstr ""
112120

@@ -226,31 +234,35 @@ msgstr ""
226234
msgid "Last name"
227235
msgstr ""
228236

229-
#: task_manager/users/views.py:26
237+
#: task_manager/users/views.py:27
230238
msgid "Registration"
231239
msgstr ""
232240

233-
#: task_manager/users/views.py:27
241+
#: task_manager/users/views.py:28
234242
msgid "Register"
235243
msgstr ""
236244

237-
#: task_manager/users/views.py:39
245+
#: task_manager/users/views.py:40
238246
msgid "User registered successfully"
239247
msgstr ""
240248

241-
#: task_manager/users/views.py:52
249+
#: task_manager/users/views.py:53
242250
msgid "Update user"
243251
msgstr ""
244252

245-
#: task_manager/users/views.py:71
253+
#: task_manager/users/views.py:72
246254
msgid "User successfully changed"
247255
msgstr ""
248256

249-
#: task_manager/users/views.py:88
257+
#: task_manager/users/views.py:89
250258
msgid "Delete user"
251259
msgstr ""
252260

253-
#: task_manager/users/views.py:101
261+
#: task_manager/users/views.py:102
262+
msgid "Cannot delete user because they are assigned to tasks."
263+
msgstr ""
264+
265+
#: task_manager/users/views.py:106
254266
msgid "User successfully deleted"
255267
msgstr ""
256268

locale/ru/LC_MESSAGES/django.mo

516 Bytes
Binary file not shown.

locale/ru/LC_MESSAGES/django.po

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2025-05-21 21:07+0000\n"
11+
"POT-Creation-Date: 2025-05-22 13:26+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,47 +35,51 @@ msgstr "Пароль"
3535
msgid "Name"
3636
msgstr "Имя"
3737

38-
#: task_manager/labels/views.py:23 task_manager/templates/labels/index.html:13
38+
#: task_manager/labels/views.py:24 task_manager/templates/labels/index.html:13
3939
msgid "Create label"
4040
msgstr "Создать метку"
4141

42-
#: task_manager/labels/views.py:24 task_manager/statuses/views.py:24
42+
#: task_manager/labels/views.py:25 task_manager/statuses/views.py:25
4343
#: task_manager/tasks/views.py:36
4444
msgid "Create"
4545
msgstr "Создать"
4646

47-
#: task_manager/labels/views.py:36
47+
#: task_manager/labels/views.py:37
4848
msgid "Label created successfully"
4949
msgstr "Метка успешно создана"
5050

51-
#: task_manager/labels/views.py:49
51+
#: task_manager/labels/views.py:50
5252
msgid "Update label"
5353
msgstr "Изменение метки"
5454

55-
#: task_manager/labels/views.py:50 task_manager/statuses/views.py:50
56-
#: task_manager/tasks/views.py:65 task_manager/users/views.py:53
55+
#: task_manager/labels/views.py:51 task_manager/statuses/views.py:51
56+
#: task_manager/tasks/views.py:65 task_manager/users/views.py:54
5757
msgid "Update"
5858
msgstr "Изменить"
5959

60-
#: task_manager/labels/views.py:68
60+
#: task_manager/labels/views.py:69
6161
msgid "Label successfully changed"
6262
msgstr "Метка успешно изменена"
6363

64-
#: task_manager/labels/views.py:83
64+
#: task_manager/labels/views.py:84
6565
msgid "Delete label"
6666
msgstr "Удаление метки"
6767

68-
#: task_manager/labels/views.py:84 task_manager/statuses/views.py:84
69-
#: task_manager/tasks/views.py:91 task_manager/users/views.py:89
68+
#: task_manager/labels/views.py:85 task_manager/statuses/views.py:85
69+
#: task_manager/tasks/views.py:91 task_manager/users/views.py:90
7070
msgid "Are you sure you want to delete"
7171
msgstr "Вы уверены, что хотите удалить"
7272

73-
#: task_manager/labels/views.py:85 task_manager/statuses/views.py:85
74-
#: task_manager/tasks/views.py:92 task_manager/users/views.py:90
73+
#: task_manager/labels/views.py:86 task_manager/statuses/views.py:86
74+
#: task_manager/tasks/views.py:92 task_manager/users/views.py:91
7575
msgid "Yes, delete"
7676
msgstr "Да, удалить"
7777

78-
#: task_manager/labels/views.py:96
78+
#: task_manager/labels/views.py:97
79+
msgid "Cannot delete label because it is in use."
80+
msgstr "Невозможно удалить метку, потому что она используется"
81+
82+
#: task_manager/labels/views.py:101
7983
msgid "Label successfully deleted"
8084
msgstr "Метка успешно удалена"
8185

@@ -87,28 +91,32 @@ msgstr "Вы не авторизованы! Пожалуйста, выполни
8791
msgid "You do not have permission to modify this user."
8892
msgstr "У вас нет прав для изменения другого пользователя."
8993

90-
#: task_manager/statuses/views.py:23
94+
#: task_manager/statuses/views.py:24
9195
#: task_manager/templates/statuses/index.html:13
9296
msgid "Create status"
9397
msgstr "Создать статус"
9498

95-
#: task_manager/statuses/views.py:36
99+
#: task_manager/statuses/views.py:37
96100
msgid "Status created successfully"
97101
msgstr "Статус успешно создан"
98102

99-
#: task_manager/statuses/views.py:49
103+
#: task_manager/statuses/views.py:50
100104
msgid "Update status"
101105
msgstr "Изменение статуса"
102106

103-
#: task_manager/statuses/views.py:68
107+
#: task_manager/statuses/views.py:69
104108
msgid "Status successfully changed"
105109
msgstr "Статус успешно изменен"
106110

107-
#: task_manager/statuses/views.py:83
111+
#: task_manager/statuses/views.py:84
108112
msgid "Delete status"
109113
msgstr "Удаление статуса"
110114

111-
#: task_manager/statuses/views.py:96
115+
#: task_manager/statuses/views.py:97
116+
msgid "Cannot delete status because it is in use."
117+
msgstr "Невозможно удалить статус, потому что он используется"
118+
119+
#: task_manager/statuses/views.py:101
112120
msgid "Status successfully deleted"
113121
msgstr "Статус успешно удален"
114122

@@ -228,31 +236,35 @@ msgstr "Имя"
228236
msgid "Last name"
229237
msgstr "Фамилия"
230238

231-
#: task_manager/users/views.py:26
239+
#: task_manager/users/views.py:27
232240
msgid "Registration"
233241
msgstr "Регистрация"
234242

235-
#: task_manager/users/views.py:27
243+
#: task_manager/users/views.py:28
236244
msgid "Register"
237245
msgstr "Зарегистрировать"
238246

239-
#: task_manager/users/views.py:39
247+
#: task_manager/users/views.py:40
240248
msgid "User registered successfully"
241249
msgstr "Пользователь успешно зарегистрирован"
242250

243-
#: task_manager/users/views.py:52
251+
#: task_manager/users/views.py:53
244252
msgid "Update user"
245253
msgstr "Изменение пользователя"
246254

247-
#: task_manager/users/views.py:71
255+
#: task_manager/users/views.py:72
248256
msgid "User successfully changed"
249257
msgstr "Пользователь успешно изменен"
250258

251-
#: task_manager/users/views.py:88
259+
#: task_manager/users/views.py:89
252260
msgid "Delete user"
253261
msgstr "Удаление пользователя"
254262

255-
#: task_manager/users/views.py:101
263+
#: task_manager/users/views.py:102
264+
msgid "Cannot delete user because they are assigned to tasks."
265+
msgstr "Невозможно удалить пользователя, потому что он используется"
266+
267+
#: task_manager/users/views.py:106
256268
msgid "User successfully deleted"
257269
msgstr "Пользователь успешно удален"
258270

task_manager/labels/views.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from .models import Label
66
from .forms import LabelForm
77
from task_manager.mixins import CustomLoginRequiredMixin
8+
from task_manager.tasks.models import Task
89

910

1011
class IndexView(CustomLoginRequiredMixin):
@@ -92,6 +93,10 @@ def get(self, request, *args, **kwargs):
9293
def post(self, request, *args, **kwargs):
9394
label = self.get_label()
9495
if label:
95-
label.delete()
96-
messages.success(request, _("Label successfully deleted"))
96+
if Task.objects.filter(labels=label).exists():
97+
messages.error(request, _("Cannot delete label because it is in use."))
98+
return redirect('/labels/')
99+
else:
100+
label.delete()
101+
messages.success(request, _("Label successfully deleted"))
97102
return redirect('/labels/')

task_manager/statuses/views.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from .models import Status
66
from .forms import StatusForm
77
from task_manager.mixins import CustomLoginRequiredMixin
8+
from task_manager.tasks.models import Task
89

910

1011
class IndexView(CustomLoginRequiredMixin):
@@ -92,6 +93,10 @@ def get(self, request, *args, **kwargs):
9293
def post(self, request, *args, **kwargs):
9394
status = self.get_status()
9495
if status:
95-
status.delete()
96-
messages.success(request, _("Status successfully deleted"))
96+
if Task.objects.filter(status=status).exists():
97+
messages.error(request, _("Cannot delete status because it is in use."))
98+
return redirect('/statuses/')
99+
else:
100+
status.delete()
101+
messages.success(request, _("Status successfully deleted"))
97102
return redirect('/statuses/')

task_manager/users/views.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from .forms import UserForm
88
from task_manager.mixins import CustomLoginRequiredMixin, CustomCheckUserMixin
9+
from task_manager.tasks.models import Task
910

1011

1112
class IndexView(View):
@@ -97,6 +98,10 @@ def get(self, request, *args, **kwargs):
9798
def post(self, request, *args, **kwargs):
9899
user = self.get_user()
99100
if user:
100-
user.delete()
101-
messages.success(request, _("User successfully deleted"))
101+
if Task.objects.filter(author=user).exists() or Task.objects.filter(executor=user).exists():
102+
messages.error(request, _("Cannot delete user because they are assigned to tasks."))
103+
return redirect('/users/') # Перенаправляем обратно на список пользователей
104+
else:
105+
user.delete()
106+
messages.success(request, _("User successfully deleted"))
102107
return redirect('/users/')

0 commit comments

Comments
 (0)