Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-15 23:40:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from Adarnof/temp

Browse Source 
R4stl1n pull request corrections
This commit is contained in:
Adarnof 2015-11-05 22:24:57 -05:00
commit 4134bbb188
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
celerytask/tasks.py
View File

@ -23,9 +23,6 @@ from eveonline.models import EveCharacter
from eveonline.models import EveCorporationInfo from eveonline.models import EveCorporationInfo
from authentication.managers import AuthServicesInfoManager from authentication.managers import AuthServicesInfoManager
def generate_corp_group_name(corpname):
return 'Corp_' + corpname.replace(' ', '_')
def disable_alliance_member(user, char_id): def disable_alliance_member(user, char_id):
remove_member_permission(user, 'member') remove_member_permission(user, 'member')
remove_user_from_group(user, settings.DEFAULT_AUTH_GROUP) remove_user_from_group(user, settings.DEFAULT_AUTH_GROUP)

5
hrapplications/views.py
View File

@ -29,10 +29,11 @@ def hr_application_management_view(request):
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_corp_id = EveManager.get_charater_corporation_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_corp_id == settings.CORP_ID: main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
if (settings.IS_CORP and main_corp_id == settings.CORP_ID) or (not settings.IS_CORP and main_alliance_id == settings.ALLIANCE_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(approved_denied=None) corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
else: else:
corp_applications = None corp_applications = None

6
templates/public/base.html
View File

@ -36,7 +36,11 @@
<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>
{{ CORP_NAME }} {% if IS_CORP %}
<title>{{ CORP_NAME }}</title>
{% else %}
<title>{{ ALLIANCE_NAME }}</title>
{% endif %}
</a> </a>
</div> </div>