automatic reload on lists; new django decorator for ajax request
Change-Id: I3eb41de76217191268acb6053ad0c04aec0e8388
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/static/src/instancehandler/instance_list.js b/static/src/instancehandler/instance_list.js
index c53c0b4..fa9bef4 100644
--- a/static/src/instancehandler/instance_list.js
+++ b/static/src/instancehandler/instance_list.js
@@ -14,28 +14,27 @@
limitations under the License.
*/
-function performAction(url) {
+function performAction(instance_name, instance_id) {
+ var url = '/instances/ns/'+instance_id+'/action';
$("#formActionNS").attr("action", url);
$('#modal_instance_new_action').modal('show');
}
-function exportMetricNs(url) {
- console.log(url)
+function exportMetricNs(instance_name, instance_id) {
+ var url = '/instances/ns/'+instance_id+'/monitoring/metric';
$("#formExportMetricNS").attr("action", url);
$('#modal_instance_export_metric').modal('show');
}
-function showInstanceTopology(url) {
- window.location.href = url;
-}
-
-function newAlarmNs(url) {
+function newAlarmNs(instance_name, instance_id) {
+ var url = '/instances/ns/'+instance_id+'/monitoring/alarm';
$("#formAlarmNS").attr("action", url);
$('#modal_instance_new_alarm').modal('show');
}
-function deleteNs(url, force) {
- bootbox.confirm("Are you sure want to delete?", function (result) {
+function deleteNs(instance_name, instance_id, force) {
+ var url = '/instances/ns/'+instance_id+'/delete';
+ bootbox.confirm("Are you sure want to delete " + instance_name + "?", function (result) {
if (result) {
if (force)
url = url + '?force=true';
@@ -88,7 +87,8 @@
$formGroup.remove();
};
-function showInstanceDetails(url_info) {
+function showInstanceDetails(type, instance_id) {
+ var url_info = '/instances/'+type+'/'+instance_id;
var dialog = bootbox.dialog({
message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
closeButton: true
diff --git a/static/src/instancehandler/instance_operations_list.js b/static/src/instancehandler/instance_operations_list.js
index 705fce2..d85ebcf 100644
--- a/static/src/instancehandler/instance_operations_list.js
+++ b/static/src/instancehandler/instance_operations_list.js
@@ -15,7 +15,8 @@
*/
-function showOperationDetails(url_info) {
+function showOperationDetails(instance_id, operation_id) {
+ var url_info = '/instances/ns/'+instance_id+'/operation/' + operation_id;
var dialog = bootbox.dialog({
message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
closeButton: true
diff --git a/static/src/projecthandler/descriptorslist.js b/static/src/projecthandler/descriptorslist.js
index d6ee937..c85603c 100644
--- a/static/src/projecthandler/descriptorslist.js
+++ b/static/src/projecthandler/descriptorslist.js
@@ -1,11 +1,11 @@
function deletePackage(descriptor_type, package_id) {
- var dialog = bootbox.dialog({
- message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
- closeButton: true
- });
+
bootbox.confirm("Are you sure want to delete?", function (result) {
if (result) {
-
+ var dialog = bootbox.dialog({
+ message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
+ closeButton: true
+ });
$.ajax({
url: '/projects/descriptors/' + descriptor_type + '/' + package_id + '/delete',
type: 'GET',
diff --git a/static/src/sdnctrlhandler/sdn_list.js b/static/src/sdnctrlhandler/sdn_list.js
index 013cb6f..5542825 100644
--- a/static/src/sdnctrlhandler/sdn_list.js
+++ b/static/src/sdnctrlhandler/sdn_list.js
@@ -1,5 +1,5 @@
-function deleteSDN(sdn_uuid) {
- bootbox.confirm("Are you sure want to delete?", function (result) {
+function deleteSDN(sdn_uuid, name) {
+ bootbox.confirm("Are you sure want to delete " + name +"?", function (result) {
if (result) {
var dialog = bootbox.dialog({
message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
diff --git a/static/src/userhandler/user_list.js b/static/src/userhandler/user_list.js
index 282c314..88f4770 100644
--- a/static/src/userhandler/user_list.js
+++ b/static/src/userhandler/user_list.js
@@ -26,8 +26,9 @@
$('#modal_new_user').modal('show');
}
-function deleteUser(delete_url) {
- bootbox.confirm("Are you sure want to delete?", function (confirm) {
+function deleteUser(user_id, name) {
+ var delete_url = '/admin/users/'+user_id+'/delete';
+ bootbox.confirm("Are you sure want to delete "+name+"?", function (confirm) {
if (confirm) {
var dialog = bootbox.dialog({
message: '<div class="text-center"><i class="fa fa-spin fa-spinner"></i> Loading...</div>',
diff --git a/static/src/utils.js b/static/src/utils.js
index 83b580c..6763f78 100644
--- a/static/src/utils.js
+++ b/static/src/utils.js
@@ -2,8 +2,8 @@
return ("0000" + (Math.random() * Math.pow(36, 4) << 0).toString(36)).slice(-4)
}
-function openProject(pId) {
- window.location.href = '/projects/' + pId;
+function moveToLogin(next) {
+ window.location.href = (next) ? "/auth/?next="+next : '/auth/';
}