diff --git a/disaster_recovery/api/rest/urls.py b/disaster_recovery/api/rest/urls.py index ea2d124..429c718 100644 --- a/disaster_recovery/api/rest/urls.py +++ b/disaster_recovery/api/rest/urls.py @@ -23,8 +23,8 @@ import rest_api urlpatterns = patterns( '', - url(r'^api/clients$', rest_api.Clients.as_view(), name="api_clients"), - url(r'^api/actions$', rest_api.ActionList.as_view(), name="api_actions"), + url(r'^api/clients/$', rest_api.Clients.as_view(), name="api_clients"), + url(r'^api/actions/$', rest_api.ActionList.as_view(), name="api_actions"), url(r'^api/actions/job/(?P[^/]+)?$', rest_api.Actions.as_view(), name="api_actions_in_job"), ) diff --git a/disaster_recovery/backups/templates/backups/restore.html b/disaster_recovery/backups/templates/backups/restore.html index 3bfaea8..483144e 100644 --- a/disaster_recovery/backups/templates/backups/restore.html +++ b/disaster_recovery/backups/templates/backups/restore.html @@ -1,3 +1,4 @@ + diff --git a/disaster_recovery/jobs/templates/jobs/_actions.html b/disaster_recovery/jobs/templates/jobs/_actions.html index df68a29..9a60476 100644 --- a/disaster_recovery/jobs/templates/jobs/_actions.html +++ b/disaster_recovery/jobs/templates/jobs/_actions.html @@ -48,4 +48,5 @@ {{ step.get_help_text }} + diff --git a/disaster_recovery/static/freezer/js/freezer.common.js b/disaster_recovery/static/freezer/js/freezer.common.js new file mode 100644 index 0000000..c456054 --- /dev/null +++ b/disaster_recovery/static/freezer/js/freezer.common.js @@ -0,0 +1,22 @@ +var Browser = (function () { + + var url_path = $(location).attr("pathname"); + + var url = null; + url = $(location).attr("protocol"); + url += "//"; + url += $(location).attr("host"); + + if (url_path.indexOf("horizon") > -1) { + url += '/horizon/disaster_recovery/api/'; + } else { + url += '/disaster_recovery/api/'; + } + + return { + get_url : function () { + return url; + } + } + +})(); diff --git a/disaster_recovery/static/freezer/js/freezer.jobs.sortable.js b/disaster_recovery/static/freezer/js/freezer.jobs.sortable.js index 667c717..48b3be7 100644 --- a/disaster_recovery/static/freezer/js/freezer.jobs.sortable.js +++ b/disaster_recovery/static/freezer/js/freezer.jobs.sortable.js @@ -30,22 +30,23 @@ $("form").submit(function (event) { var job_id = $('#id_job_id').val(); -function get_url() { - var url = $(location).attr("href"); - url += 'api/actions/job/'; - url += job_id; - return url; +function actions_in_job_url() { + var url = Browser.get_url(); + url += 'actions/job/'; + url += job_id; + return url; } -function get_actions_url() { - var url = $(location).attr("href"); - url += 'api/actions'; - return url; + +function actions_url() { + var url = Browser.get_url(); + url += 'actions/'; + return url; } if (job_id !== "") { $.ajax({ - url: get_url(), + url: actions_in_job_url(), type: "GET", cache: false, dataType: 'json', @@ -71,10 +72,8 @@ if (job_id !== "") { } }); } else { - var url = get_actions_url(); - $.ajax({ - url: url, + url: actions_url(), type: "GET", cache: false, dataType: 'json', diff --git a/disaster_recovery/static/freezer/js/freezer.restore.js b/disaster_recovery/static/freezer/js/freezer.restore.js index 223eeda..7c0e265 100644 --- a/disaster_recovery/static/freezer/js/freezer.restore.js +++ b/disaster_recovery/static/freezer/js/freezer.restore.js @@ -18,11 +18,15 @@ "use strict"; -var url = $(location).attr("origin"); -url += '/disaster_recovery/api/clients'; + +function get_url() { + var url = Browser.get_url(); + url += 'clients/'; + return url; +} $.ajax({ - url: url, + url: get_url(), type: "GET", cache: false, dataType: 'json',