diff --git a/circle/dashboard/static/dashboard/node-details.js b/circle/dashboard/static/dashboard/node-details.js index cb5a17d..51c95f0 100644 --- a/circle/dashboard/static/dashboard/node-details.js +++ b/circle/dashboard/static/dashboard/node-details.js @@ -48,9 +48,7 @@ function changeNodeStatus(data) { if(!data['redirect']) { selected = []; addMessage(re['message'], 'success'); - $('a[data-'+data['type']+'-pk="' + data['pk'] + '"]').closest('tr').fadeOut(function() { - $(this).remove(); - }); + } else { window.location.replace('/dashboard'); } diff --git a/circle/dashboard/static/dashboard/node-list.js b/circle/dashboard/static/dashboard/node-list.js index 6ed516e..e452920 100644 --- a/circle/dashboard/static/dashboard/node-list.js +++ b/circle/dashboard/static/dashboard/node-list.js @@ -132,9 +132,8 @@ $(function() { return false; }); - function enabletableSuccess(unit){ - var tr= $(unit).closest("tr"); - var tspan=tr.children('.enabled').children(); + function statuschangeSuccess(tr){ + var tspan=tr.children('.enabled').children(); var buttons=tr.children('.actions').children('.btn-group').children('.dropdown-menu').children('li').children('.node-enable'); buttons.each(function(index){ @@ -158,29 +157,10 @@ $(function() { colortable(); } - function enabledetailsSuccess(){ - - // change big status span - $('#node-info-pane').load(location.href+" #node-info-data"); - $('#activity-timeline-wrapper').load(location.href+" #activity-timeline"); - } $('#table_container').on('click','.node-enable',function() { - enablenode($(this).attr('data-node-pk'), $(this).attr('data-status'),enabletableSuccess,this); - return false; - }); - -// on node details, change node status, with calling enable node, refresh status span, resources div - $('#node-info-pane').on('click','.node-enable',function(){ - // post, change node status - enablenode($(this).attr('data-node-pk'),$(this).attr('data-status'),enabledetailsSuccess); - - return false; - }); - - - // enabling / disabling node - function enablenode(pk,new_status,onsuccess,params) { + var tr= $(this).closest("tr"); + var pk =$(this).attr('data-node-pk'); var url = '/dashboard/node/' + pk + '/'; $.ajax({ method: 'POST', @@ -188,13 +168,18 @@ $(function() { data: {'change_status':''}, headers: {"X-CSRFToken": getCookie('csrftoken')}, success: function(data, textStatus, xhr) { - onsuccess(params); + statuschangeSuccess(tr); }, error: function(xhr, textStatus, error) { addMessage("Error!", "danger"); } }); return false; + }); + + + // enabling / disabling node + function enablenode(pk,new_status,onsuccess,params) { }