X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4419f93a01685b9864a6e78cb905c803ec0970b0..f32fa7850a8cf57e38d2a7bb4f19c4aeb5d6224a:/apps/toolbar/models.py diff --git a/apps/toolbar/models.py b/apps/toolbar/models.py index 004fde9f..04146223 100644 --- a/apps/toolbar/models.py +++ b/apps/toolbar/models.py @@ -14,13 +14,34 @@ class ButtonGroup(models.Model): def __unicode__(self): return self.name + +#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 # behaviour - params = models.TextField() # TODO: should be a JSON field - scriptlet = models.ForeignKey('Scriptlet') + params = models.TextField(default='[]') # TODO: should be a JSON field + scriptlet = models.ForeignKey('Scriptlet', null=True, blank=True) + link = models.CharField(max_length=256, blank=True, default='') # ui related stuff key = models.CharField(blank=True, max_length=1) @@ -32,7 +53,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):