From 5da0bfa0ccc7443e8459994d0f4cfbc1fcb4ed0b Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 23 Apr 2015 12:30:53 +0200 Subject: [PATCH] feature #3748: Use generic methods for zonesDatatable --- .../public/app/tabs/zones-tab/actions.js | 8 ++--- .../public/app/tabs/zones-tab/buttons.js | 4 +-- .../public/app/tabs/zones-tab/datatable.js | 30 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/sunstone/public/app/tabs/zones-tab/actions.js b/src/sunstone/public/app/tabs/zones-tab/actions.js index 17e12c9b38..d42be9183b 100644 --- a/src/sunstone/public/app/tabs/zones-tab/actions.js +++ b/src/sunstone/public/app/tabs/zones-tab/actions.js @@ -31,7 +31,7 @@ define(function(require) { "Zone.list" : { type: "list", call: OpenNebulaZone.list, - callback: ZonesDataTable.updateZonesView, + callback: ZonesDataTable.updateView, error: Notifier.onError }, @@ -45,7 +45,7 @@ define(function(require) { } // datatable row - ZonesDataTable.updateZoneElement(request, response); + ZonesDataTable.updateElement(request, response); }, error: Notifier.onError }, @@ -74,8 +74,8 @@ define(function(require) { "Zone.delete" : { type: "multiple", call : OpenNebulaZone.del, - callback : ZonesDataTable.deleteZoneElement, - elements: ZonesDataTable.zoneElements, + callback : ZonesDataTable.deleteElement, + elements: ZonesDataTable.elements, error : Notifier.onError, notify:true }, diff --git a/src/sunstone/public/app/tabs/zones-tab/buttons.js b/src/sunstone/public/app/tabs/zones-tab/buttons.js index f5adae7282..e5601401d4 100644 --- a/src/sunstone/public/app/tabs/zones-tab/buttons.js +++ b/src/sunstone/public/app/tabs/zones-tab/buttons.js @@ -1,7 +1,7 @@ define(function(require) { var Locale = require('utils/locale'); - var zoneButtons = { + var ZoneButtons = { "Zone.refresh" : { type: "action", layout: "refresh", @@ -18,5 +18,5 @@ define(function(require) { } }; - return zoneButtons; + return ZoneButtons; }) diff --git a/src/sunstone/public/app/tabs/zones-tab/datatable.js b/src/sunstone/public/app/tabs/zones-tab/datatable.js index 5089c38198..f350568a59 100644 --- a/src/sunstone/public/app/tabs/zones-tab/datatable.js +++ b/src/sunstone/public/app/tabs/zones-tab/datatable.js @@ -45,11 +45,11 @@ define(function(require) { return TemplateSearchInputHTML({'dataTableSearchId': DATATABLE_SEARCH_ID}); } - var _zoneElements = function() { + var _elements = function() { return TabDataTable.getSelectedNodes(_dataTableZones); } - var _zoneElementArray = function(element_json) { + var _elementArray = function(element_json) { var element = element_json.ZONE; return [ @@ -61,30 +61,30 @@ define(function(require) { } //callback for an action affecting a zone element - var _updateZoneElement = function(request, element_json) { + var _updateElement = function(request, element_json) { var id = element_json.ZONE.ID; - var element = _zoneElementArray(element_json); + var element = _elementArray(element_json); TabDataTable.updateSingleElement(element, _dataTableZones, '#zone_' + id); } //callback for actions deleting a zone element - var _deleteZoneElement = function(req) { + var _deleteElement = 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); + var _addElement = function(request, element_json) { + var element = _elementArray(element_json); TabDataTable.addElement(element, _dataTableZones); } //callback to update the list of zones. - var _updateZonesView =function(request, list) { + var _updateView =function(request, list) { var list_array = []; $.each(list, function() { - list_array.push(_zoneElementArray(this)); + list_array.push(_elementArray(this)); }); TabDataTable.updateView(list_array, _dataTableZones); @@ -94,12 +94,12 @@ define(function(require) { 'initialize': _initialize, 'dataTableHTML': _dataTableHTML, 'searchInputHTML': _searchInputHTML, - 'zoneElements': _zoneElements, - 'zoneElementArray': _zoneElementArray, - 'updateZoneElement': _updateZoneElement, - 'deleteZoneElement': _deleteZoneElement, - 'addZoneElement': _addZoneElement, - 'updateZonesView': _updateZonesView, + 'elements': _elements, + 'elementArray': _elementArray, + 'updateElement': _updateElement, + 'deleteElement': _deleteElement, + 'addElement': _addElement, + 'updateZonesView': _updateView, 'waitingNodes': TabDataTable.waitingNodes } });