Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-07 15:46:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed all dependency on alliance membership

Browse Source 
Renamed permission 'alliance_member' 'member'
Renamed multiple variables in settings.py and associated handlers in util

Maybe it still works?
This commit is contained in:
Adarnof
2015-09-17 04:42:36 +00:00
parent e8181a23d7
commit e98bc36a9c
28 changed files with 115 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
util/__init__.py
View File

@@ -9,7 +9,7 @@ from django.conf import settings
def bootstrap_permissions():
ct = ContentType.objects.get_for_model(User)
Permission.objects.get_or_create(codename="alliance_member", content_type=ct, name="alliance_member")
Permission.objects.get_or_create(codename="member", content_type=ct, name="member")
Permission.objects.get_or_create(codename="group_management", content_type=ct, name="group_management")
Permission.objects.get_or_create(codename="jabber_broadcast", content_type=ct, name="jabber_broadcast")
Permission.objects.get_or_create(codename="human_resources", content_type=ct, name="human_resources")
@@ -17,7 +17,7 @@ def bootstrap_permissions():
Permission.objects.get_or_create(codename="corp_stats", content_type=ct, name="corp_stats")
Permission.objects.get_or_create(codename="timer_management", content_type=ct, name="timer_management")
Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management")
Group.objects.get_or_create(name=settings.DEFAULT_ALLIANCE_GROUP)
Group.objects.get_or_create(name=settings.DEFAULT_AUTH_GROUP)
Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)
@@ -54,4 +54,4 @@ def random_string(string_length=10):
random = str(uuid.uuid4()) # Convert UUID format to a Python string.
random = random.upper() # Make all characters uppercase.
random = random.replace("-", "") # Remove the UUID '-'.
return random[0:string_length] # Return the random string.
return random[0:string_length] # Return the random string.

20
util/context_processors.py
View File

@@ -2,12 +2,12 @@ from django.conf import settings
from django.utils import timezone
def alliance_id(request):
return {'ALLIANCE_ID': settings.ALLIANCE_ID}
def corp_id(request):
return {'CORP_ID': settings.CORP_ID}
def alliance_name(request):
return {'ALLIANCE_NAME': settings.ALLIANCE_NAME}
def corp_name(request):
return {'CORP_NAME': settings.CORP_NAME}
def jabber_url(request):
@@ -17,11 +17,11 @@ def jabber_url(request):
def domain_url(request):
return {'DOMAIN': settings.DOMAIN, 'MUMBLE_URL': settings.MUMBLE_URL,
'FORUM_URL': settings.FORUM_URL,
'ENABLE_ALLIANCE_FORUM': settings.ENABLE_ALLIANCE_FORUM,
'ENABLE_ALLIANCE_JABBER': settings.ENABLE_ALLIANCE_JABBER,
'ENABLE_ALLIANCE_MUMBLE': settings.ENABLE_ALLIANCE_MUMBLE,
'ENABLE_ALLIANCE_IPBOARD': settings.ENABLE_ALLIANCE_IPBOARD,
'ENABLE_ALLIANCE_TEAMSPEAK3': settings.ENABLE_ALLIANCE_TEAMSPEAK3,
'ENABLE_AUTH_FORUM': settings.ENABLE_AUTH_FORUM,
'ENABLE_AUTH_JABBER': settings.ENABLE_AUTH_JABBER,
'ENABLE_AUTH_MUMBLE': settings.ENABLE_AUTH_MUMBLE,
'ENABLE_AUTH_IPBOARD': settings.ENABLE_AUTH_IPBOARD,
'ENABLE_AUTH_TEAMSPEAK3': settings.ENABLE_AUTH_TEAMSPEAK3,
'ENABLE_BLUE_JABBER': settings.ENABLE_BLUE_JABBER,
'ENABLE_BLUE_FORUM': settings.ENABLE_BLUE_FORUM,
'ENABLE_BLUE_MUMBLE': settings.ENABLE_BLUE_MUMBLE,
@@ -29,4 +29,4 @@ def domain_url(request):
'ENABLE_BLUE_TEAMSPEAK3': settings.ENABLE_BLUE_TEAMSPEAK3,
'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL,
'JACK_KNIFE_URL': settings.JACK_KNIFE_URL,
'CURRENT_UTC_TIME': timezone.now()}
'CURRENT_UTC_TIME': timezone.now()}