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

diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py
index 8d123fd1..1b986c3e 100644
--- a/apps/toolbar/models.py
+++ b/apps/toolbar/models.py
@@ -14,6 +14,33 @@ class ButtonGroup(models.Model):
     def __unicode__(self):
         return self.name
 
+    def to_dict(self, with_buttons=False):
+        d = {'name': self.name, 'position': self.position}
+
+        if with_buttons:
+            d['buttons'] = [ b.to_dict() for b in self.button_set.all() ]
+
+        return d
+
+#class ButtonGroupManager(models.Manager):
+#
+#    def with_buttons(self):
+#        from django.db import connection
+#        cursor = connection.cursor()
+#        cursor.execute("""
+#            SELECT g.name, g.slug, CONCAT(b.slug),
+#            FROM toolbar_buttongroup as g LEFT JOIN toolbar_button as b
+#
+#            WHERE p.id = r.poll_id
+#            GROUP BY 1, 2, 3
+#            ORDER BY 3 DESC""")
+#        result_list = []
+#        for row in cursor.fetchall():
+#            p = self.model(id=row[0], question=row[1], poll_date=row[2])
+#            p.num_responses = row[3]
+#            result_list.append(p)
+#        return result_list
+
 class Button(models.Model):
     label = models.CharField(max_length=32)
     slug = models.SlugField(unique=True) #unused
@@ -33,7 +60,7 @@ class Button(models.Model):
     group = models.ManyToManyField(ButtonGroup)
     
     class Meta:
-        ordering = ('label',)
+        ordering = ('slug',)
         verbose_name, verbose_name_plural = _('button'), _('buttons')
 
     def hotkey_code(self):
@@ -47,8 +74,18 @@ class Button(models.Model):
         if self.key_mod & 0x01: mods.append('Alt')
         if self.key_mod & 0x02: mods.append('Ctrl')
         if self.key_mod & 0x04: mods.append('Shift')
-        mods.append('"'+self.key+'"')
-        return '+'.join(mods)
+        mods.append(str(self.key))
+        return '[' + '+'.join(mods) + ']'
+
+    def to_dict(self):
+        return {
+            'label': self.label,
+            'tooltip': (self.tooltip or '') + self.hotkey_name(),
+            'key': self.key,
+            'key_mod': self.key_mod,
+            'params': self.params,
+            'scriptlet_id': self.scriptlet_id
+        }
     
     def __unicode__(self):
         return self.label