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

Now allows access permissions on a alliance level

Browse Source
This commit is contained in:
Andrew Williams
2010-05-08 18:03:24 +01:00
parent 8f0d00a6dc
commit abc214ea18
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eve_api/evolutions/__init__.py
View File

@@ -1 +1 @@
SEQUENCE = ['applications-field', 'total-sp', 'login-locations', 'director-update'] SEQUENCE = ['applications-field', 'total-sp', 'login-locations', 'director-update', 'alliance-group']

7
eve_api/evolutions/alliance-group.py Normal file
View File

@@ -0,0 +1,7 @@
from django_evolution.mutations import *
from django.db import models
MUTATIONS = [
AddField('EVEPlayerAlliance', 'group', models.ForeignKey, null=True, related_model='auth.Group')
]

1
eve_api/models/api_player.py
View File

@@ -126,6 +126,7 @@ class EVEPlayerAlliance(EVEAPIModel):
#executor_character = models.ForeignKey(EVECharacter, blank=True, null=False) #executor_character = models.ForeignKey(EVECharacter, blank=True, null=False)
member_count = models.IntegerField(blank=True, null=True) member_count = models.IntegerField(blank=True, null=True)
date_founded = models.DateField(blank=True, null=True) date_founded = models.DateField(blank=True, null=True)
group = models.ForeignKey(Group, blank=True, null=True)
objects = EVEPlayerAllianceManager() objects = EVEPlayerAllianceManager()

10
sso/models.py
View File

@@ -5,7 +5,7 @@ import logging
from django.db import models from django.db import models
from django.db.models import signals from django.db.models import signals
from django.contrib.auth.models import User, UserManager, Group from django.contrib.auth.models import User, UserManager, Group
from eve_api.models import EVEAccount, EVEPlayerCorporation from eve_api.models import EVEAccount, EVEPlayerCorporation, EVEPlayerAlliance
from reddit.models import RedditAccount from reddit.models import RedditAccount
from services import get_api from services import get_api
@@ -48,11 +48,14 @@ class SSOUser(models.Model):
access accordingly """ access accordingly """
self._log.debug("Update - User %s" % self.user) self._log.debug("Update - User %s" % self.user)
# Create a list of all Corp groups # Create a list of all Corp and Alliance groups
corpgroups = [] corpgroups = []
for corp in EVEPlayerCorporation.objects.filter(group__isnull=False): for corp in EVEPlayerCorporation.objects.filter(group__isnull=False):
if corp.group: if corp.group:
corpgroups.append(corp.group) corpgroups.append(corp.group)
for alliance in EVEPlayerAlliance.objects.filter(group__isnull=False):
if alliance.group:
corpgroups.append(alliance.group)
# Create a list of Char groups # Create a list of Char groups
chargroups = [] chargroups = []
@@ -61,6 +64,9 @@ class SSOUser(models.Model):
for char in eacc.characters.all(): for char in eacc.characters.all():
if char.corporation.group: if char.corporation.group:
chargroups.append(char.corporation.group) chargroups.append(char.corporation.group)
if char.corporation.alliance:
if char.corporation.alliance.group:
chargroups.append(char.corporation.alliance.group)
# Generate the list of groups to add/remove # Generate the list of groups to add/remove
delgroups = set(set(self.user.groups.all()) & set(corpgroups)) - set(chargroups) delgroups = set(set(self.user.groups.all()) & set(corpgroups)) - set(chargroups)