Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-11 13:30:17 +02: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
celerytask/tasks.py
View File

@ -204,8 +204,8 @@ def run_api_refresh():
# Check our main character # Check our main character
character = EveManager.get_character_by_id(authserviceinfo.main_char_id) character = EveManager.get_character_by_id(authserviceinfo.main_char_id)
corp = EveManager.get_corporation_info_by_id(character.corporation_id) corp = EveManager.get_corporation_info_by_id(character.corporation_id)
main_alliance_id = EveManager.get_charater_alliance_id_by_id(authserviceinfo.main_char_id) main_corp_id = EveManager.get_charater_corporation_id_by_id(authserviceinfo.main_char_id)
if main_alliance_id == settings.ALLIANCE_ID: if main_corp_id == settings.CORP_ID:
pass pass
elif corp is not None: elif corp is not None:
if corp.is_blue is not True: if corp.is_blue is not True:
@ -221,32 +221,21 @@ def run_api_refresh():
# Run Every 2 hours # Run Every 2 hours
@periodic_task(run_every=crontab(minute=0, hour="*/2")) @periodic_task(run_every=crontab(minute=0, hour="*/2"))
def run_alliance_corp_update(): def run_corp_update():
# I am not proud of this block of code # I am not proud of this block of code
if EveApiManager.check_if_api_server_online(): if EveApiManager.check_if_api_server_online():
# Updated alliance info # Create the corp
alliance_info = EveApiManager.get_alliance_information(settings.ALLIANCE_ID) corpinfo = EveApiManager.get_corporation_information(settings.CORP_ID)
if not EveManager.check_if_corporation_exists_by_id(corpinfo['id']):
# Populate alliance info EveManager.create_corporation_info(corpinfo['id'], corpinfo['name'], corpinfo['ticker'],
if not EveManager.check_if_alliance_exists_by_id(settings.ALLIANCE_ID): corpinfo['members']['current'], False, alliance)
EveManager.create_alliance_info(settings.ALLIANCE_ID, alliance_info['name'], alliance_info['ticker'],
alliance_info['executor_id'], alliance_info['member_count'], False)
alliance = EveManager.get_alliance_info_by_id(settings.ALLIANCE_ID)
# Create the corps in the alliance
for alliance_corp in alliance_info['member_corps']:
corpinfo = EveApiManager.get_corporation_information(alliance_corp)
if not EveManager.check_if_corporation_exists_by_id(corpinfo['id']):
EveManager.create_corporation_info(corpinfo['id'], corpinfo['name'], corpinfo['ticker'],
corpinfo['members']['current'], False, alliance)
# Create the corps in the standings # Create the corps in the standings
alliance_standings = EveApiManager.get_alliance_standings() corp_standings = EveApiManager.get_corp_standings()
if alliance_standings: if corp_standings:
for standing_id in EveApiManager.get_alliance_standings()['alliance']: for standing_id in EveApiManager.get_corp_standings()['alliance']:
if int(alliance_standings['alliance'][standing_id]['standing']) >= settings.ALLIANCE_BLUE_STANDING: if int(corp_standings['alliance'][standing_id]['standing']) >= settings.ALLIANCE_BLUE_STANDING:
if EveApiManager.check_if_id_is_character(standing_id): if EveApiManager.check_if_id_is_character(standing_id):
pass pass
elif EveApiManager.check_if_id_is_corp(standing_id): elif EveApiManager.check_if_id_is_corp(standing_id):
@ -276,30 +265,25 @@ def run_alliance_corp_update():
# Update all allinace info's # Update all allinace info's
for all_alliance_info in EveManager.get_all_alliance_info(): for all_alliance_info in EveManager.get_all_alliance_info():
all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id)
if all_alliance_info.alliance_id == settings.ALLIANCE_ID: if 'alliance' in corp_standings:
EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], if int(all_alliance_info.alliance_id) in corp_standings['alliance']:
all_alliance_api_info['member_count'], False) if int(alliance_standings['alliance'][int(all_alliance_info.alliance_id)][
else: 'standing']) >= settings.BLUE_STANDING:
if 'alliance' in alliance_standings: EveManager.update_alliance_info(all_alliance_api_info['id'],
if int(all_alliance_info.alliance_id) in alliance_standings['alliance']: all_alliance_api_info['executor_id'],
if int(alliance_standings['alliance'][int(all_alliance_info.alliance_id)][ all_alliance_api_info['member_count'], True)
'standing']) >= settings.ALLIANCE_BLUE_STANDING:
EveManager.update_alliance_info(all_alliance_api_info['id'],
all_alliance_api_info['executor_id'],
all_alliance_api_info['member_count'], True)
else:
EveManager.update_alliance_info(all_alliance_api_info['id'],
all_alliance_api_info['executor_id'],
all_alliance_api_info['member_count'], False)
else: else:
EveManager.update_alliance_info(all_alliance_api_info['id'], EveManager.update_alliance_info(all_alliance_api_info['id'],
all_alliance_api_info['executor_id'], all_alliance_api_info['executor_id'],
all_alliance_api_info['member_count'], False) all_alliance_api_info['member_count'], False)
else: else:
EveManager.update_alliance_info(all_alliance_api_info['id'], EveManager.update_alliance_info(all_alliance_api_info['id'],
all_alliance_api_info['executor_id'], all_alliance_api_info['executor_id'],
all_alliance_api_info['member_count'], False) all_alliance_api_info['member_count'], False)
else:
EveManager.update_alliance_info(all_alliance_api_info['id'],
all_alliance_api_info['executor_id'],
all_alliance_api_info['member_count'], False)
# Update corp infos # Update corp infos
for all_corp_info in EveManager.get_all_corporation_info(): for all_corp_info in EveManager.get_all_corporation_info():
@ -310,24 +294,21 @@ def run_alliance_corp_update():
if alliance is not None and all_corp_info.alliance is not None: if alliance is not None and all_corp_info.alliance is not None:
if all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID: if int(alliance.alliance_id) in corp_standings['alliance']:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) if int(alliance_standings['alliance'][int(alliance.alliance_id)][
else: 'standing']) >= settings.BLUE_STANDING:
if int(alliance.alliance_id) in alliance_standings['alliance']: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
if int(alliance_standings['alliance'][int(alliance.alliance_id)][ True)
'standing']) >= settings.ALLIANCE_BLUE_STANDING:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
True)
else:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
False)
else: else:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
False) False)
else:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
False)
else: else:
if int(all_corp_info.corporation_id) in alliance_standings['alliance']: if int(all_corp_info.corporation_id) in corp_standings['alliance']:
if int(alliance_standings['alliance'][int(all_corp_info.corporation_id)][ if int(corp_standings['alliance'][int(all_corp_info.corporation_id)][
'standing']) >= settings.ALLIANCE_BLUE_STANDING: 'standing']) >= settings.BLUE_STANDING:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True)
else: else:
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
@ -337,19 +318,13 @@ def run_alliance_corp_update():
# Nuke the none believers # Nuke the none believers
# Check the corps # Check the corps
for all_corp_info in EveManager.get_all_corporation_info(): for all_corp_info in EveManager.get_all_corporation_info():
if all_corp_info.alliance is not None: if all_corp_info.corporation_id != settings.CORP_ID:
if all_corp_info.alliance.alliance_id is not None:
if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID:
if not all_corp_info.is_blue:
all_corp_info.delete()
else:
if not all_corp_info.is_blue: if not all_corp_info.is_blue:
all_corp_info.delete() all_corp_info.delete()
# Check the alliances # Check the alliances
for all_alliance_info in EveManager.get_all_alliance_info(): for all_alliance_info in EveManager.get_all_alliance_info():
if all_alliance_info.alliance_id != settings.ALLIANCE_ID: if all_alliance_info.is_blue is not True:
if all_alliance_info.is_blue is not True: all_alliance_info.delete()
all_alliance_info.delete()

