Restrict the information about position of hidden ships.

diff --git a/bin/djais/views.py b/bin/djais/views.py
index 32ede76d373d8e9a05985d51025e814fd37c48f3..ff436001fa8dd2bd9d6840c64bc44a738e0793d3 100644 (file)
--- a/bin/djais/views.py
+++ b/bin/djais/views.py
@@ -359,7 +359,8 @@ def vessel(request, strmmsi):
     #if not nmea.timestamp_1 and not nmea.timestamp_5:
     #    raise Http404
     is_hidden = mmsi in get_hidden_mmsi()
-    return render_to_response('vessel.html', {'nmea': nmea, 'is_hidden': is_hidden, 'form': HistoryForm()}, RequestContext(request))
+    hide_ship = is_hidden and not request.user.flag_allowhidden
+    return render_to_response('vessel.html', {'nmea': nmea, 'is_hidden': is_hidden, 'hide_ship': hide_ship,'form': HistoryForm()}, RequestContext(request))
 
 
 class VesselManualInputForm(forms.Form):

diff --git a/www_templates/vessel.html b/www_templates/vessel.html
index 1e5ba3bf0bc67b8f75baf230d9d1379f3384c6bc..14e2ffe4af5525f937c52e715ab5c4864ce71c0b 100644 (file)
--- a/www_templates/vessel.html
+++ b/www_templates/vessel.html
@@ -31,6 +31,10 @@ Beam: {{ nmea.get_width }} meters<br>
 {% endif %}
 Draught: {{ nmea.get_draught_str }}<br>
 <br>
+{% if hide_ship %}
+Sorry, access to the position of that ship is restricted. It is not available for you.
+<br>
+{% else %}
 Status: {{ nmea.get_status }}<br>
 Speed over ground: {{ nmea.get_sog_str }}<br>
 Rotation: {{ nmea.get_rot_str }}<br>
@@ -43,14 +47,15 @@ Destination: {{ nmea.get_destination }}<br>
 ETA: {{ nmea.get_eta_str }}<br>
 <br>
 Sources: position by {{ nmea.get_source_1_str }}, voyage by {{ nmea.get_source_5_str }}<br>
-{% if is_hidden %}
 <br>
+{% if is_hidden %}
 That ship is hidden and the system is set up not to share her position with other ais web sites and peers.<br>
-{% endif %}
 <br>
+{% endif %}
 <br>
 <a href=lastpos class=button>Position in google earth</a>
 <h2>Get archive data</h2>
 {% include "fragment_vessel_history.html" %}
 
+{% endif %}
 {% endblock %}