mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-12 14:00:17 +02:00
Mr McClain
commit
99d10ce1ef
@ -132,13 +132,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
|
||||
)
|
||||
|
||||
TEMPLATE_DIRS = (
|
||||
'customization/templates',
|
||||
'stock/templates',
|
||||
os.path.join(BASE_DIR, 'customization/templates'),
|
||||
os.path.join(BASE_DIR, 'stock/templates'),
|
||||
)
|
||||
|
||||
STATICFILES_DIRS = (
|
||||
'customization/static',
|
||||
'stock/static',
|
||||
os.path.join(BASE_DIR, "customization/static"),
|
||||
os.path.join(BASE_DIR, "stock/static"),
|
||||
)
|
||||
|
||||
LOGIN_URL = '/login_user/'
|
||||
@ -189,7 +189,7 @@ IS_CORP = 'True' == os.environ.get('AA_IS_CORP', 'True')
|
||||
# DOMAIN - The alliance auth domain_url
|
||||
# EMAIL_HOST - SMTP Server URL
|
||||
# EMAIL_PORT - SMTP Server PORT
|
||||
# EMAIL_HOST_USER - Email Username (for gmail, the part before @gmail.com)
|
||||
# EMAIL_HOST_USER - Email Username (for gmail, the entire address)
|
||||
# EMAIL_HOST_PASSWORD - Email Password
|
||||
# EMAIL_USE_TLS - Set to use TLS encryption
|
||||
#################
|
||||
|
||||
@ -67,7 +67,7 @@ def update_jabber_groups(pk):
|
||||
try:
|
||||
OpenfireManager.update_user_groups(authserviceinfo.jabber_username, authserviceinfo.jabber_password, groups)
|
||||
except:
|
||||
logger.warn("Jabber group sync failed for %s, retrying in 10 mins" % user)
|
||||
logger.exception("Jabber group sync failed for %s, retrying in 10 mins" % user)
|
||||
raise self.retry(countdown = 60 * 10)
|
||||
logger.debug("Updated user %s jabber groups." % user)
|
||||
|
||||
@ -85,7 +85,7 @@ def update_mumble_groups(pk):
|
||||
try:
|
||||
MumbleManager.update_groups(authserviceinfo.mumble_username, groups)
|
||||
except:
|
||||
logger.warn("Mumble group sync failed for %s, retrying in 10 mins" % user)
|
||||
logger.exception("Mumble group sync failed for %s, retrying in 10 mins" % user)
|
||||
raise self.retry(countdown = 60 * 10)
|
||||
logger.debug("Updated user %s mumble groups." % user)
|
||||
|
||||
@ -103,7 +103,7 @@ def update_forum_groups(pk):
|
||||
try:
|
||||
Phpbb3Manager.update_groups(authserviceinfo.forum_username, groups)
|
||||
except:
|
||||
logger.warn("Phpbb group sync failed for %s, retrying in 10 mins" % user)
|
||||
logger.exception("Phpbb group sync failed for %s, retrying in 10 mins" % user)
|
||||
raise self.retry(countdown = 60 * 10)
|
||||
logger.debug("Updated user %s forum groups." % user)
|
||||
|
||||
@ -121,7 +121,7 @@ def update_ipboard_groups(pk):
|
||||
try:
|
||||
IPBoardManager.update_groups(authserviceinfo.ipboard_username, groups)
|
||||
except:
|
||||
logger.warn("IPBoard group sync failed for %s, retrying in 10 mins" % user)
|
||||
logger.exception("IPBoard group sync failed for %s, retrying in 10 mins" % user)
|
||||
raise self.retry(countdown = 60 * 10)
|
||||
logger.debug("Updated user %s ipboard groups." % user)
|
||||
|
||||
@ -157,7 +157,7 @@ def update_discord_groups(pk):
|
||||
try:
|
||||
DiscordManager.update_groups(authserviceinfo.discord_uid, groups)
|
||||
except:
|
||||
logger.warn("Discord group sync failed for %s, retrying in 10 mins" % user)
|
||||
logger.exception("Discord group sync failed for %s, retrying in 10 mins" % user)
|
||||
raise self.retry(countdown = 60 * 10)
|
||||
logger.debug("Updated user %s discord groups." % user)
|
||||
|
||||
@ -412,12 +412,11 @@ def run_api_refresh():
|
||||
refresh_api(api_key_pair)
|
||||
except evelink.api.APIError as e:
|
||||
if int(e.code) >= 500:
|
||||
logger.error("EVE API servers encountered an error. Aborting API updates")
|
||||
return
|
||||
logger.error("EVE API servers encountered error %s updating %s" % (e.code, api_key_pair))
|
||||
elif int(e.code) == 221:
|
||||
logger.warn("API server hiccup while updating %s" % api_key_pair)
|
||||
logger.warn("API server hiccup %s while updating %s" % (e.code, api_key_pair))
|
||||
else:
|
||||
logger.debug("API key %s failed update with error code %s" % (api_key_pair.api_id, e.code))
|
||||
logger.info("API key %s failed update with error code %s" % (api_key_pair.api_id, e.code))
|
||||
EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id)
|
||||
EveManager.delete_api_key_pair(api_key_pair.api_id, user.id)
|
||||
notify(user, "API Key Deleted", message="Your API key ID %s failed validation with code %s. It and its associated characters have been deleted." % (api_key_pair.api_id, e.code), level="danger")
|
||||
|
||||
@ -23,8 +23,6 @@ import logging
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
# Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
|
||||
@login_required
|
||||
def corp_member_view(request, corpid = None):
|
||||
logger.debug("corp_member_view called by user %s" % request.user)
|
||||
@ -39,11 +37,16 @@ def corp_member_view(request, corpid = None):
|
||||
if not settings.IS_CORP:
|
||||
alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
|
||||
alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
|
||||
membercorp_list = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps]
|
||||
membercorp_list.sort(key=lambda tup: tup[1])
|
||||
|
||||
membercorplist = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps]
|
||||
membercorplist.sort(key=lambda tup: tup[1])
|
||||
membercorp_id_list = [int(membercorp.corporation_id) for membercorp in alliancecorps]
|
||||
if user_corp_id not in membercorp_id_list:
|
||||
|
||||
bluecorps = EveCorporationInfo.objects.filter(is_blue=True)
|
||||
bluecorplist = [(int(bluecorp.corporation_id), str(bluecorp.corporation_name)) for bluecorp in bluecorps]
|
||||
bluecorplist.sort(key=lambda tup: tup[1])
|
||||
bluecorp_id_list = [int(bluecorp.corporation_id) for bluecorp in bluecorps]
|
||||
|
||||
if not (user_corp_id in membercorp_id_list or user_corp_id not in bluecorp_id_list):
|
||||
user_corp_id = None
|
||||
|
||||
if not corpid:
|
||||
@ -52,7 +55,7 @@ def corp_member_view(request, corpid = None):
|
||||
elif user_corp_id:
|
||||
corpid = user_corp_id
|
||||
else:
|
||||
corpid = membercorp_list[0][0]
|
||||
corpid = membercorplist[0][0]
|
||||
|
||||
corp = EveCorporationInfo.objects.get(corporation_id=corpid)
|
||||
Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist", "apilist"])
|
||||
@ -135,7 +138,7 @@ def corp_member_view(request, corpid = None):
|
||||
n_unacounted = corp.member_count - (num_registered_characters + len(characters_without_api))
|
||||
|
||||
if not settings.IS_CORP:
|
||||
context = {"membercorp_list": membercorp_list,
|
||||
context = {"membercorplist": membercorplist,
|
||||
"corp": corp,
|
||||
"characters_with_api": sorted(characters_with_api.items()),
|
||||
'n_registered': num_registered_characters,
|
||||
|
||||
@ -45,13 +45,13 @@
|
||||
<nav class="navbar navbar-default">
|
||||
<div class="container-fluid">
|
||||
<ul class="nav navbar-nav navbar-wide">
|
||||
{% if membercorp_list and perms.auth.alliance_apis %}
|
||||
{% if membercorplist and perms.auth.alliance_apis %}
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Alliance corporations <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu scrollable">
|
||||
{% for membercorp_id, membercorp_name in membercorp_list %}
|
||||
{% for membercorpid, membercorpname in membercorplist %}
|
||||
<li>
|
||||
<a href="/corputils/{{ membercorp_id }}">{{ membercorp_name }}</a>
|
||||
<a href="/corputils/{{ membercorpid }}">{{ membercorpname }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user