5
eveonline/managers.py
View File

@ -206,3 +206,8 @@ class EveManager:
@staticmethod @staticmethod
def get_all_alliance_info(): def get_all_alliance_info():
return EveAllianceInfo.objects.all() return EveAllianceInfo.objects.all()
@staticmethod
def get_charater_corporation_id_by_id(char_id):
if EveCharacter.objects.filter(character_id=char_id).exists():
return EveCharacter.objects.get(character_id=char_id).corporation_id

22
eveonline/views.py
View File

@ -22,9 +22,9 @@ from eveonline.models import EveApiKeyPair
from authentication.models import AuthServicesInfo from authentication.models import AuthServicesInfo
def disable_alliance_member(user, char_id): def disable_member(user, char_id):
remove_member_permission(user, 'alliance_member') remove_member_permission(user, 'member')
remove_user_from_group(user, settings.DEFAULT_ALLIANCE_GROUP) remove_user_from_group(user, settings.DEFAULT_AUTH_GROUP)
remove_user_from_group(user, remove_user_from_group(user,
generate_corp_group_name( generate_corp_group_name(
EveManager.get_character_by_id(char_id).corporation_name)) EveManager.get_character_by_id(char_id).corporation_name))
@ -80,7 +80,7 @@ def api_key_removal(request, api_id):
if authinfo.is_blue: if authinfo.is_blue:
disable_blue_member(request.user) disable_blue_member(request.user)
else: else:
disable_alliance_member(request.user, authinfo.main_char_id) disable_member(request.user, authinfo.main_char_id)
EveManager.delete_api_key_pair(api_id, request.user.id) EveManager.delete_api_key_pair(api_id, request.user.id)
EveManager.delete_characters_by_api_id(api_id, request.user.id) EveManager.delete_characters_by_api_id(api_id, request.user.id)
@ -104,9 +104,9 @@ def main_character_change(request, char_id):
character_info = EveManager.get_character_by_id(char_id) character_info = EveManager.get_character_by_id(char_id)
corporation_info = EveManager.get_corporation_info_by_id(character_info.corporation_id) corporation_info = EveManager.get_corporation_info_by_id(character_info.corporation_id)
if EveManager.get_charater_alliance_id_by_id(char_id) == settings.ALLIANCE_ID: if EveManager.get_charater_corporation_id_by_id(char_id) == settings.CORP_ID:
add_member_permission(request.user, 'alliance_member') add_member_permission(request.user, 'member')
add_user_to_group(request.user, settings.DEFAULT_ALLIANCE_GROUP) add_user_to_group(request.user, settings.DEFAULT_AUTH_GROUP)
add_user_to_group(request.user, add_user_to_group(request.user,
generate_corp_group_name(EveManager.get_character_by_id(char_id).corporation_name)) generate_corp_group_name(EveManager.get_character_by_id(char_id).corporation_name))
@ -116,15 +116,15 @@ def main_character_change(request, char_id):
add_user_to_group(request.user, settings.DEFAULT_BLUE_GROUP) add_user_to_group(request.user, settings.DEFAULT_BLUE_GROUP)
AuthServicesInfoManager.update_is_blue(True, request.user) AuthServicesInfoManager.update_is_blue(True, request.user)
else: else:
if check_if_user_has_permission(request.user, 'alliance_member'): if check_if_user_has_permission(request.user, 'member'):
disable_alliance_member(request.user, previousmainid) disable_member(request.user, previousmainid)
if check_if_user_has_permission(request.user, 'blue_member'): if check_if_user_has_permission(request.user, 'blue_member'):
disable_blue_member(request.user) disable_blue_member(request.user)
else: else:
# TODO: disable serivces # TODO: disable serivces
if check_if_user_has_permission(request.user, 'alliance_member'): if check_if_user_has_permission(request.user, 'member'):
disable_alliance_member(request.user, previousmainid) disable_member(request.user, previousmainid)
if check_if_user_has_permission(request.user, 'blue_member'): if check_if_user_has_permission(request.user, 'blue_member'):
disable_blue_member(request.user) disable_blue_member(request.user)

