Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-06 23:26:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use local swagger spec files (#866)

Browse Source 
Allows auth to keep working if CCP changes "latest" definition.
Requires adarnauth-esi>=1.4
This commit is contained in:
Adarnof
2017-09-17 01:08:02 -04:00
committed by GitHub
parent 9d90af4a3d
commit eee6a9132d
9 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fleetactivitytracking/swagger.json Normal file
View File

File diff suppressed because one or more lines are too long

2
fleetactivitytracking/templates/fleetactivitytracking/fatlinkmodify.html
View File

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

2
fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html
View File

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

10
fleetactivitytracking/views.py
View File

@@ -16,16 +16,15 @@ from eveonline.managers import EveManager
from authentication.models import AuthServicesInfo
from fleetactivitytracking.forms import FatlinkForm
from fleetactivitytracking.models import Fatlink, Fat
from esi.decorators import token_required
from slugify import slugify
import string
import random
import datetime
import logging
import os
SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
logger = logging.getLogger(__name__)
@@ -256,7 +255,7 @@ def click_fatlink_view(request, token, hash, fatname):
if character:
# get data
c = token.get_esi_client(Location='v1', Universe='v2')
c = token.get_esi_client(spec_file=SWAGGER_SPEC_PATH)
location = c.Location.get_characters_character_id_location(character_id=token.character_id).result()
ship = c.Location.get_characters_character_id_ship(character_id=token.character_id).result()
location['solar_system_name'] = \
@@ -266,7 +265,6 @@ def click_fatlink_view(request, token, hash, fatname):
location['station_name'] = \
c.Universe.get_universe_stations_station_id(station_id=location['station_id']).result()['name']
elif location['structure_id']:
c = token.get_esi_client(Universe='v1')
location['station_name'] = \
c.Universe.get_universe_structures_structure_id(structure_id=location['structure_id']).result()[
'name']