Skip to content

Commit ba3a59b

Browse files
committed
Fix
1 parent e466210 commit ba3a59b

6 files changed

Lines changed: 77 additions & 20 deletions

File tree

locale/en/LC_MESSAGES/django.po

Lines changed: 9 additions & 8 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-22 13:26+0000\n"
11+
"POT-Creation-Date: 2025-05-22 14:43+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"
@@ -118,11 +118,16 @@ msgstr ""
118118
msgid "Status successfully deleted"
119119
msgstr ""
120120

121-
#: task_manager/tasks/filters.py:11
121+
#: task_manager/tasks/filters.py:21 task_manager/tasks/models.py:20
122+
#: task_manager/templates/tasks/index.html:33
123+
msgid "Executor"
124+
msgstr ""
125+
126+
#: task_manager/tasks/filters.py:26
122127
msgid "Label"
123128
msgstr ""
124129

125-
#: task_manager/tasks/filters.py:15
130+
#: task_manager/tasks/filters.py:30
126131
msgid "Only own tasks"
127132
msgstr ""
128133

@@ -138,11 +143,7 @@ msgstr ""
138143
msgid "Author"
139144
msgstr ""
140145

141-
#: task_manager/tasks/models.py:17 task_manager/templates/tasks/index.html:33
142-
msgid "Executor"
143-
msgstr ""
144-
145-
#: task_manager/tasks/models.py:19 task_manager/templates/base.html:34
146+
#: task_manager/tasks/models.py:27 task_manager/templates/base.html:34
146147
#: task_manager/templates/labels/index.html:11
147148
msgid "Labels"
148149
msgstr ""

locale/ru/LC_MESSAGES/django.mo

2 Bytes
Binary file not shown.

locale/ru/LC_MESSAGES/django.po

Lines changed: 10 additions & 9 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-22 13:26+0000\n"
11+
"POT-Creation-Date: 2025-05-22 14:43+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"
@@ -120,11 +120,16 @@ msgstr "Невозможно удалить статус, потому что о
120120
msgid "Status successfully deleted"
121121
msgstr "Статус успешно удален"
122122

123-
#: task_manager/tasks/filters.py:11
123+
#: task_manager/tasks/filters.py:21 task_manager/tasks/models.py:20
124+
#: task_manager/templates/tasks/index.html:33
125+
msgid "Executor"
126+
msgstr "Исполнитель"
127+
128+
#: task_manager/tasks/filters.py:26
124129
msgid "Label"
125130
msgstr "Метка"
126131

127-
#: task_manager/tasks/filters.py:15
132+
#: task_manager/tasks/filters.py:30
128133
msgid "Only own tasks"
129134
msgstr "Только свои задачи"
130135

@@ -140,11 +145,7 @@ msgstr "Статус"
140145
msgid "Author"
141146
msgstr "Автор"
142147

143-
#: task_manager/tasks/models.py:17 task_manager/templates/tasks/index.html:33
144-
msgid "Executor"
145-
msgstr "Исполнитель"
146-
147-
#: task_manager/tasks/models.py:19 task_manager/templates/base.html:34
148+
#: task_manager/tasks/models.py:27 task_manager/templates/base.html:34
148149
#: task_manager/templates/labels/index.html:11
149150
msgid "Labels"
150151
msgstr "Метки"
@@ -164,7 +165,7 @@ msgstr "Создать задачу"
164165

165166
#: task_manager/tasks/views.py:52
166167
msgid "Task created successfully"
167-
msgstr "Статус успешно создан"
168+
msgstr "Задача успешно создана"
168169

169170
#: task_manager/tasks/views.py:64
170171
msgid "Update task"
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Generated by Django 5.1.6 on 2025-05-22 14:40
2+
3+
import django.db.models.deletion
4+
from django.conf import settings
5+
from django.db import migrations, models
6+
7+
8+
class Migration(migrations.Migration):
9+
10+
dependencies = [
11+
('labels', '0001_initial'),
12+
('tasks', '0001_initial'),
13+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14+
]
15+
16+
operations = [
17+
migrations.AlterField(
18+
model_name='task',
19+
name='executor',
20+
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='executed_tasks', to=settings.AUTH_USER_MODEL, verbose_name='Executor'),
21+
),
22+
migrations.AlterField(
23+
model_name='task',
24+
name='labels',
25+
field=models.ManyToManyField(blank=True, null=True, related_name='tasks', to='labels.label', verbose_name='Labels'),
26+
),
27+
]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Generated by Django 5.1.6 on 2025-05-22 14:41
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('labels', '0001_initial'),
10+
('tasks', '0002_alter_task_executor_alter_task_labels'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='task',
16+
name='labels',
17+
field=models.ManyToManyField(blank=True, related_name='tasks', to='labels.label', verbose_name='Labels'),
18+
),
19+
]

task_manager/tasks/models.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,19 @@ class Task(models.Model):
1313
status = models.ForeignKey(Status, on_delete=models.PROTECT, verbose_name=_("Status"))
1414
author = models.ForeignKey(User, related_name='authored_tasks', on_delete=models.PROTECT,
1515
verbose_name=_("Author"))
16-
executor = models.ForeignKey(User, related_name='executed_tasks', on_delete=models.PROTECT,
17-
verbose_name=_("Executor"))
16+
executor = models.ForeignKey(
17+
User,
18+
related_name='executed_tasks',
19+
on_delete=models.PROTECT,
20+
verbose_name=_("Executor"),
21+
blank=True,
22+
null=True
23+
)
1824
labels = models.ManyToManyField(
19-
Label, related_name="tasks", verbose_name=_("Labels")
25+
Label,
26+
related_name="tasks",
27+
verbose_name=_("Labels"),
28+
blank=True,
2029
)
2130
inserted_timestamp = models.DateTimeField(auto_now_add=True)
2231

0 commit comments

Comments
 (0)