From dc11d4d081210fcb4b693e8477d63750d4880fab Mon Sep 17 00:00:00 2001
From: James Graham <J.Graham@software.ac.uk>
Date: Thu, 28 Feb 2019 10:18:22 +0000
Subject: [PATCH] Add full api endpoint including protocol and hostname to API
explorer
resolves #66
---
.../templates/datasources/datasource/explorer.html | 2 +-
datasources/views/datasource.py | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/datasources/templates/datasources/datasource/explorer.html b/datasources/templates/datasources/datasource/explorer.html
index dff92cd..1f215b0 100644
--- a/datasources/templates/datasources/datasource/explorer.html
+++ b/datasources/templates/datasources/datasource/explorer.html
@@ -156,7 +156,7 @@
</form>
<div class="alert alert-info w-100">
- Query URL: /api/datasources/{{ datasource.pk }}/<span id="datasetUrlSpan"></span>data/?<span id="queryParamSpan"></span>
+ Query URL: {{ api_url }}<span id="datasetUrlSpan"></span>data/?<span id="queryParamSpan"></span>
</div>
<table class="table" id="tableParams">
diff --git a/datasources/views/datasource.py b/datasources/views/datasource.py
index 717dc4f..76ff48f 100644
--- a/datasources/views/datasource.py
+++ b/datasources/views/datasource.py
@@ -47,7 +47,7 @@ class DataSourceDetailView(DetailView):
context['api_url'] = (
'https://' if self.request.is_secure() else 'http://' +
self.request.get_host() +
- '/api/datasources/{0}/data/'.format(self.object.pk)
+ '/api/datasources/{0}/'.format(self.object.pk)
)
return context
@@ -204,4 +204,10 @@ class DataSourceExplorerView(HasPermissionLevelMixin, DetailView):
field__short_name='data_query_param'
).values_list('value', flat=True)
+ context['api_url'] = (
+ 'https://' if self.request.is_secure() else 'http://' +
+ self.request.get_host() +
+ '/api/datasources/{0}/'.format(self.object.pk)
+ )
+
return context
--
GitLab