2
groupmanagement/views.py
View File

@ -96,7 +96,7 @@ def groups_view(request):
# Check if group is a corp # Check if group is a corp
if "Corp_" in group.name: if "Corp_" in group.name:
pass pass
elif settings.DEFAULT_ALLIANCE_GROUP in group.name: elif settings.DEFAULT_AUTH_GROUP in group.name:
pass pass
elif settings.DEFAULT_BLUE_GROUP in group.name: elif settings.DEFAULT_BLUE_GROUP in group.name:
pass pass

10
hrapplications/forms.py
View File

@ -1,20 +1,10 @@
from django import forms from django import forms
from django.conf import settings from django.conf import settings
from eveonline.models import EveCorporationInfo
class HRApplicationForm(forms.Form): class HRApplicationForm(forms.Form):
allchoices = []
for corp in EveCorporationInfo.objects.all():
if corp.alliance is not None:
if corp.alliance.alliance_id == settings.ALLIANCE_ID:
allchoices.append((str(corp.corporation_id), str(corp.corporation_name)))
character_name = forms.CharField(max_length=254, required=True, label="Main Character Name") character_name = forms.CharField(max_length=254, required=True, label="Main Character Name")
full_api_id = forms.CharField(max_length=254, required=True, label="API ID") full_api_id = forms.CharField(max_length=254, required=True, label="API ID")
full_api_key = forms.CharField(max_length=254, required=True, label="API Verification Code") full_api_key = forms.CharField(max_length=254, required=True, label="API Verification Code")
corp = forms.ChoiceField(choices=allchoices, required=True, label="Corp")
is_a_spi = forms.ChoiceField(choices=[('Yes', 'Yes'), ('No', 'No')], required=True, label='Are you a spy?') is_a_spi = forms.ChoiceField(choices=[('Yes', 'Yes'), ('No', 'No')], required=True, label='Are you a spy?')
about = forms.CharField(widget=forms.Textarea, required=False, label="About You") about = forms.CharField(widget=forms.Textarea, required=False, label="About You")
extra = forms.CharField(widget=forms.Textarea, required=False, label="Extra Application Info") extra = forms.CharField(widget=forms.Textarea, required=False, label="Extra Application Info")

