spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

Fix indentation and template in user view

environments/production/deployments/189
Alfredos-Panagiotis Damkalis 2018-08-30 00:05:04 +03:00
parent 98204d515f
commit c51b44d67d
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
network/templates/users/user_detail.html
View File

@ -215,26 +215,28 @@
</div>
{% endif %}
<!-- API Modal -->
<div class="modal fade" id="APIModal" tabindex="-1" role="dialog" aria-labelledby="APIModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="APIModalLabel">API Key</h4>
</div>
<div class="modal-body">
<div>You can use this token to interact with the API.</div>
<div>
<code>{{ token }}</code>
{% if user == request.user %}
<!-- API Modal -->
<div class="modal fade" id="APIModal" tabindex="-1" role="dialog" aria-labelledby="APIModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<h4 class="modal-title" id="APIModalLabel">API Key</h4>
</div>
<div class="modal-body">
<div>You can use this token to interact with the API.</div>
<div>
<code>{{ token }}</code>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
{% endif %}
{% include 'includes/satellite.html' %}
{% endblock content %}

10
network/users/views.py
View File

@ -42,15 +42,17 @@ def view_user(request, username):
user = get_object_or_404(User, username=username)
observations = Observation.objects.filter(author=user)[0:10]
stations = Station.objects.filter(owner=user).annotate(total_obs=Count('observations'))
token = ''
can_schedule = False
if request.user.is_authenticated():
can_schedule = schedule_perms(request.user)
try:
token = Token.objects.get(user=user)
except Token.DoesNotExist:
token = Token.objects.create(user=user)
if request.user == user:
try:
token = Token.objects.get(user=user)
except Token.DoesNotExist:
token = Token.objects.create(user=user)
form = StationForm()
antennas = Antenna.objects.all()
rigs = Rig.objects.all()