Skip to content

Commit d7800f9

Browse files
committed
update task models
1 parent 72ad365 commit d7800f9

File tree

6 files changed

+96
-39
lines changed

6 files changed

+96
-39
lines changed

db.sqlite3

0 Bytes
Binary file not shown.

locale/ru/LC_MESSAGES/django.mo

-123 Bytes
Binary file not shown.

locale/ru/LC_MESSAGES/django.po

Lines changed: 89 additions & 12 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-06-21 14:26+0000\n"
11+
"POT-Creation-Date: 2025-06-21 19:39+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 <[email protected]>\n"
@@ -19,14 +19,16 @@ msgstr ""
1919
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
2020
"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
2121
"(n%100>=11 && n%100<=14)? 2 : 3);\n"
22+
2223
#: task_manager/labels/forms.py:7 task_manager/statuses/forms.py:7
2324
#: task_manager/templates/labels/label_list.html:17
2425
#: task_manager/templates/statuses/status_list.html:17
2526
#: task_manager/templates/tasks/task_list.html:33
2627
msgid "Name"
2728
msgstr "Имя"
2829

29-
#: task_manager/labels/models.py:7 task_manager/users/models.py:9
30+
#: task_manager/labels/models.py:7 task_manager/templates/tasks/detail.html:31
31+
#: task_manager/users/models.py:9
3032
msgid "Creation date"
3133
msgstr "Дата создания"
3234

@@ -74,10 +76,6 @@ msgstr "Статус успешно удален"
7476
msgid "Task description"
7577
msgstr "Описание"
7678

77-
#: task_manager/tasks/mixins.py:10
78-
msgid "Task is possible to delete for its creator only!"
79-
msgstr ""
80-
8179
#: task_manager/tasks/views.py:30
8280
msgid "Task created successfully"
8381
msgstr "Задача успешно создана"
@@ -110,6 +108,7 @@ msgstr "Статусы"
110108
#: task_manager/templates/base.html:48
111109
#: task_manager/templates/labels/label_list.html:10
112110
#: task_manager/templates/task_manager/base.html:46
111+
#: task_manager/templates/tasks/detail.html:35
113112
msgid "Labels"
114113
msgstr "Метки"
115114

@@ -142,6 +141,7 @@ msgstr "Выход"
142141
#: task_manager/templates/labels/create.html:6
143142
#: task_manager/templates/labels/update.html:6
144143
#: task_manager/templates/statuses/create.html:6
144+
#: task_manager/templates/statuses/update.html:6
145145
#: task_manager/templates/users/register.html:6
146146
#: task_manager/templates/users/register.html:13
147147
msgid "Registration"
@@ -153,18 +153,28 @@ msgstr "Создание метки"
153153

154154
#: task_manager/templates/labels/create.html:19
155155
#: task_manager/templates/statuses/create.html:19
156+
#: task_manager/templates/tasks/create.html:19
156157
msgid "Create"
157158
msgstr "Создать"
158159

159160
#: task_manager/templates/labels/delete.html:10
160-
msgid "Status deletion"
161+
#: task_manager/templates/tasks/delete.html:10
162+
#, fuzzy
163+
#| msgid "Status deletion"
164+
msgid "Task deletion"
161165
msgstr "Удалить статус"
162166

163167
#: task_manager/templates/labels/delete.html:14
164-
msgid "Are you sure want to delete label?"
168+
#: task_manager/templates/tasks/delete.html:14
169+
#, fuzzy
170+
#| msgid "Are you sure want to delete label?"
171+
msgid "Are you sure want to delete task?"
165172
msgstr "Вы действительно хотите удалить метку?"
166173

167-
#: task_manager/templates/labels/delete.html:18
174+
#: task_manager/templates/labels/delete.html:17
175+
#: task_manager/templates/statuses/delete.html:17
176+
#: task_manager/templates/tasks/delete.html:17
177+
#: task_manager/templates/users/delete.html:17
168178
msgid "Yes, exactly"
169179
msgstr "Да, удалить"
170180

@@ -182,13 +192,18 @@ msgstr "Дата создания"
182192
#: task_manager/templates/labels/label_list.html:29
183193
#: task_manager/templates/labels/update.html:19
184194
#: task_manager/templates/statuses/status_list.html:29
195+
#: task_manager/templates/statuses/update.html:19
196+
#: task_manager/templates/tasks/detail.html:49
185197
#: task_manager/templates/tasks/task_list.html:54
198+
#: task_manager/templates/tasks/update.html:18
199+
#: task_manager/templates/users/update.html:12
186200
#: task_manager/templates/users/user_list.html:30
187201
msgid "Update"
188202
msgstr "Изменить"
189203

