X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/9bbfcaec3e58c99635b5abe7484e44b41e60d5fc..dae06193b54961d551abd7a35e079431a6759006:/apps/toolbar/models.py?ds=sidebyside

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index ad4752af..a3db70f1 100644
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -8,7 +8,7 @@ class ButtonGroup(models.Model):
     position = models.IntegerField(default=0)
     
     class Meta:
-        ordering = ['name']
+        ordering = ('position', 'name',)
         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
@@ -19,14 +19,15 @@ class Button(models.Model):
     label = models.CharField(max_length=32)
     slug = models.SlugField()
     tag = models.CharField(max_length=128)
-    key = models.IntegerField(blank=True, null=True)
+    key = models.CharField(blank=True, max_length=1)
     position = models.IntegerField(default=0)
     
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:
-        ordering = ['label']
+        ordering = ('position', 'label',)
         verbose_name, verbose_name_plural = _('button'), _('buttons')
     
     def __unicode__(self):
         return self.label
+