2
hrapplications/models.py
View File

@ -1,7 +1,6 @@
from django.db import models from django.db import models
from django.contrib.auth.models import User from django.contrib.auth.models import User
from eveonline.models import EveCorporationInfo
from eveonline.models import EveCharacter from eveonline.models import EveCharacter
@ -13,7 +12,6 @@ class HRApplication(models.Model):
about = models.TextField(default="") about = models.TextField(default="")
extra = models.TextField(default="") extra = models.TextField(default="")
corp = models.ForeignKey(EveCorporationInfo)
user = models.ForeignKey(User) user = models.ForeignKey(User)
approved_denied = models.NullBooleanField(blank=True, null=True) approved_denied = models.NullBooleanField(blank=True, null=True)

7
hrapplications/views.py
View File

@ -28,11 +28,11 @@ def hr_application_management_view(request):
# Get the corp the member is in # Get the corp the member is in
auth_info = AuthServicesInfo.objects.get(user=request.user) auth_info = AuthServicesInfo.objects.get(user=request.user)
if auth_info.main_char_id != "": if auth_info.main_char_id != "":
main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id) main_corp_id = EveManager.get_charater_corporation_id_by_id(auth_info.main_char_id)
if main_alliance_id == settings.ALLIANCE_ID: if main_corp_id == settings.CORP_ID:
main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id) main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id) corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None) corp_applications = HRApplication.objects.filter(approved_denied=None)
else: else:
corp_applications = None corp_applications = None
@ -56,7 +56,6 @@ def hr_application_create_view(request):
application.character_name = form.cleaned_data['character_name'] application.character_name = form.cleaned_data['character_name']
application.full_api_id = form.cleaned_data['full_api_id'] application.full_api_id = form.cleaned_data['full_api_id']
application.full_api_key = form.cleaned_data['full_api_key'] application.full_api_key = form.cleaned_data['full_api_key']
application.corp = EveCorporationInfo.objects.get(corporation_id=form.cleaned_data['corp'])
application.is_a_spi = form.cleaned_data['is_a_spi'] application.is_a_spi = form.cleaned_data['is_a_spi']
application.about = form.cleaned_data['about'] application.about = form.cleaned_data['about']
application.extra = form.cleaned_data['extra'] application.extra = form.cleaned_data['extra']

4
run_alliance_corp_update.py
View File

@ -1,6 +1,6 @@
from util import bootstrap_permissions from util import bootstrap_permissions
from celerytask.tasks import run_alliance_corp_update from celerytask.tasks import run_corp_update
bootstrap_permissions() bootstrap_permissions()
run_alliance_corp_update() run_corp_update()
quit() quit()

