UPD: small steps to become python3 compatible.

This commit is contained in:
2019-03-28 18:08:12 +01:00
parent e05bf3e56f
commit 943285f1ed
12 changed files with 164 additions and 147 deletions

View File

@@ -1,10 +1,12 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import logging
import uuid
from django.contrib.auth import get_user_model
from django.core.urlresolvers import reverse
from django.db import models
from django.utils import timezone
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext, ugettext_lazy as _
from .event import Event
@@ -12,6 +14,7 @@ from .event import Event
logger = logging.getLogger(__name__)
@python_2_unicode_compatible
class OneClickAction(models.Model):
COMMANDS = (
('EVENT_LIST', 'login and go to event list (user id)'),
@@ -32,14 +35,14 @@ class OneClickAction(models.Model):
parameters = models.TextField(blank=True)
class Meta:
verbose_name = _(u'One-Click-Action')
verbose_name = _('One-Click-Action')
def __unicode__(self):
s = u'{command}({parameters}) - {description}'.format(description=self.get_command_display(),
command=self.command,
parameters=self.parameters)
def __str__(self):
s = '{command}({parameters}) - {description}'.format(description=self.get_command_display(),
command=self.command,
parameters=self.parameters)
if self.done and not self.allow_repeat:
s += u' - done'
s += ' - done'
return s
def get_absolute_url(self):
@@ -50,7 +53,7 @@ class OneClickAction(models.Model):
if self.done and not self.allow_repeat:
result['context'] = {
'status': 'warning',
'message': ugettext(u'Diese Aktion hast du bereits ausgeführt.'),
'message': ugettext('Diese Aktion hast du bereits ausgeführt.'),
}
return result
@@ -77,17 +80,17 @@ class OneClickAction(models.Model):
flag = event.flags.filter(status__code=status_code).first()
if flag:
message = (ugettext(u'Der Status wurde bereits'
u' am %(date)s'
u' von %(user)s'
u' auf \'%(status)s\' gesetzt.') % {
message = (ugettext('Der Status wurde bereits'
' am %(date)s'
' von %(user)s'
' auf \'%(status)s\' gesetzt.') % {
'status': flag.status.label,
'date': flag.timestamp.strftime('%d.%m.%Y %H:%M:%S'),
'user': flag.user.get_full_name(),
})
else:
flag = event.workflow.update_status(status_code, user)
message = (ugettext(u'Der Status wurde auf \'%(status)s\' gesetzt.') %
message = (ugettext('Der Status wurde auf \'%(status)s\' gesetzt.') %
{'status': flag.status.label})
result['context'] = {
@@ -108,7 +111,7 @@ class OneClickAction(models.Model):
else:
result['context'] = {
'status': 'danger',
'message': ugettext(u'Invalid Command. Code on fire!'),
'message': ugettext('Invalid Command. Code on fire!'),
}
return result