nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-15 07:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed migration, removed Corporate groups

Browse Source
This commit is contained in:
Andrew Williams
2010-10-21 16:51:57 +01:00
parent aa2d00c820
commit 361ff00187
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
groups/app_defines.py
View File

@@ -1,13 +1,11 @@
# Group Types # Group Types
GROUP_TYPE_BUILTIN = 0 GROUP_TYPE_BUILTIN = 0
GROUP_TYPE_PERMISSION = 1 GROUP_TYPE_MANAGED = 1
GROUP_TYPE_CORPORATE = 2 GROUP_TYPE_PERMISSION = 2
GROUP_TYPE_MANAGED = 3
GROUP_TYPE_CHOICES = ( GROUP_TYPE_CHOICES = (
(GROUP_TYPE_BUILTIN, 'Built-In'), (GROUP_TYPE_BUILTIN, 'Built-In'),
(GROUP_TYPE_PERMISSION, 'Permission'), (GROUP_TYPE_PERMISSION, 'Permission'),
(GROUP_TYPE_CORPORATE, 'Corporate'),
(GROUP_TYPE_MANAGED, 'Managed'), (GROUP_TYPE_MANAGED, 'Managed'),
) )

7
groups/migrations/0002_groupinformation.py
View File

@@ -7,8 +7,11 @@ from django.db import models
class Migration(DataMigration): class Migration(DataMigration):
def forwards(self, orm): def forwards(self, orm):
for group in orm.Group.objects.all(): for group in orm['auth.Group'].objects.all():
obj = orm.GroupInformation(group=group) try:
obj = orm.GroupInformation.objects.get(group=group)
except orm['auth.Group'].DoesNotExist:
obj = orm.GroupInformation(group=group)
obj.save() obj.save()
def backwards(self, orm): def backwards(self, orm):

2
groups/models.py
View File

@@ -9,7 +9,7 @@ class GroupInformation(models.Model):
group = models.OneToOneField(Group) group = models.OneToOneField(Group)
type = models.IntegerField("Group Type", choices=GROUP_TYPE_CHOICES, default=GROUP_TYPE_BUILTIN) type = models.IntegerField("Group Type", choices=GROUP_TYPE_CHOICES, default=GROUP_TYPE_PERMISSION)
admins = models.ManyToManyField(User) admins = models.ManyToManyField(User)
public = models.BooleanField("Public", default=False) public = models.BooleanField("Public", default=False)
requestable = models.BooleanField("Requestable", default=False) requestable = models.BooleanField("Requestable", default=False)