6
services/managers/eve_api_manager.py
View File

@ -140,10 +140,10 @@ class EveApiManager():
return False return False
@staticmethod @staticmethod
def get_alliance_standings(): def get_corp_standings():
if settings.ALLIANCE_EXEC_CORP_ID != "": if settings.CORP_API_ID != "":
try: try:
api = evelink.api.API(api_key=(settings.ALLIANCE_EXEC_CORP_ID, settings.ALLIANCE_EXEC_CORP_VCODE)) api = evelink.api.API(api_key=(settings.CORP_API_ID, settings.CORP_API_VCODE))
corp = evelink.corp.Corp(api=api) corp = evelink.corp.Corp(api=api)
corpinfo = corp.contacts() corpinfo = corp.contacts()
results = corpinfo[0] results = corpinfo[0]

2
services/managers/teamspeak3_manager.py
View File

@ -127,7 +127,7 @@ class Teamspeak3Manager:
server_groups = Teamspeak3Manager._group_list() server_groups = Teamspeak3Manager._group_list()
if not settings.DEFAULT_ALLIANCE_GROUP in server_groups: if not settings.DEFAULT_AUTH_GROUP in server_groups:
Teamspeak3Manager._create_group(settings.DEFAULT_ALLIANCE_GROUP) Teamspeak3Manager._create_group(settings.DEFAULT_ALLIANCE_GROUP)
alliance_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_ALLIANCE_GROUP) alliance_group_id = Teamspeak3Manager._group_id_by_name(settings.DEFAULT_ALLIANCE_GROUP)

2
services/views.py
View File

@ -91,7 +91,7 @@ def services_view(request):
def service_blue_alliance_test(user): def service_blue_alliance_test(user):
return check_if_user_has_permission(user, 'alliance_member') or check_if_user_has_permission(user, 'blue_member') return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member')
@login_required @login_required

2
srp/views.py
View File

@ -18,7 +18,7 @@ from form import SrpFleetMainUpdateForm
def srp_util_test(user): def srp_util_test(user):
return check_if_user_has_permission(user, 'alliance_member') or check_if_user_has_permission(user, 'blue_member') return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member')
@login_required @login_required

12
templates/public/base.html
View File

@ -36,7 +36,7 @@
<div class="navbar-header "> <div class="navbar-header ">
<a class="navbar-brand "> <a class="navbar-brand ">
<div class="fa fa-cog fa-spin"></div> <div class="fa fa-cog fa-spin"></div>
{{ ALLIANCE_NAME }} {{ CORP_NAME }}
</a> </a>
</div> </div>
@ -76,7 +76,7 @@
class="fa fa-users fa-fw grayiconecolor"></i> Characters</a> class="fa fa-users fa-fw grayiconecolor"></i> Characters</a>
</li> </li>
{% if perms.auth.alliance_member %} {% if perms.auth.member %}
<li> <li>
<a {% ifequal request.path "/groups/" %} class="active" {% endifequal %} <a {% ifequal request.path "/groups/" %} class="active" {% endifequal %}
href="{% url 'auth_groups' %}"><i href="{% url 'auth_groups' %}"><i
@ -94,7 +94,7 @@
<li class="text-center divider-horizontal"> <li class="text-center divider-horizontal">
<h5>Aux Navigation</h5> <h5>Aux Navigation</h5>
</li> </li>
{% if perms.auth.alliance_member or perms.auth.blue_member %} {% if perms.auth.member or perms.auth.blue_member %}
<li> <li>
<a {% ifequal request.path "/services/" %} class="active" {% endifequal %} <a {% ifequal request.path "/services/" %} class="active" {% endifequal %}
href="{% url 'auth_services' %}"><i href="{% url 'auth_services' %}"><i
@ -102,7 +102,7 @@
</li> </li>
{% endif %} {% endif %}
{% if not perms.auth.alliance_member and not perms.auth.blue_member or perms.auth.human_resources %} {% if not perms.auth.member and not perms.auth.blue_member or perms.auth.human_resources %}
<li> <li>
<a {% ifequal request.path "/hr_application_management/" %} <a {% ifequal request.path "/hr_application_management/" %}
class="active" {% endifequal %} class="active" {% endifequal %}
@ -127,7 +127,7 @@
</li> </li>
{% endif %} {% endif %}
{% if perms.auth.alliance_member or perms.auth.blue_member %} {% if perms.auth.member or perms.auth.blue_member %}
<li> <li>
<a {% ifequal request.path "/fits" %} class="active" {% endifequal %} <a {% ifequal request.path "/fits" %} class="active" {% endifequal %}
href="{% url 'auth_fleet_fits' %}"><i href="{% url 'auth_fleet_fits' %}"><i
@ -158,7 +158,7 @@
class="fa fa-lock fa-fw grayiconecolor"></i>Change Password</a> class="fa fa-lock fa-fw grayiconecolor"></i>Change Password</a>
</li> </li>
{% if perms.auth.alliance_member or perms.auth.blue_member %} {% if perms.auth.member or perms.auth.blue_member %}
<li> <li>
<a {% ifequal request.path "/tool/fleet_formatter_tool/" %} <a {% ifequal request.path "/tool/fleet_formatter_tool/" %}
class="active" {% endifequal %} class="active" {% endifequal %}

