diff --git a/src/sunstone/public/app/opennebula/action.js b/src/sunstone/public/app/opennebula/action.js
index 9e98aaa5e3..9f9364bd3f 100644
--- a/src/sunstone/public/app/opennebula/action.js
+++ b/src/sunstone/public/app/opennebula/action.js
@@ -1,5 +1,6 @@
define(function(require) {
var OpenNebulaHelper = require('./helper');
+ var OpenNebulaError = require('./error');
var listCache = {};
var listWaiting = {};
@@ -34,7 +35,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -57,7 +58,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -148,7 +149,7 @@ define(function(require) {
if (callback) {
//console.log(cache_name+" list. ERROR Callback called");
- callback(request, OpenNebula.Error(response));
+ callback(request, OpenNebulaError(response));
}
}
@@ -178,7 +179,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -205,7 +206,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -264,7 +265,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -290,7 +291,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -315,7 +316,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
@@ -340,7 +341,7 @@ define(function(require) {
},
error: function(response) {
return callbackError ?
- callbackError(request, OpenNebula.Error(response)) : null;
+ callbackError(request, OpenNebulaError(response)) : null;
}
});
},
diff --git a/src/sunstone/public/app/sunstone-config.js b/src/sunstone/public/app/sunstone-config.js
index ff52b23718..0c04229b91 100644
--- a/src/sunstone/public/app/sunstone-config.js
+++ b/src/sunstone/public/app/sunstone-config.js
@@ -98,7 +98,8 @@ define(function(require) {
"logo": (_config['view']["provision_logo"] || "images/one_small_logo.png")
},
- 'autoRefresh' : _config['view']['autorefresh']
+ 'autoRefresh' : _config['view']['autorefresh'],
+ 'tableOrder': _config['user_config']['table_order']
}
return Config;
diff --git a/src/sunstone/public/app/sunstone/tab.hbs b/src/sunstone/public/app/sunstone/tab.hbs
index f1593388f7..bfe1e51517 100644
--- a/src/sunstone/public/app/sunstone/tab.hbs
+++ b/src/sunstone/public/app/sunstone/tab.hbs
@@ -24,17 +24,17 @@
- {{#if table}}
+ {{#if dataTable.dataTableHTML}}
-
{{{table}}}
+
{{{dataTable.dataTableHTML}}}
{{/if}}
diff --git a/src/sunstone/public/app/tabs/zones-tab.js b/src/sunstone/public/app/tabs/zones-tab.js
index 74e56af7b1..6c33df4302 100644
--- a/src/sunstone/public/app/tabs/zones-tab.js
+++ b/src/sunstone/public/app/tabs/zones-tab.js
@@ -1,19 +1,20 @@
define(function(require) {
var Locale = require('utils/locale');
- var Buttons = require('./zones-tab/buttons')
- var TableTemplate = require('hbs!./zones-tab/table')
+ var Buttons = require('./zones-tab/buttons');
+ var Actions = require('./zones-tab/actions');
+ var DataTable = require('./zones-tab/datatable');
var zonesTab = {
title: Locale.tr("Zones"),
resource: 'Zone',
- buttons: Buttons,
tabClass: "subTab",
parentTab: "infra-tab",
- searchInput: '
',
listHeader: '
' + Locale.tr("Zones"),
infoHeader: '
' + Locale.tr("Zone"),
subheader: '
',
- table: TableTemplate()
+ buttons: Buttons,
+ actions: Actions,
+ dataTable: DataTable
};
return {
diff --git a/src/sunstone/public/app/tabs/zones-tab/actions.js b/src/sunstone/public/app/tabs/zones-tab/actions.js
index fa77486e1b..0224f03497 100644
--- a/src/sunstone/public/app/tabs/zones-tab/actions.js
+++ b/src/sunstone/public/app/tabs/zones-tab/actions.js
@@ -1,106 +1,112 @@
define(function(require) {
- var zone_actions = {
+ var OpenNebulaZone = require('opennebula/zone');
+ var Sunstone = require('sunstone');
+ var Notifier = require('utils/notifier');
+ var ZonesDataTable = require('./datatable');
+ var _zoneActions = {
"Zone.create" : {
type: "create",
- call: OpenNebula.Zone.create,
+ call: OpenNebulaZone.create,
callback: function(request, response) {
$create_zone_dialog.foundation('reveal', 'close');
$("form", $create_zone_dialog)[0].reset();
Sunstone.runAction('Zone.list');
},
- error: onError,
+ error: Notifier.onError,
notify: true
},
"Zone.create_dialog" : {
type: "custom",
- call: popUpCreateZoneDialog
+ // TODO call: popUpCreateZoneDialog
},
"Zone.list" : {
type: "list",
- call: OpenNebula.Zone.list,
- callback: updateZonesView,
- error: onError
+ call: OpenNebulaZone.list,
+ callback: ZonesDataTable.updateZonesView,
+ error: Notifier.onError
},
"Zone.show" : {
type: "single",
- call: OpenNebula.Zone.show,
+ call: OpenNebulaZone.show,
callback: function(request, response) {
- var tab = dataTable_zones.parents(".tab");
+ // TODO var tab = dataTable_zones.parents(".tab");
if (Sunstone.rightInfoVisible(tab)) {
// individual view
- updateZoneInfo(request, response);
+ // TODO updateZoneInfo(request, response);
}
// datatable row
- updateZoneElement(request, response);
+ ZonesDataTable.updateZoneElement(request, response);
},
- error: onError
+ error: Notifier.onError
},
"Zone.show_to_update" : {
type: "single",
- call: OpenNebula.Zone.show,
- callback: fillPopPup,
- error: onError
+ call: OpenNebulaZone.show,
+ // TODO callback: fillPopPup,
+ error: Notifier.onError
},
"Zone.refresh" : {
type: "custom",
call: function() {
- var tab = dataTable_zones.parents(".tab");
+ var tab = $("#zones-tab");
if (Sunstone.rightInfoVisible(tab)) {
Sunstone.runAction("Zone.show", Sunstone.rightInfoResourceId(tab))
} else {
- waitingNodes(dataTable_zones);
+ ZonesDataTable.waitingNodes();
Sunstone.runAction("Zone.list", {force: true});
}
},
- error: onError
+ error: Notifier.onError
},
"Zone.delete" : {
type: "multiple",
- call : OpenNebula.Zone.del,
- callback : deleteZoneElement,
- elements: zoneElements,
- error : onError,
+ call : OpenNebulaZone.del,
+ callback : ZonesDataTable.deleteZoneElement,
+ elements: ZonesDataTable.zoneElements,
+ error : Notifier.onError,
notify:true
},
"Zone.update_template" : { // Update template
type: "single",
- call: OpenNebula.Zone.update,
+ call: OpenNebulaZone.update,
callback: function(request, response) {
- notifyMessage(tr("Zone updated correctly"));
+ Notifier.notifyMessage(tr("Zone updated correctly"));
Sunstone.runAction('Zone.show', request.request.data[0][0]);
},
- error: onError
+ error: Notifier.onError
},
"Zone.fetch_template" : {
type: "single",
- call: OpenNebula.Zone.fetch_template,
+ call: OpenNebulaZone.fetch_template,
callback: function(request, response) {
$('#template_update_dialog #template_update_textarea').val(response.template);
},
- error: onError
+ error: Notifier.onError
},
"Zone.rename" : {
type: "single",
- call: OpenNebula.Zone.rename,
+ call: OpenNebulaZone.rename,
callback: function(request) {
- notifyMessage(tr("Zone renamed correctly"));
+ Notifier.notifyMessage(tr("Zone renamed correctly"));
Sunstone.runAction('Zone.show', request.request.data[0][0]);
},
- error: onError,
+ error: Notifier.onError,
notify: true
}
};
+
+ return _zoneActions;
})
diff --git a/src/sunstone/public/app/tabs/zones-tab/datatable.js b/src/sunstone/public/app/tabs/zones-tab/datatable.js
new file mode 100644
index 0000000000..005785d1f8
--- /dev/null
+++ b/src/sunstone/public/app/tabs/zones-tab/datatable.js
@@ -0,0 +1,105 @@
+define(function(require) {
+ require('foundation-datatables');
+
+ var SunstoneConfig = require('sunstone-config');
+ var TabDataTable = require('utils/tab-datatable');
+
+ var _dataTableZones;
+ var DATATABLE_ID = "dataTableZones";
+ var DATATABLE_SEARCH_ID = "zonesSearch";
+ var TAB_NAME = 'zones-tab';
+
+ function _initialize() {
+ _dataTableZones = $('#'+DATATABLE_ID).dataTable({
+ "bSortClasses": false,
+ "bDeferRender": true,
+ "aoColumnDefs": [
+ {"bSortable": false, "aTargets": ["check"]},
+ {"sWidth": "35px", "aTargets": [0]},
+ {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
+ {"bVisible": false, "aTargets": ['_all']}
+ ]
+ });
+
+ $('#'+DATATABLE_SEARCH_ID).keyup(function() {
+ _dataTableZones.fnFilter($(this).val());
+ })
+
+ _dataTableZones.on('draw', function() {
+ TabDataTable.recountCheckboxes(_dataTableZones);
+ })
+
+ TabDataTable.initCheckAllBoxes(_dataTableZones);
+ TabDataTable.tableCheckboxesListener(_dataTableZones);
+ TabDataTable.infoListener(_dataTableZones, "Zone.show");
+ _dataTableZones.fnSort([[1, SunstoneConfig.tableOrder]]);
+ }
+
+ var _dataTableHTML = function() {
+ var TemplateDataTableHTML = require('hbs!./datatable/table');
+ return TemplateDataTableHTML({'dataTableId': DATATABLE_ID});
+ }
+
+ var _searchInputHTML = function() {
+ var TemplateSearchInputHTML = require('hbs!./datatable/search-input');
+ return TemplateSearchInputHTML({'dataTableSearchId': DATATABLE_SEARCH_ID});
+ }
+
+ var _zoneElements = function() {
+ return TabDataTable.getSelectedNodes(_dataTableZones);
+ }
+
+ var _zoneElementArray = function(element_json) {
+ var element = element_json.ZONE;
+
+ return [
+ '
',
+ element.ID,
+ element.NAME,
+ element.TEMPLATE.ENDPOINT
+ ];
+ }
+
+ //callback for an action affecting a zone element
+ var _updateZoneElement = function(request, element_json) {
+ var id = element_json.ZONE.ID;
+ var element = _zoneElementArray(element_json);
+ TabDataTable.updateSingleElement(element, _dataTableZones, '#zone_' + id);
+ }
+
+ //callback for actions deleting a zone element
+ var _deleteZoneElement = function(req) {
+ TabDataTable.deleteElement(_dataTableZones, '#zone_' + req.request.data);
+ $('div#zone_tab_' + req.request.data, main_tabs_context).remove();
+ }
+
+ //call back for actions creating a zone element
+ var _addZoneElement = function(request, element_json) {
+ var element = _zoneElementArray(element_json);
+ TabDataTable.addElement(element, _dataTableZones);
+ }
+
+ //callback to update the list of zones.
+ var _updateZonesView =function(request, list) {
+ var list_array = [];
+
+ $.each(list, function() {
+ list_array.push(_zoneElementArray(this));
+ });
+
+ TabDataTable.updateView(list_array, _dataTableZones);
+ };
+
+ return {
+ 'initialize': _initialize,
+ 'dataTableHTML': _dataTableHTML,
+ 'searchInputHTML': _searchInputHTML,
+ 'zoneElements': _zoneElements,
+ 'zoneElementArray': _zoneElementArray,
+ 'updateZoneElement': _updateZoneElement,
+ 'deleteZoneElement': _deleteZoneElement,
+ 'addZoneElement': _addZoneElement,
+ 'updateZonesView': _updateZonesView,
+ 'waitingNodes': TabDataTable.waitingNodes
+ }
+});
diff --git a/src/sunstone/public/app/tabs/zones-tab/datatable/search-input.hbs b/src/sunstone/public/app/tabs/zones-tab/datatable/search-input.hbs
new file mode 100644
index 0000000000..413e38d506
--- /dev/null
+++ b/src/sunstone/public/app/tabs/zones-tab/datatable/search-input.hbs
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/zones-tab/table.hbs b/src/sunstone/public/app/tabs/zones-tab/datatable/table.hbs
similarity index 83%
rename from src/sunstone/public/app/tabs/zones-tab/table.hbs
rename to src/sunstone/public/app/tabs/zones-tab/datatable/table.hbs
index a7d1d7f5b4..8f5769864a 100644
--- a/src/sunstone/public/app/tabs/zones-tab/table.hbs
+++ b/src/sunstone/public/app/tabs/zones-tab/datatable/table.hbs
@@ -1,4 +1,4 @@
-