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

Show Observation discussion only on production

merge-requests/154/head
Nikos Roussos 2015-09-02 18:34:37 +03:00
parent 0ab83c1909
commit f204d36fb2
2 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
network/base/views.py
View File

@ -1,4 +1,3 @@
import json
import urllib2
import ephem
from datetime import datetime, timedelta
@ -212,25 +211,29 @@ def observation_view(request, id):
"""View for single observation page."""
observation = get_object_or_404(Observation, id=id)
data = Data.objects.filter(observation=observation)
discuss_slug = 'https://community.satnogs.org/t/observation-{0}-{1}-{2}' \
.format(observation.id, slugify(observation.satellite.name),
observation.satellite.norad_cat_id)
discuss_url = ('https://community.satnogs.org/new-topic?title=Observation {0}: {1} ({2})'
'&body=Regarding [Observation {3}](http://{4}{5}) ...&category=observations') \
.format(observation.id, observation.satellite.name,
observation.satellite.norad_cat_id, observation.id,
request.get_host(), request.path)
try:
apiurl = '{0}.json'.format(discuss_slug)
urllib2.urlopen(apiurl).read()
has_comments = True
except:
has_comments = False
if settings.ENVIRONMENT == 'production':
discuss_slug = 'https://community.satnogs.org/t/observation-{0}-{1}-{2}' \
.format(observation.id, slugify(observation.satellite.name),
observation.satellite.norad_cat_id)
discuss_url = ('https://community.satnogs.org/new-topic?title=Observation {0}: {1} ({2})'
'&body=Regarding [Observation {3}](http://{4}{5}) ...&category=observations') \
.format(observation.id, observation.satellite.name,
observation.satellite.norad_cat_id, observation.id,
request.get_host(), request.path)
try:
apiurl = '{0}.json'.format(discuss_slug)
urllib2.urlopen(apiurl).read()
has_comments = True
except:
has_comments = False
return render(request, 'base/observation_view.html',
{'observation': observation, 'data': data, 'has_comments': has_comments,
'discuss_url': discuss_url, 'discuss_slug': discuss_slug})
return render(request, 'base/observation_view.html',
{'observation': observation, 'data': data, 'has_comments': has_comments,
'discuss_url': discuss_url, 'discuss_slug': discuss_slug})
{'observation': observation, 'data': data})
@login_required

20
network/templates/base/observation_view.html
View File

@ -79,15 +79,17 @@
<h3>Data</h3>
</div>
<div class="col-md-6 text-right">
<h3>
<a id="obs-discuss"
data-slug="{{ discuss_slug }}"
href="{% if has_comments %}{{ discuss_slug }}{% else %}{{ discuss_url }}{% endif %}"
class="btn btn-primary" target="_blank">
<span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
Discuss Observation
</a>
</h3>
{% if discuss_slug %}
<h3>
<a id="obs-discuss"
data-slug="{{ discuss_slug }}"
href="{% if has_comments %}{{ discuss_slug }}{% else %}{{ discuss_url }}{% endif %}"
class="btn btn-primary" target="_blank">
<span class="glyphicon glyphicon-comment" aria-hidden="true"></span>
Discuss Observation
</a>
</h3>
{% endif %}
</div>
</div>