Added a field to order the roles

remotes/origin/enhancement/email-actions
David Barragán Merino 2013-10-17 00:44:32 +02:00
parent b8ac8ebd2c
commit 9c9f17e4e1
2 changed files with 17 additions and 12 deletions

View File

@ -536,7 +536,8 @@
] ]
], ],
"name": "Back", "name": "Back",
"slug": "back" "slug": "back",
"order": 40
} }
}, },
{ {
@ -1076,7 +1077,8 @@
] ]
], ],
"name": "Front", "name": "Front",
"slug": "front" "slug": "front",
"order": 30
} }
}, },
{ {
@ -1616,7 +1618,8 @@
] ]
], ],
"name": "UX", "name": "UX",
"slug": "ux" "slug": "ux",
"order": 10
} }
}, },
{ {
@ -2156,7 +2159,8 @@
] ]
], ],
"name": "Design", "name": "Design",
"slug": "design" "slug": "design",
"order": 20
} }
} }
] ]

View File

@ -30,17 +30,18 @@ class User(WatcherMixin, AbstractUser):
class Role(models.Model): class Role(models.Model):
name = models.CharField(max_length=200, null=False, blank=False, name = models.CharField(max_length=200, null=False, blank=False,
verbose_name=_('name')) verbose_name=_('name'))
slug = models.SlugField(max_length=250, unique=True, null=False, blank=True, slug = models.SlugField(max_length=250, unique=True, null=False, blank=True,
verbose_name=_('slug')) verbose_name=_('slug'))
permissions = models.ManyToManyField('auth.Permission', permissions = models.ManyToManyField('auth.Permission', related_name='roles',
related_name='roles', verbose_name=_('permissions'))
verbose_name=_('permissions')) order = models.IntegerField(default=10, null=False, blank=False,
verbose_name=_("order"))
class Meta: class Meta:
verbose_name = u'role' verbose_name = 'role'
verbose_name_plural = u'roles' verbose_name_plural = 'roles'
ordering = ['slug'] ordering = ['order', 'slug']
def __str__(self): def __str__(self):
return self.name return self.name