Merge pull request #130 from devGregA/master

Added has attr to URLs

Author: Greg Anderson

dojo/templates/dojo/report_builder.html

@@ -167,7 +167,7 @@ <h4>Available Widgets</h4>
 
             $(document).on('submit', 'form.finding-list', function (event) {
                 var form = this;
-                $.get('/reports/findings?' + $(this).serialize()).done(function (data) {
+                $.get("{% url 'report_findings' %}?" + $(this).serialize()).done(function (data) {
                     $(form).closest('li.finding-list').html(data);
                     setUpFindingFilters();
                 });
@@ -178,7 +178,7 @@ <h4>Available Widgets</h4>
             $(document).on('click', 'form.finding-list a.clear.centered, div.finding-pagination a', function (event) {
                 var link_href = $(this).attr('href')
                 console.log(link_href);
-                $.get('/reports/findings'+link_href).done(function (data) {
+                $.get("{% url 'report_findings' %}"+link_href).done(function (data) {
                     $('div.in-use-widgets li.finding-list').html(data);
                     setUpFindingFilters();
                 });
@@ -188,7 +188,7 @@ <h4>Available Widgets</h4>
 
             $(document).on('submit', 'form.endpoint-list', function (event) {
                 var form = this;
-                $.get('/reports/endpoints?' + $(this).serialize()).done(function (data) {
+                $.get("{% url 'report_endpoints' %}?" + $(this).serialize()).done(function (data) {
                     $(form).closest('li.endpoint-list').html(data);
                     setUpFindingFilters();
                 });
@@ -197,7 +197,7 @@ <h4>Available Widgets</h4>
             });
 
             $(document).on('click', 'form.endpoint-list a.clear.centered, div.endpoint-pagination a', function (event) {
-                $.get('/reports/endpoints').done(function (data) {
+                $.get("{% url 'report_endpoints' %}").done(function (data) {
                     $('div.in-use-widgets li.endpoint-list').html(data);
                     setUpFindingFilters();
                 });

dojo/templates/dojo/reports.html

@@ -130,7 +130,7 @@ <h3 class="has-filters">
 
         function get_report_status() {
             $('span.report_status.requested').each(function () {
-                $.get("/reports/" + this.id + "/status", function (data, status) {
+                $.get("{% url 'report_status' 0 %}".replace(0, this.id.toString()), function (data, status) {
                     if (data.status == 'success') {
                         $('span#'+data.id).removeClass('requested').addClass('alert-success');
                         $('span#'+data.id).html("<a class='btn btn-primary btn-sm' href='/reports/[id]/download'>Download <span class='fa fa-download'></span></a> <a class='btn btn-sm btn-info' href='/reports/[id]/regen'>Regenerate <span class='fa fa-refresh'></span></a> <form method='post' action='/reports/[id]/delete' style='display: inline' class='form-inline form'>{% csrf_token %}<input type='hidden' name='id' value='[id]'/><button type='submit' class='btn btn-danger btn-sm report-delete'>Delete <span class='fa fa-trash'></span></button></form>".replace(/\[id\]/g, data.id));

dojo/urls.py

@@ -60,10 +60,8 @@
 ur+= test_urls
 ur+= user_urls
 
-print >>sys.stderr, 'this is ur'
-print >>sys.stderr, ur
-
-
+if not hasattr(settings, 'URL_PREFIX'):
+    settings.URL_PREFIX = ''
 
 urlpatterns = [
     #  django admin