diff --git a/taskapp/locale/ru/LC_MESSAGES/django.po b/taskapp/locale/ru/LC_MESSAGES/django.po index 78af563..368161e 100644 --- a/taskapp/locale/ru/LC_MESSAGES/django.po +++ b/taskapp/locale/ru/LC_MESSAGES/django.po @@ -202,7 +202,7 @@ msgid "Subscriber" msgstr "Абонент" #: taskapp/templates/taskapp/add_edit_task.html:75 -msgid "Reality (the date by which you must complete the task)" +msgid "Reality" msgstr "Актуальность (дата, до которой нужно завершить задачу)" #: taskapp/templates/taskapp/add_edit_task.html:90 @@ -243,7 +243,7 @@ msgstr "Адрес" #: taskapp/templates/taskapp/tasklist_finish.html:14 #: taskapp/templates/taskapp/view.html:21 msgid "Task author" -msgstr "Кто назначил" +msgstr "Автор задачи" #: taskapp/templates/taskapp/tasklist.html:15 #: taskapp/templates/taskapp/tasklist_active.html:15 diff --git a/taskapp/models.py b/taskapp/models.py index 1ed1742..bf2bdbc 100644 --- a/taskapp/models.py +++ b/taskapp/models.py @@ -60,17 +60,16 @@ def _delta_add_days(): class Task(models.Model): - descr = models.CharField(max_length=128, null=True, blank=True) + descr = models.CharField(_('Description'), max_length=128, null=True, blank=True) recipients = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='them_task') - author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='+', on_delete=models.SET_NULL, null=True, blank=True) - #device = models.ForeignKey(Device, related_name='dev') - priority = models.CharField(max_length=1, choices=TASK_PRIORITIES, default=TASK_PRIORITIES[2][0]) - out_date = models.DateField(null=True, blank=True, default=_delta_add_days) - time_of_create = models.DateTimeField(auto_now_add=True) - state = models.CharField(max_length=1, choices=TASK_STATES, default=TASK_STATES[0][0]) - attachment = models.ImageField(upload_to='task_attachments/%Y.%m.%d', blank=True, null=True) - mode = models.CharField(max_length=2, choices=TASK_TYPES, default=TASK_TYPES[0][0]) - abon = models.ForeignKey(Abon, null=True, blank=True) + author = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='+', on_delete=models.SET_NULL, null=True, blank=True, verbose_name=_('Task author')) + priority = models.CharField(_('A priority'), max_length=1, choices=TASK_PRIORITIES, default=TASK_PRIORITIES[2][0]) + out_date = models.DateField(_('Reality'), null=True, blank=True, default=_delta_add_days) + time_of_create = models.DateTimeField(_('Date of create'), auto_now_add=True) + state = models.CharField(_('Condition'), max_length=1, choices=TASK_STATES, default=TASK_STATES[0][0]) + attachment = models.ImageField(_('Attached image'), upload_to='task_attachments/%Y.%m.%d', blank=True, null=True) + mode = models.CharField(_('The nature of the damage'), max_length=2, choices=TASK_TYPES, default=TASK_TYPES[0][0]) + abon = models.ForeignKey(Abon, null=True, blank=True, verbose_name=_('Subscriber')) class Meta: db_table = 'task' diff --git a/taskapp/templates/taskapp/add_edit_task.html b/taskapp/templates/taskapp/add_edit_task.html index 2453274..212fa78 100644 --- a/taskapp/templates/taskapp/add_edit_task.html +++ b/taskapp/templates/taskapp/add_edit_task.html @@ -1,5 +1,6 @@ {% extends request.is_ajax|yesno:'bajax.html,base.html' %} {% load i18n %} +{% load bootstrap3 %} {% block main %}
    @@ -12,7 +13,11 @@
    -

    {% trans 'Add new task' %}

    + {% if task_id %} +

    {% trans 'Add new task' %}

    + {% else %} +

    {% trans 'Edit task' %}

    + {% endif %}
    @@ -23,38 +28,18 @@ {% endif %} {% csrf_token %} -
    - + {% bootstrap_icon 'tag' as ic %} + {% bootstrap_field form.descr addon_before=ic %} -
    - - {{ form.descr }}{{ form.descr.errors }} -
    -
    -
    - + {% bootstrap_icon 'pawn' as ic %} + {% bootstrap_field form.mode addon_before=ic %} -
    - - {{ form.mode }}{{ form.mode.errors }} -
    -
    -
    - + {% bootstrap_icon 'sort-by-order' as ic %} + {% bootstrap_field form.priority addon_before=ic %} -
    - - {{ form.priority }}{{ form.priority.errors }} -
    -
    -
    - + {% bootstrap_icon 'retweet' as ic %} + {% bootstrap_field form.state addon_before=ic %} -
    - - {{ form.state }}{{ form.state.errors }} -
    -
    @@ -72,7 +57,7 @@
    - +
    @@ -86,20 +71,22 @@ });
    -
    - -
    - - {{ form.attachment }}{{ form.attachment.errors }} -
    -
    -
    - - + {% if task_id %} + + {% trans 'Delete' %} + + {% endif %}
    diff --git a/taskapp/views.py b/taskapp/views.py index a99aa53..6f908dc 100644 --- a/taskapp/views.py +++ b/taskapp/views.py @@ -82,7 +82,7 @@ def all_tasks(request): def task_delete(request, task_id): task = get_object_or_404(Task, id=task_id) # нельзя удалить назначенную мне задачу - if request.user not in task.recipients.all(): + if request.user.is_superuser or request.user not in task.recipients.all(): task.delete() else: messages.warning(request, _('You cannot delete task that assigned to you'))