diff --git a/fleetactivitytracking/views.py b/fleetactivitytracking/views.py index e4b21fbe..1935965b 100644 --- a/fleetactivitytracking/views.py +++ b/fleetactivitytracking/views.py @@ -158,7 +158,10 @@ def click_fatlink_view(request, hash, fatname): if character: fat = Fat() 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.fatlink = fatlink fat.character = character diff --git a/stock/templates/public/characternotexisting.html b/stock/templates/public/characternotexisting.html index 77dfd523..aa4159f1 100644 --- a/stock/templates/public/characternotexisting.html +++ b/stock/templates/public/characternotexisting.html @@ -26,7 +26,7 @@ - +
diff --git a/stock/templates/public/clickfatlinkview.html b/stock/templates/public/clickfatlinkview.html index a344a44f..4bdfcde2 100644 --- a/stock/templates/public/clickfatlinkview.html +++ b/stock/templates/public/clickfatlinkview.html @@ -26,7 +26,7 @@ - +
@@ -59,7 +59,7 @@
- {% if registered %}

Fleet registered!

{% elif expired%}

This link has expired.

{% elif errormessages%}

Something unhappened occured.

{% else %}

Invalid link.

{% endif %} + {% if registered %}

Fleet registered!

{% elif expired%}

This link has expired.

{% elif errormessages%}

Something horrible happened. Shoot your FC!

{% else %}

Invalid link.

{% endif %}
{% for message in errormessages %} diff --git a/stock/templates/registered/fatlinkmodify.html b/stock/templates/registered/fatlinkmodify.html index 02501414..3f37b979 100644 --- a/stock/templates/registered/fatlinkmodify.html +++ b/stock/templates/registered/fatlinkmodify.html @@ -30,7 +30,7 @@ {{ fat.user }} {{ fat.character.character_name }} - {% if fat.station != "None" %} + {% if fat.station != "No Station" %} Docked in {{ fat.system }} {% else %} {{ fat.system }} diff --git a/stock/templates/registered/fatlinkview.html b/stock/templates/registered/fatlinkview.html index a784564f..28cd2c59 100644 --- a/stock/templates/registered/fatlinkview.html +++ b/stock/templates/registered/fatlinkview.html @@ -33,7 +33,7 @@ {{ fat.fatlink.name }} {{ fat.character.character_name }} - {% if fat.station != "None" %} + {% if fat.station != "No Station" %} Docked in {{ fat.system }} {% else %} {{ fat.system }}