From 0ea6f754b49d2d4ee3a3e7cbb7d04f9a3005494b Mon Sep 17 00:00:00 2001
From: "Eric A. Miller" <emiller@cpan.org>
Date: Wed, 16 Jul 2014 20:00:39 -0400
Subject: [PATCH] Custom path handling for DataTables ajax calls

---
 Netdisco/Changes                                        | 6 ++++++
 Netdisco/share/views/ajax/admintask/userlog.tt          | 2 +-
 Netdisco/share/views/ajax/report/apradiochannelpower.tt | 2 +-
 Netdisco/share/views/ajax/report/devicepoestatus.tt     | 2 +-
 Netdisco/share/views/ajax/report/moduleinventory.tt     | 2 +-
 Netdisco/share/views/ajax/report/netbios.tt             | 2 +-
 Netdisco/share/views/ajax/report/nodevendor.tt          | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 073cf14d..fb307c9b 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.028005
+
+  [BUG FIXES]
+
+  * Custom path handling for DataTables ajax calls
+
 2.028004 - 2014-07-16
 
   [BUG FIXES]
diff --git a/Netdisco/share/views/ajax/admintask/userlog.tt b/Netdisco/share/views/ajax/admintask/userlog.tt
index 1b9efd11..d4f04c65 100644
--- a/Netdisco/share/views/ajax/admintask/userlog.tt
+++ b/Netdisco/share/views/ajax/admintask/userlog.tt
@@ -25,7 +25,7 @@ $(document).ready(function() {
     },
     "serverSide": true,
     "order": [[ 0, "desc" ]],
-    "ajax": "/ajax/control/admin/userlog/data",
+    "ajax": "[% uri_for('/ajax/control/admin/userlog/data') %]",
     "columns": [{
       "data": 'creation',
       "className": "nd_center-cell",
diff --git a/Netdisco/share/views/ajax/report/apradiochannelpower.tt b/Netdisco/share/views/ajax/report/apradiochannelpower.tt
index 94a469b3..5ba05093 100644
--- a/Netdisco/share/views/ajax/report/apradiochannelpower.tt
+++ b/Netdisco/share/views/ajax/report/apradiochannelpower.tt
@@ -45,7 +45,7 @@ $(document).ready(function() {
       "search": 'Filter records: '
     },
     "serverSide": true,
-    "ajax": '/ajax/content/report/apradiochannelpower/data',
+    "ajax": "[% uri_for('/ajax/content/report/apradiochannelpower/data') %]",
     "order": [[ 0, 'asc' ]],
     "columns": [
       {
diff --git a/Netdisco/share/views/ajax/report/devicepoestatus.tt b/Netdisco/share/views/ajax/report/devicepoestatus.tt
index a162e21e..bdcaecdf 100644
--- a/Netdisco/share/views/ajax/report/devicepoestatus.tt
+++ b/Netdisco/share/views/ajax/report/devicepoestatus.tt
@@ -71,7 +71,7 @@ $(document).ready(function() {
       "search": 'Filter records: '
     },
     "serverSide": true,
-    "ajax": '/ajax/content/report/devicepoestatus/data',
+    "ajax": "[% uri_for('/ajax/content/report/devicepoestatus/data') %]",
     "order": [[ 0, 'asc' ]],
     "columns": [
       {
diff --git a/Netdisco/share/views/ajax/report/moduleinventory.tt b/Netdisco/share/views/ajax/report/moduleinventory.tt
index b84b96bd..be393121 100644
--- a/Netdisco/share/views/ajax/report/moduleinventory.tt
+++ b/Netdisco/share/views/ajax/report/moduleinventory.tt
@@ -40,7 +40,7 @@ $(document).ready(function() {
     "serverSide": true,
     "searching": false,
     "order": [[ 0, "desc" ]],
-    "ajax": '/ajax/content/report/moduleinventory/data?[% url(params('query').hash) %]',
+    "ajax": "[% uri_for('/ajax/content/report/moduleinventory/data') %]?[% url(params('query').hash) %]",
     "columns": [
       {
       "data": 'ip',
diff --git a/Netdisco/share/views/ajax/report/netbios.tt b/Netdisco/share/views/ajax/report/netbios.tt
index 3a30f3c6..964d949b 100644
--- a/Netdisco/share/views/ajax/report/netbios.tt
+++ b/Netdisco/share/views/ajax/report/netbios.tt
@@ -35,7 +35,7 @@ $(document).ready(function() {
     [% IF opt %]
     "serverSide": true,
     "order": [[ 0, "desc" ]],
-    "ajax": '/ajax/content/report/netbios/data?[% url(params('query').hash) %]',
+    "ajax": "[% uri_for('/ajax/content/report/netbios/data') %]?[% url(params('query').hash) %]",
     "columns": [
       {
         "data": 'domain',
diff --git a/Netdisco/share/views/ajax/report/nodevendor.tt b/Netdisco/share/views/ajax/report/nodevendor.tt
index 22b01bf5..dade6972 100644
--- a/Netdisco/share/views/ajax/report/nodevendor.tt
+++ b/Netdisco/share/views/ajax/report/nodevendor.tt
@@ -35,7 +35,7 @@ $(document).ready(function() {
     [% IF opt %]
     "serverSide": true,
     "order": [[ 0, "desc" ]],
-    "ajax": '/ajax/content/report/nodevendor/data?[% url(params('query').hash) %]',
+    "ajax": "[% uri_for('/ajax/content/report/nodevendor/data') %]?[% url(params('query').hash) %]",
     "columns": [
       {
         "data": 'mac',