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",
"slug": "back"
"slug": "back",
"order": 40
}
},
{
@ -1076,7 +1077,8 @@
]
],
"name": "Front",
"slug": "front"
"slug": "front",
"order": 30
}
},
{
@ -1616,7 +1618,8 @@
]
],
"name": "UX",
"slug": "ux"
"slug": "ux",
"order": 10
}
},
{
@ -2156,7 +2159,8 @@
]
],
"name": "Design",
"slug": "design"
"slug": "design",
"order": 20
}
}
]

View File

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