fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More data in catalogue
[redakcja.git]
/
src
/
toolbar
/
models.py
diff --git
a/src/toolbar/models.py
b/src/toolbar/models.py
index
a23e346
..
a221e04
100644
(file)
--- a/
src/toolbar/models.py
+++ b/
src/toolbar/models.py
@@
-1,10
+1,8
@@
-# -*- coding: utf-8 -*-
-#
# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
from django.db import models
# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
from django.db import models
-from django.utils.translation import
u
gettext_lazy as _
+from django.utils.translation import gettext_lazy as _
class ButtonGroup(models.Model):
class ButtonGroup(models.Model):
@@
-16,7
+14,7
@@
class ButtonGroup(models.Model):
ordering = ('position', 'name',)
verbose_name, verbose_name_plural = _('button group'), _('button groups')
ordering = ('position', 'name',)
verbose_name, verbose_name_plural = _('button group'), _('button groups')
- def __
unicode
__(self):
+ def __
str
__(self):
return self.name
def to_dict(self, with_buttons=False):
return self.name
def to_dict(self, with_buttons=False):
@@
-34,7
+32,7
@@
class Button(models.Model):
# behaviour
params = models.TextField(default='[]') # TODO: should be a JSON field
# behaviour
params = models.TextField(default='[]') # TODO: should be a JSON field
- scriptlet = models.ForeignKey('Scriptlet', null=True, blank=True)
+ scriptlet = models.ForeignKey('Scriptlet',
models.SET_NULL,
null=True, blank=True)
link = models.CharField(max_length=256, blank=True, default='')
# ui related stuff
link = models.CharField(max_length=256, blank=True, default='')
# ui related stuff
@@
-63,7
+61,7
@@
class Button(models.Model):
'scriptlet_id': self.scriptlet_id,
}
'scriptlet_id': self.scriptlet_id,
}
- def __
unicode
__(self):
+ def __
str
__(self):
return self.label
return self.label
@@
-71,5
+69,5
@@
class Scriptlet(models.Model):
name = models.CharField(max_length=64, primary_key=True)
code = models.TextField()
name = models.CharField(max_length=64, primary_key=True)
code = models.TextField()
- def __
unicode
__(self):
+ def __
str
__(self):
return _(u'javascript') + u':' + self.name
return _(u'javascript') + u':' + self.name