2
templates/public/login.html
View File

@ -11,7 +11,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title> <title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

2
templates/public/register.html
View File

@ -10,7 +10,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title> <title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

4
templates/registered/corpstats.html
View File

@ -6,7 +6,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="page-header text-center">Corporation Stats</h1> <h1 class="page-header text-center">Corporation Stats</h1>
{% if perms.auth.alliance_member %} {% if perms.auth.member %}
<div class="col-lg-12 container" id="example"> <div class="col-lg-12 container" id="example">
<div class="row"> <div class="row">
@ -67,7 +67,7 @@
</div> </div>
</div> </div>
{% else %} {% else %}
<p> Not part of the alliance</p> <p> Not part of the corporation</p>
{% endif %} {% endif %}
</div> </div>
{% endblock content %} {% endblock content %}

4
templates/registered/dashboard.html
View File

@ -6,7 +6,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="page-header text-center">Dashboard</h1> <h1 class="page-header text-center">Dashboard</h1>
{% if perms.auth.alliance_member %} {% if perms.auth.member %}
<div class="col-lg-12 container" id="example"> <div class="col-lg-12 container" id="example">
@ -59,7 +59,7 @@
</div> </div>
</div> </div>
{% else %} {% else %}
<p> Not part of the alliance</p> <p> Not part of the corporation</p>
{% endif %} {% endif %}
</div> </div>
{% endblock content %} {% endblock content %}

4
templates/registered/groups.html
View File