190204
#: task_manager/templates/labels/label_list.html:31
191205
#: task_manager/templates/statuses/status_list.html:31
206+
#: task_manager/templates/tasks/detail.html:52
192207
#: task_manager/templates/tasks/task_list.html:56
193208
#: task_manager/templates/users/user_list.html:32
194209
msgid "Delete"
@@ -206,6 +221,16 @@ msgstr "Метка успешно изменена"
206221
msgid "Status creation"
207222
msgstr "Создать статус"
208223

224+
#: task_manager/templates/statuses/delete.html:10
225+
msgid "Status deletion"
226+
msgstr "Удалить статус"
227+
228+
#: task_manager/templates/statuses/delete.html:14
229+
#, fuzzy
230+
#| msgid "Are you sure want to delete label?"
231+
msgid "Are you sure want to delete status?"
232+
msgstr "Вы действительно хотите удалить метку?"
233+
209234
#: task_manager/templates/statuses/status_list.html:11
210235
#: task_manager/templates/statuses/status_list.html:40
211236
msgid "Create status"
@@ -215,21 +240,67 @@ msgstr "Создать статус"
215240
msgid "There are no statuses"
216241
msgstr "Статусы отсутствуют"
217242

243+
#: task_manager/templates/statuses/update.html:13
244+
#, fuzzy
245+
#| msgid "Statuses"
246+
msgid "Status update"
247+
msgstr "Статусы"
248+
249+
#: task_manager/templates/tasks/create.html:6
218250
#: task_manager/templates/tasks/task_list.html:11
219251
msgid "Create task"
220252
msgstr "Создать задачу"
221253

254+
#: task_manager/templates/tasks/create.html:13
255+
#, fuzzy
256+
#| msgid "Status creation"
257+
msgid "Task creation"
258+
msgstr "Создать статус"
259+
260+
#: task_manager/templates/tasks/detail.html:9
261+
#, fuzzy
262+
#| msgid "Task description"
263+
msgid "Task details"
264+
msgstr "Описание"
265+
266+
#: task_manager/templates/tasks/detail.html:19
222267
#: task_manager/templates/tasks/task_list.html:34
223268
msgid "Author"
224269
msgstr "Автор"
225270

271+
#: task_manager/templates/tasks/detail.html:23
272+
#: task_manager/templates/tasks/task_list.html:36
273+
msgid "Executor"
274+
msgstr "Исполнитель"
275+
276+
#: task_manager/templates/tasks/detail.html:27
226277
#: task_manager/templates/tasks/task_list.html:35
227278
msgid "Status"
228279
msgstr "Статус"
229280

230-
#: task_manager/templates/tasks/task_list.html:36
231-
msgid "Executor"
232-
msgstr "Исполнитель"
281+
#: task_manager/templates/tasks/update.html:6
282+
#, fuzzy
283+
#| msgid "Create task"
284+
msgid "Update task"
285+
msgstr "Создать задачу"
286+
287+
#: task_manager/templates/tasks/update.html:12
288+
#, fuzzy
289+
#| msgid "Label update"
290+
msgid "Task update"
291+
msgstr "Метка успешно изменена"
292+
293+
#: task_manager/templates/users/delete.html:10
294+
#, fuzzy
295+
#| msgid "Status deletion"
296+
msgid "User deletion"
297+
msgstr "Удалить статус"
298+
299+
#: task_manager/templates/users/delete.html:14
300+
#, fuzzy
301+
#| msgid "Are you sure want to delete label?"
302+
msgid "Are you sure want to delete user?"
303+
msgstr "Вы действительно хотите удалить метку?"
233304

234305
#: task_manager/templates/users/login.html:12
235306
msgid "Login"
@@ -243,6 +314,12 @@ msgstr "Войти"
243314
msgid "Register"
244315
msgstr "Зарегистрировать"
245316

317+
#: task_manager/templates/users/update.html:7
318+
#, fuzzy
319+
#| msgid "Update"
320+
msgid "Update user"
321+
msgstr "Изменить"
322+
246323
#: task_manager/templates/users/user_list.html:10
247324
msgid "Registered users"
248325
msgstr "Зарегистрированные пользователи"

task_manager/tasks/mixins.py

Lines changed: 0 additions & 20 deletions
This file was deleted.

task_manager/tasks/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class Task(models.Model):
2626
blank=True,
2727
null=True,
2828
verbose_name="Исполнитель",
29-
related_name="executor",
29+
related_name="executors",
3030
)
3131
author = models.ForeignKey(
3232
MyUser,

task_manager/users/models.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
from django.db import models
33
from django.contrib.auth.models import AbstractUser
44
from django.utils.translation import gettext_lazy as _
5-
from django.utils import timezone
5+
66

77
class MyUser(AbstractUser):
8-
created_at = models.DateTimeField(
9-
_("Creation date"),
10-
default=timezone.now,
11-
editable=False
12-
)
8+
created_at = models.DateTimeField(_("Creation date"), auto_now_add=True)
9+
10+
def __str__(self):
11+
"""String representation of user model."""
12+
return self.get_full_name()

0 commit comments

Comments
 (0)