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 #344 from Ydmir/master

Browse Source 
Members of blue corp can now see their own corp-page in corputils ...
This commit is contained in:
Adarnof 2016-04-01 21:11:14 -04:00
commit 6749b443a1
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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>