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

Merge pull request #2 from R4stl1n/master

Browse Source 
sync
This commit is contained in:
Mr McClain 2016-04-04 16:53:17 -05:00
commit 99d10ce1ef
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
alliance_auth/settings.py.example
View File

@ -132,13 +132,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
) )
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
'customization/templates', os.path.join(BASE_DIR, 'customization/templates'),
'stock/templates', os.path.join(BASE_DIR, 'stock/templates'),
) )
STATICFILES_DIRS = ( STATICFILES_DIRS = (
'customization/static', os.path.join(BASE_DIR, "customization/static"),
'stock/static', os.path.join(BASE_DIR, "stock/static"),
) )
LOGIN_URL = '/login_user/' LOGIN_URL = '/login_user/'
@ -189,7 +189,7 @@ IS_CORP = 'True' == os.environ.get('AA_IS_CORP', 'True')
# DOMAIN - The alliance auth domain_url # DOMAIN - The alliance auth domain_url
# EMAIL_HOST - SMTP Server URL # EMAIL_HOST - SMTP Server URL
# EMAIL_PORT - SMTP Server PORT # 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_HOST_PASSWORD - Email Password
# EMAIL_USE_TLS - Set to use TLS encryption # EMAIL_USE_TLS - Set to use TLS encryption
################# #################

17
celerytask/tasks.py
View File

@ -67,7 +67,7 @@ def update_jabber_groups(pk):
try: try:
OpenfireManager.update_user_groups(authserviceinfo.jabber_username, authserviceinfo.jabber_password, groups) OpenfireManager.update_user_groups(authserviceinfo.jabber_username, authserviceinfo.jabber_password, groups)
except: 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) raise self.retry(countdown = 60 * 10)
logger.debug("Updated user %s jabber groups." % user) logger.debug("Updated user %s jabber groups." % user)
@ -85,7 +85,7 @@ def update_mumble_groups(pk):
try: try:
MumbleManager.update_groups(authserviceinfo.mumble_username, groups) MumbleManager.update_groups(authserviceinfo.mumble_username, groups)
except: 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) raise self.retry(countdown = 60 * 10)
logger.debug("Updated user %s mumble groups." % user) logger.debug("Updated user %s mumble groups." % user)
@ -103,7 +103,7 @@ def update_forum_groups(pk):
try: try:
Phpbb3Manager.update_groups(authserviceinfo.forum_username, groups) Phpbb3Manager.update_groups(authserviceinfo.forum_username, groups)
except: 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) raise self.retry(countdown = 60 * 10)
logger.debug("Updated user %s forum groups." % user) logger.debug("Updated user %s forum groups." % user)
@ -121,7 +121,7 @@ def update_ipboard_groups(pk):
try: try:
IPBoardManager.update_groups(authserviceinfo.ipboard_username, groups) IPBoardManager.update_groups(authserviceinfo.ipboard_username, groups)
except: 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) raise self.retry(countdown = 60 * 10)
logger.debug("Updated user %s ipboard groups." % user) logger.debug("Updated user %s ipboard groups." % user)
@ -157,7 +157,7 @@ def update_discord_groups(pk):
try: try:
DiscordManager.update_groups(authserviceinfo.discord_uid, groups) DiscordManager.update_groups(authserviceinfo.discord_uid, groups)
except: 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) raise self.retry(countdown = 60 * 10)
logger.debug("Updated user %s discord groups." % user) logger.debug("Updated user %s discord groups." % user)
@ -412,12 +412,11 @@ def run_api_refresh():
refresh_api(api_key_pair) refresh_api(api_key_pair)
except evelink.api.APIError as e: except evelink.api.APIError as e:
if int(e.code) >= 500: if int(e.code) >= 500:
logger.error("EVE API servers encountered an error. Aborting API updates") logger.error("EVE API servers encountered error %s updating %s" % (e.code, api_key_pair))
return
elif int(e.code) == 221: 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: 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_characters_by_api_id(api_key_pair.api_id, user.id)
EveManager.delete_api_key_pair(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") 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")

19
corputils/views.py
View File

@ -23,8 +23,6 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
@login_required @login_required
def corp_member_view(request, corpid = None): def corp_member_view(request, corpid = None):
logger.debug("corp_member_view called by user %s" % request.user) 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: if not settings.IS_CORP:
alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID) alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance) alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
membercorp_list = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps] membercorplist = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps]
membercorp_list.sort(key=lambda tup: tup[1]) membercorplist.sort(key=lambda tup: tup[1])
membercorp_id_list = [int(membercorp.corporation_id) for membercorp in alliancecorps] 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 user_corp_id = None
if not corpid: if not corpid:
@ -52,7 +55,7 @@ def corp_member_view(request, corpid = None):
elif user_corp_id: elif user_corp_id:
corpid = user_corp_id corpid = user_corp_id
else: else:
corpid = membercorp_list[0][0] corpid = membercorplist[0][0]
corp = EveCorporationInfo.objects.get(corporation_id=corpid) corp = EveCorporationInfo.objects.get(corporation_id=corpid)
Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist", "apilist"]) 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)) n_unacounted = corp.member_count - (num_registered_characters + len(characters_without_api))
if not settings.IS_CORP: if not settings.IS_CORP:
context = {"membercorp_list": membercorp_list, context = {"membercorplist": membercorplist,
"corp": corp, "corp": corp,
"characters_with_api": sorted(characters_with_api.items()), "characters_with_api": sorted(characters_with_api.items()),
'n_registered': num_registered_characters, 'n_registered': num_registered_characters,

8
stock/templates/registered/corputils.html
View File

@ -45,13 +45,13 @@
<nav class="navbar navbar-default"> <nav class="navbar navbar-default">
<div class="container-fluid"> <div class="container-fluid">
<ul class="nav navbar-nav navbar-wide"> <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"> <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"> <ul class="dropdown-menu scrollable">
{% for membercorp_id, membercorp_name in membercorp_list %} {% for membercorpid, membercorpname in membercorplist %}
<li> <li>
<a href="/corputils/{{ membercorp_id }}">{{ membercorp_name }}</a> <a href="/corputils/{{ membercorpid }}">{{ membercorpname }}</a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>