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

Fixed a bug with links not registering correctly when undocked. Also removed some typos. (#418)

Browse Source
This commit is contained in:
Joakim Strandberg 2016-05-01 11:39:07 +02:00 committed by Mr McClain
parent fa05003455
commit dbc9b584d1
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fleetactivitytracking/views.py
View File

@ -158,7 +158,10 @@ def click_fatlink_view(request, hash, fatname):
if character: if character:
fat = Fat() fat = Fat()
fat.system = request.META['HTTP_EVE_SOLARSYSTEMNAME'] fat.system = request.META['HTTP_EVE_SOLARSYSTEMNAME']
fat.station = request.META['HTTP_EVE_STATIONNAME'] if 'HTTP_EVE_STATIONNAME' in request.META:
fat.station = request.META['HTTP_EVE_STATIONNAME']
else:
fat.station = "No Station"
fat.shiptype = request.META['HTTP_EVE_SHIPTYPENAME'] fat.shiptype = request.META['HTTP_EVE_SHIPTYPENAME']
fat.fatlink = fatlink fat.fatlink = fatlink
fat.character = character fat.character = character

2
stock/templates/public/characternotexisting.html
View File

@ -26,7 +26,7 @@
</style> </style>
</head> </head>
<body onload="CCPEVE.requestTrust({{ DOMAIN }})"> <body onload=CCPEVE.requestTrust('{{ DOMAIN }}')>
<div id="wrapper"> <div id="wrapper">
<!-- Navigation --> <!-- Navigation -->

4
stock/templates/public/clickfatlinkview.html
View File

@ -26,7 +26,7 @@
</style> </style>
</head> </head>
<body onload=CCPEVE.requestTrust('{{ DOMAIN }}*')> <body onload=CCPEVE.requestTrust('{{ DOMAIN }}')>
<div id="wrapper"> <div id="wrapper">
<!-- Navigation --> <!-- Navigation -->
@ -59,7 +59,7 @@
<div class="col-lg-12"> <div class="col-lg-12">
{% if registered %}<h1 class="page-header text-center">Fleet registered!</h1> {% elif expired%}<h1 class="page-header text-center">This link has expired.</h1> {% elif errormessages%}<h1 class="page-header text-center">Something unhappened occured.</h1>{% else %}<h1 class="page-header text-center">Invalid link.</h1>{% endif %} {% if registered %}<h1 class="page-header text-center">Fleet registered!</h1> {% elif expired%}<h1 class="page-header text-center">This link has expired.</h1> {% elif errormessages%}<h1 class="page-header text-center">Something horrible happened. Shoot your FC!</h1>{% else %}<h1 class="page-header text-center">Invalid link.</h1>{% endif %}
<div class="col-lg-12 container" id="example"> <div class="col-lg-12 container" id="example">
{% for message in errormessages %} {% for message in errormessages %}
<div class="alert alert-danger" role="alert">{{ message }}</div> <div class="alert alert-danger" role="alert">{{ message }}</div>

2
stock/templates/registered/fatlinkmodify.html
View File

@ -30,7 +30,7 @@
<tr> <tr>
<td class="text-center">{{ fat.user }}</td> <td class="text-center">{{ fat.user }}</td>
<td class="text-center">{{ fat.character.character_name }}</td> <td class="text-center">{{ fat.character.character_name }}</td>
{% if fat.station != "None" %} {% if fat.station != "No Station" %}
<td class="text-center">Docked in {{ fat.system }}</td> <td class="text-center">Docked in {{ fat.system }}</td>
{% else %} {% else %}
<td class="text-center">{{ fat.system }}</td> <td class="text-center">{{ fat.system }}</td>

2
stock/templates/registered/fatlinkview.html
View File

@ -33,7 +33,7 @@
<tr> <tr>
<td class="text-center">{{ fat.fatlink.name }}</td> <td class="text-center">{{ fat.fatlink.name }}</td>
<td class="text-center">{{ fat.character.character_name }}</td> <td class="text-center">{{ fat.character.character_name }}</td>
{% if fat.station != "None" %} {% if fat.station != "No Station" %}
<td class="text-center">Docked in {{ fat.system }}</td> <td class="text-center">Docked in {{ fat.system }}</td>
{% else %} {% else %}
<td class="text-center">{{ fat.system }}</td> <td class="text-center">{{ fat.system }}</td>