From 1bddd038fe1e566cb5ab1c270cdb1ae5903805a8 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Mon, 23 Jan 2017 16:25:05 -0500
Subject: [PATCH] Fixes #840: Correct API path resolution for secrets when
 BASE_PATH is configured

---
 netbox/project-static/js/secrets.js | 4 ++--
 netbox/templates/_base.html         | 3 +++
 netbox/templates/dcim/device.html   | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/netbox/project-static/js/secrets.js b/netbox/project-static/js/secrets.js
index fadcc0d39..22710236b 100644
--- a/netbox/project-static/js/secrets.js
+++ b/netbox/project-static/js/secrets.js
@@ -48,7 +48,7 @@ $(document).ready(function() {
     $('#generate_keypair').click(function() {
         $('#new_keypair_modal').modal('show');
         $.ajax({
-            url: '/api/secrets/generate-keys/',
+            url: netbox_api_path + 'secrets/generate-keys/',
             type: 'GET',
             dataType: 'json',
             success: function (response, status) {
@@ -75,7 +75,7 @@ $(document).ready(function() {
     function unlock_secret(secret_id, private_key) {
         var csrf_token = $('input[name=csrfmiddlewaretoken]').val();
         $.ajax({
-            url: '/api/secrets/secrets/' + secret_id + '/',
+            url: netbox_api_path + 'secrets/secrets/' + secret_id + '/',
             type: 'POST',
             data: {
                 private_key: private_key
diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index 9ef5ef4eb..4e63cf337 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -296,6 +296,9 @@
             </div>
 		</div>
 	</footer>
+<script type="text/javascript">
+    var netbox_api_path = "/{{ settings.BASE_PATH }}api/";
+</script>
 <script src="{% static 'js/jquery-2.1.4.min.js' %}"></script>
 <script src="{% static 'jquery-ui-1.11.4/jquery-ui.min.js' %}"></script>
 <script src="{% static 'bootstrap-3.3.6-dist/js/bootstrap.min.js' %}"></script>
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 53273da47..0ce898e01 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -550,7 +550,7 @@
 function toggleConnection(elem, api_url) {
     if (elem.hasClass('connected')) {
         $.ajax({
-            url: api_url + elem.attr('data') + "/",
+            url: netbox_api_path + api_url + elem.attr('data') + "/",
             method: 'PATCH',
             dataType: 'json',
             beforeSend: function(xhr, settings) {
@@ -590,13 +590,13 @@ function toggleConnection(elem, api_url) {
     return false;
 }
 $(".consoleport-toggle").click(function() {
-    return toggleConnection($(this), "/{{ settings.BASE_PATH }}api/dcim/console-ports/");
+    return toggleConnection($(this), "dcim/console-ports/");
 });
 $(".powerport-toggle").click(function() {
-    return toggleConnection($(this), "/{{ settings.BASE_PATH }}api/dcim/power-ports/");
+    return toggleConnection($(this), "dcim/power-ports/");
 });
 $(".interface-toggle").click(function() {
-    return toggleConnection($(this), "/{{ settings.BASE_PATH }}api/dcim/interface-connections/");
+    return toggleConnection($(this), "dcim/interface-connections/");
 });
 </script>
 <script src="{% static 'js/graphs.js' %}"></script>