Merge branch 'master' of git@stigma:platforma

[redakcja.git] / apps / toolbar / models.py

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index ad4752a..a3db70f 100644 (file)
--- 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:
     position = models.IntegerField(default=0)
     
     class Meta:

-        ordering = ['name']
+        ordering = ('position', 'name',)

         verbose_name, verbose_name_plural = _('button group'), _('button groups')
     
     def __unicode__(self):
         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)
     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:
     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
         verbose_name, verbose_name_plural = _('button'), _('buttons')
     
     def __unicode__(self):
         return self.label

+