$(MANAGE_PY) shell
test:
- $(MANAGE_PY) test example
+ $(MANAGE_PY) test example accounts site
resetdb:
rm -f xnet/db.sqlite
https://www.djangoproject.com/download/1.5c1/tarball/
django_authgroupex
+django-xworkflows
--- /dev/null
+from django.contrib import admin
+from django.contrib.auth import admin as auth_admin
+
+from . import models
+
+
+class XGroupAdmin(admin.ModelAdmin):
+ list_display = ['short', 'name', 'kind', 'domain', 'dns']
+ list_filter = ['kind', 'domain']
+ search_fields = ['name', 'short', 'dns']
+
+admin.site.register(models.XGroup, XGroupAdmin)
+
+
+class AccountAdmin(auth_admin.UserAdmin):
+ pass
+
+admin.site.register(models.Account, AccountAdmin)
+
+
+class MembershipAdmin(admin.ModelAdmin):
+ list_display = ['xuser', 'xgroup', 'level']
+ list_filter = ['level']
+ search_fields = (
+ ['xgroup__{0}'.format(field) for field in XGroupAdmin.search_fields]
+ + ['offer__{0}'.format(field) for field in AccountAdmin.search_fields])
+
+admin.site.register(models.Membership, MembershipAdmin)
--- /dev/null
+# -*- coding: utf-8 -*-
+
+import factory
+
+from . import models
+
+
+class XGroupFactory(factory.DjangoModelFactory):
+ FACTORY_FOR = models.XGroup
+
+ name = factory.Sequence(lambda n: u"Groupe n°%s" % n)
+ short = factory.Sequence(lambda n: u"Groupe%s" % n)
+ kind = models.XGroup.KIND_GROUP
+ domain = models.XGroup.DOMAIN_REGION
+
+
+class AccountFactory(factory.DjangoModelFactory):
+ FACTORY_FOR = models.Account
+
+ username = factory.Sequence('mr_robinson{0}'.format)
+ first_name = u"John"
+ last_name = factory.Sequence(lambda n: u"D%se" % ((n % 10) * u"o"), type=int)
+ password = None
+ is_staff = True
+
+ @classmethod
+ def _prepare(cls, create, **kwargs):
+ password = kwargs.pop('password', None)
+ user = super(AccountFactory, cls)._prepare(create, **kwargs)
+ if password is not None:
+ user.set_password(password)
+ if create:
+ user.save()
+ return user
+
+
+class SuperAccountFactory(AccountFactory):
+ is_superuser = True
+
+
+class MembershipFactory(factory.DjangoModelFactory):
+ FACTORY_FOR = models.Membership
+
+ xgroup = factory.SubFactory(XGroupFactory)
+ xuser = factory.SubFactory(AccountFactory)
+ state = models.MembershipWorkflow.states.enabled
--- /dev/null
+# -*- coding: utf-8 -*-
+
+from django.contrib.auth import models as auth_models
+from django.db import models
+
+from django_xworkflows import models as xwf_models
+
+
+class MembershipWorkflow(xwf_models.Workflow):
+ states = (
+ ('pending', u"En attente"),
+ ('enabled', u"Actif"),
+ ('removed', u"Supprimé"),
+ )
+ transitions = (
+ ('accept', ['pending'], 'enabled'),
+ ('remove', ['pending', 'enabled'], 'removed'),
+ )
+ initial_state = 'pending'
+
+ log_model = '' # We don't want logs
+
+
+class XGroup(models.Model):
+ """A model for an XGroup."""
+ KIND_PROMO = 'promo'
+ KIND_GROUP = 'group'
+ KIND_BINET = 'binet'
+ KIND_INSTIT = 'instit'
+
+ KIND_CHOICES = (
+ (KIND_PROMO, u"Promo"),
+ (KIND_GROUP, u"Groupe"),
+ (KIND_BINET, u"Binet"),
+ (KIND_INSTIT, u"Institution"),
+ )
+
+ DOMAIN_HISTORY = 'history'
+ DOMAIN_INTERNATIONAL = 'international'
+ DOMAIN_EVENTS = 'events'
+ DOMAIN_LEISURE = 'leisure'
+ DOMAIN_SPORTS = 'sports'
+ DOMAIN_PRO = 'pro'
+ DOMAIN_REGION = 'region'
+
+ DOMAIN_CHOICES = (
+ (DOMAIN_HISTORY, u"Histoire"),
+ (DOMAIN_INTERNATIONAL, u"International"),
+ (DOMAIN_EVENTS, u"Événements"),
+ (DOMAIN_LEISURE, u"Loisirs"),
+ (DOMAIN_SPORTS, u"Sports"),
+ (DOMAIN_PRO, u"Pro"),
+ (DOMAIN_REGION, u"Région"),
+ )
+
+ name = models.CharField(max_length=100, verbose_name=u"nom", unique=True)
+ short = models.SlugField(max_length=10, verbose_name=u"nom court", unique=True)
+ kind = models.CharField(max_length=10, choices=KIND_CHOICES, verbose_name=u"type")
+ domain = models.CharField(max_length=20, choices=DOMAIN_CHOICES, verbose_name=u"domaine")
+
+ dns = models.CharField(max_length=128, verbose_name=u"dns domain", blank=True)
+
+ class Meta:
+ verbose_name = u"group"
+ verbose_name_plural = u"groups"
+
+
+class Account(auth_models.AbstractUser):
+ xgroups = models.ManyToManyField(
+ XGroup, related_name='users', through='Membership', verbose_name=u"groupes")
+
+
+class Membership(xwf_models.WorkflowEnabled, models.Model):
+ LEVEL_MEMBER = 0
+ LEVEL_ADMIN = 10
+ LEVEL_CHOICES = (
+ (LEVEL_MEMBER, u"membre"),
+ (LEVEL_ADMIN, u"administrateur"),
+ )
+
+ xgroup = models.ForeignKey(XGroup, related_name='memberships', verbose_name=u"groupe")
+ xuser = models.ForeignKey(Account, related_name='memberships', verbose_name=u"utilisateur")
+
+ level = models.IntegerField(choices=LEVEL_CHOICES, default=LEVEL_MEMBER, verbose_name=u"droits")
+ state = xwf_models.StateField(MembershipWorkflow, verbose_name=u"état")
--- /dev/null
+
+from django import test
+
+from . import admin # pylint: disable=W0611
+from . import factories
+
+
+class SimpleTest(test.TestCase):
+
+ def test_factories(self):
+ factories.MembershipFactory()
+++ /dev/null
-from django.contrib import admin
-
-from . import models
-
-
-class GroupAdmin(admin.ModelAdmin):
- list_display = ['short', 'name', 'kind', 'domain', 'dns']
- list_filter = ['kind', 'domain']
- search_fields = ['name', 'short', 'dns']
-
-admin.site.register(models.Group, GroupAdmin)
+++ /dev/null
-import factory
-
-from . import models
-
-
-class GroupFactory(factory.DjangoModelFactory):
- FACTORY_FOR = models.Group
-
- name = factory.Sequence(lambda n: u"Groupe n°%s" % n)
- short = factory.Sequence(lambda n: u"Groupe%s" % n)
- kind = models.Group.KIND_GROUP
- domain = models.Group.DOMAIN_REGION
-
+++ /dev/null
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-
-
-class Group(models.Model):
- KIND_PROMO = 'promo'
- KIND_GROUP = 'group'
- KIND_BINET = 'binet'
- KIND_INSTIT = 'instit'
-
- KIND_CHOICES = (
- (KIND_PROMO, _(u"Promo")),
- (KIND_GROUP, _(u"Group")),
- (KIND_BINET, _(u"Binet")),
- (KIND_INSTIT, _(u"Institution")),
- )
-
- DOMAIN_HISTORY = 'history'
- DOMAIN_INTERNATIONAL = 'international'
- DOMAIN_EVENTS = 'events'
- DOMAIN_LEISURE = 'leisure'
- DOMAIN_SPORTS = 'sports'
- DOMAIN_PRO = 'pro'
- DOMAIN_REGION = 'region'
-
- DOMAIN_CHOICES = (
- (DOMAIN_HISTORY, _(u"History")),
- (DOMAIN_INTERNATIONAL, _(u"International")),
- (DOMAIN_EVENTS, _(u"Events")),
- (DOMAIN_LEISURE, _(u"Leisure")),
- (DOMAIN_SPORTS, _(u"Sports")),
- (DOMAIN_PRO, _(u"Pro")),
- (DOMAIN_REGION, _(u"Region")),
- )
-
- name = models.CharField(max_length=100, verbose_name=_(u"name"), unique=True)
- short = models.SlugField(max_length=10, verbose_name=_(u"short name"), unique=True)
- kind = models.CharField(max_length=10, choices=KIND_CHOICES, verbose_name=_(u"kind"))
- domain = models.CharField(max_length=20, choices=DOMAIN_CHOICES, verbose_name=_(u"domain"))
-
- dns = models.CharField(max_length=128, verbose_name=_(u"dns domain"), blank=True)
-
- class Meta:
- verbose_name = _(u"group")
- verbose_name_plural = _(u"groups")
-
- def __unicode__(self):
- return self.name
AUTHGROUPEX_KEY = read_pass('authgroupex.key')
AUTHGROUPEX_FIELDS = ('username', 'firstname', 'lastname', 'perms')
AUTHGROUPEX_SUPERADMIN_PERMS = ('admin',)
+AUTHGROUPEX_USER_MODEL = 'accounts.Account'
LOGIN_URL = '/xorgauth/'
LOGIN_REDIRECT_URL = '/'
+AUTH_USER_MODEL = 'accounts.Account'
+
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
'django_authgroupex',
'xnet.site',
- 'xnet.group',
+ 'xnet.accounts',
'xnet.example',
)
projects / xnet / commitdiff