@ -9,7 +9,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="page-header text-center">Available Groups</h1> <h1 class="page-header text-center">Available Groups</h1>
{% if perms.auth.alliance_member %} {% if perms.auth.member %}
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th class="text-center">GroupID</th> <th class="text-center">GroupID</th>
@ -52,7 +52,7 @@
{% endfor %} {% endfor %}
</table> </table>
{% else %} {% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance</div> <div class="alert alert-danger" role="alert">You are not in the corporation</div>
{% endif %} {% endif %}
</div> </div>

2
templates/registered/hrapplicationmanagement.html
View File

@ -9,7 +9,7 @@
{% block content %} {% block content %}
<div class="col-lg-12"> <div class="col-lg-12">
{% if not perms.auth.alliance_member %} {% if not perms.auth.member %}
<h1 class="page-header text-center">Personal Applications <h1 class="page-header text-center">Personal Applications
<div class="text-right"> <div class="text-right">
<a href="{% url 'auth_hrapplication_create_view' %}"> <a href="{% url 'auth_hrapplication_create_view' %}">

14
templates/registered/services.html
View File

@ -153,7 +153,7 @@
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
{% elif perms.auth.alliance_member %} {% elif perms.auth.member %}
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<th class="text-center">Service</th> <th class="text-center">Service</th>
@ -162,7 +162,7 @@
<th class="text-center">Domain</th> <th class="text-center">Domain</th>
<th class="text-center">Action</th> <th class="text-center">Action</th>
</tr> </tr>
{% if ENABLE_ALLIANCE_FORUM %} {% if ENABLE_AUTH_FORUM %}
<tr> <tr>
<td class="text-center">Forums</td> <td class="text-center">Forums</td>
<td class="text-center">{{ authinfo.forum_username }}</td> <td class="text-center">{{ authinfo.forum_username }}</td>
@ -187,7 +187,7 @@
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% if ENABLE_ALLIANCE_IPBOARD %} {% if ENABLE_AUTH_IPBOARD %}
<td class="text-center">IPBoard Forums</td> <td class="text-center">IPBoard Forums</td>
<td class="text-center">{{ authinfo.ipboard_username }}</td> <td class="text-center">{{ authinfo.ipboard_username }}</td>
<td class="text-center">{{ authinfo.ipboard_password }}</td> <td class="text-center">{{ authinfo.ipboard_password }}</td>
@ -210,7 +210,7 @@
{% endifequal %} {% endifequal %}
</td> </td>
{% endif %} {% endif %}
{% if ENABLE_ALLIANCE_JABBER %} {% if ENABLE_AUTH_JABBER %}
<tr> <tr>
<td class="text-center">Jabber</td> <td class="text-center">Jabber</td>
<td class="text-center">{{ authinfo.jabber_username }}</td> <td class="text-center">{{ authinfo.jabber_username }}</td>
@ -235,7 +235,7 @@
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% if ENABLE_ALLIANCE_MUMBLE %} {% if ENABLE_AUTH_MUMBLE %}
<tr> <tr>
<td class="text-center">Mumble</td> <td class="text-center">Mumble</td>
<td class="text-center">{{ authinfo.mumble_username }}</td> <td class="text-center">{{ authinfo.mumble_username }}</td>
@ -260,7 +260,7 @@
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
{% if ENABLE_ALLIANCE_TEAMSPEAK3 %} {% if ENABLE_AUTH_TEAMSPEAK3 %}
<tr> <tr>
<th class="text-center">Service</th> <th class="text-center">Service</th>
<th class="text-center">Unique ID</th> <th class="text-center">Unique ID</th>
@ -300,7 +300,7 @@
{% endif %} {% endif %}
</table> </table>
{% else %} {% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance</div> <div class="alert alert-danger" role="alert">You are not in the corporation</div>
{% endif %} {% endif %}
</div> </div>

2
templates/registration/password_reset_complete.html
View File

@ -12,7 +12,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title> <title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

2
templates/registration/password_reset_confirm.html
View File

@ -12,7 +12,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title> <title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

2
templates/registration/password_reset_done.html
View File

@ -12,7 +12,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title> <title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

4
templates/registration/password_reset_email.html
View File

@ -4,12 +4,12 @@
{% trans "Please go to the following page and choose a new password:" %} {% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %} {% block reset_link %}
https://the99eve.com{% url 'password_reset_confirm' uidb64=uid token=token %} https://someurl.com{% url 'password_reset_confirm' uidb64=uid token=token %}
{% endblock %} {% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }} {% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
{% trans "Thanks for using our site!" %} {% trans "Thanks for using our site!" %}
{% blocktrans %}The The 99 Percent team{% endblocktrans %} {% blocktrans %}Your Corporation{% endblocktrans %}
{% endautoescape %} {% endautoescape %}

2
templates/registration/password_reset_form.html
View File

@ -12,7 +12,7 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title> <title>{{ CORP_NAME }} - Login</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">

2
timerboard/views.py
View File

@ -15,7 +15,7 @@ from models import Timer
def timer_util_test(user): def timer_util_test(user):
return check_if_user_has_permission(user, 'alliance_member') or check_if_user_has_permission(user, 'blue_member') return check_if_user_has_permission(user, 'member') or check_if_user_has_permission(user, 'blue_member')
@login_required @login_required

4
util/__init__.py
View File

@ -9,7 +9,7 @@ from django.conf import settings
def bootstrap_permissions(): def bootstrap_permissions():
ct = ContentType.objects.get_for_model(User) 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="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="jabber_broadcast", content_type=ct, name="jabber_broadcast")
Permission.objects.get_or_create(codename="human_resources", content_type=ct, name="human_resources") 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="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="timer_management", content_type=ct, name="timer_management")
Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_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) Group.objects.get_or_create(name=settings.DEFAULT_BLUE_GROUP)

18
util/context_processors.py
View File

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