dashboard: move node flush ajax script to dashboard.js, modify nodelist

circle/dashboard/static/dashboard/dashboard.js

@@ -137,6 +137,20 @@ $(function () {
     return false;
     return false;
   });
   });
 
 
+  /* for Node flush buttons */
+  $('.node-flush').click(function() {
+    var node_pk = $(this).data('node-pk');
+    var dir = window.location.pathname.indexOf('list') == -1;
+    addModalConfirmation(function(){}, 
+      { 'url': '/dashboard/node/flush/' + node_pk + '/',
+        'data': [],
+        'pk': node_pk,
+        'type': "node",
+        'redirect': dir});
+
+    return false;
+  });
+
   /* for Group removes buttons */
   /* for Group removes buttons */
   $('.group-delete').click(function() {
   $('.group-delete').click(function() {
     var group_pk = $(this).data('group-pk');
     var group_pk = $(this).data('group-pk');

circle/dashboard/static/dashboard/node-details.js

@@ -61,21 +61,6 @@ function changeNodeStatus(data) {
   });
   });
 }
 }
 
 
-/* for Node flush buttons */
-  $('.node-flush').click(function() {
-    var node_pk = $(this).data('node-pk');
-    var dir = window.location.pathname.indexOf('list') == -1;
-    addModalConfirmation(changeNodeStatus, 
-      { 'url': '/dashboard/node/flush/' + node_pk + '/',
-        'data': [],
-        'pk': node_pk,
-        'type': "node",
-        'redirect': dir});
-
-    return false;
-  });
-
-
   // remove trait
   // remove trait
   $('.node-details-remove-trait').click(function() {
   $('.node-details-remove-trait').click(function() {
     var to_remove =  $(this).data("trait-pk");
     var to_remove =  $(this).data("trait-pk");

circle/dashboard/templates/dashboard/node-list/column-actions.html

@@ -2,7 +2,7 @@
 <div class="btn-group">
 <div class="btn-group">
 	<button type="button" class="btn {{ btn_size }} btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button>
 	<button type="button" class="btn {{ btn_size }} btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button>
   <ul class="dropdown-menu nojs-dropdown-toogle" role="menu">
   <ul class="dropdown-menu nojs-dropdown-toogle" role="menu">
-	  <li><a href="#"><i class="icon-cloud-upload"></i> Flush</a></li>
+	<li><a data-node-pk="{{ record.pk }}" class="real-link node-flush" href="{% url "dashboard.views.flush-node" pk=record.pk %}?next={{ request.path }}"><i class="icon-cloud-upload"></i> Flush</a>
     {% if record.enabled %}
     {% if record.enabled %}
     <li><a style="display:none" data-status="enable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=enable"><i class="icon-check"></i> Enable</a>
     <li><a style="display:none" data-status="enable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=enable"><i class="icon-check"></i> Enable</a>
     <a style="display:block" data-status="disable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=disable"><i class="icon-remove"></i> Disable</a></li>
     <a style="display:block" data-status="disable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=disable"><i class="icon-remove"></i> Disable</a></li>