From 75685811a91be12e1d0dbc7b3261087f6d14d00d Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 3 Jun 2013 17:25:34 +0200 Subject: [PATCH] feature #1853: Add roles panel in appflow-services tab --- .../public/js/apptools-appflow-services.js | 151 +++++++++--------- oneapps/postinstall.sh | 2 +- 2 files changed, 78 insertions(+), 75 deletions(-) diff --git a/flow/sunstone/public/js/apptools-appflow-services.js b/flow/sunstone/public/js/apptools-appflow-services.js index 4ba5c4d865..fac69323e5 100644 --- a/flow/sunstone/public/js/apptools-appflow-services.js +++ b/flow/sunstone/public/js/apptools-appflow-services.js @@ -346,38 +346,6 @@ function updateServiceVMInfo(vmachine_list){ function updateServiceInfo(request,elem){ var elem_info = elem.DOCUMENT; - - var roles_info = '\ - \ - \ - ' - - var roles = elem_info.TEMPLATE.BODY.roles - if (roles && roles.length) - for (var i = 0; i < roles.length; i++) { - roles_info += '\ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - \ - ' - - if (roles[i].parents) - roles_info += '\ - \ - \ - ' - } - - roles_info += '
'+tr("Roles")+'
'+roles[i].name+'
     '+tr("State")+''+Role.state(roles[i].state)+'
     '+tr("Cardinality")+''+roles[i].cardinality+'
     '+tr("VM Template")+''+roles[i].vm_template+'
     '+tr("Parents")+''+roles[i].parents.join(', ')+'
' - var info_tab = { title: tr("Information"), content: @@ -404,7 +372,6 @@ function updateServiceInfo(request,elem){ '+ Service.state(elem_info.TEMPLATE.BODY.state) +'\ \ ' + - roles_info + '\
' + insert_permissions_table('apptools-appflow-services', "Service", @@ -417,6 +384,32 @@ function updateServiceInfo(request,elem){
' } + Sunstone.updateInfoPanelTab("service_info_panel", "service_info_tab",info_tab); + + + var roles_tab = { + title : "Roles", + content : '
\ +
\ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +
'+tr("Name")+''+tr("State")+''+tr("Cardinality")+''+tr("VM Template")+''+tr("Parents")+'
\ +
' + }; + + Sunstone.updateInfoPanelTab("service_info_panel", "service_roles_tab",roles_tab); + var vms_tab = { title : "Virtual Machines", content : '
\ @@ -444,6 +437,9 @@ function updateServiceInfo(request,elem){
' }; + Sunstone.updateInfoPanelTab("service_info_panel", "service_vms_tab",vms_tab); + + var logs = elem_info.TEMPLATE.BODY.log var log_info = '' if (logs) { @@ -466,22 +462,9 @@ function updateServiceInfo(request,elem){ content: log_info } - var roles = elem_info.TEMPLATE.BODY.roles; - if (!roles) roles = []; - Sunstone.updateInfoPanelTab("service_info_panel", - "service_info_tab",info_tab); - if (roles.length){ - Sunstone.updateInfoPanelTab("service_info_panel", - "service_vms_tab",vms_tab); - } - else { - Sunstone.removeInfoPanelTab("service_info_panel", - "service_vms_tab"); - }; + Sunstone.updateInfoPanelTab("service_info_panel", "service_log_tab",logs_tab); - Sunstone.updateInfoPanelTab("service_info_panel", - "service_log_tab",logs_tab); // Popup panel Sunstone.popUpInfoPanel("service_info_panel", "apptools-appflow-services"); @@ -492,36 +475,56 @@ function updateServiceInfo(request,elem){ Sunstone.runAction('Service.showinfo', elem_info.ID); }) - if (!roles.length) return; + var roles = elem_info.TEMPLATE.BODY.roles + if (roles && roles.length) { + var servicerolesDataTable = $('#datatable_service_roles').dataTable({ + "bSortClasses": false, + "bAutoWidth":false, + "sDom" : '<"H">t<"F"p>' + }); - var vms = []; - for (var i=0; i < roles.length; i++) - if (roles[i].nodes) { - for (var j=0; j < roles[i].nodes.length; j++){ - var vm_info = roles[i].nodes[j].vm_info; - if (vm_info) - vms.push( - [roles[i].name].concat( - vMachineElementArray(vm_info).slice(1) - ) - ); + var role_elements = []; + for (var i = 0; i < roles.length; i++) { + role_elements.push([ + '', + roles[i].name, + Role.state(roles[i].state), + roles[i].cardinality, + roles[i].vm_template, + roles[i].parents ? roles[i].parents.join(', ') : '-' + ]) + } + + updateView(role_elements ,servicerolesDataTable); + + + var servicevmsDataTable = $('#datatable_service_vms').dataTable({ + "bSortClasses": false, + "bAutoWidth":false, + "sDom" : '<"H">t<"F"p>', + "aoColumnDefs": [ + { "sWidth": "60px", "aTargets": [6,7] }, + { "sWidth": "35px", "aTargets": [1, 11] }, + { "sWidth": "150px", "aTargets": [5,10] }, + { "sWidth": "100px", "aTargets": [2,3,9] }, + { "bVisible": false, "aTargets": [6,7,10]} + ] + }); + + var vms = []; + for (var i=0; i < roles.length; i++) { + if (roles[i].nodes) { + for (var j=0; j < roles[i].nodes.length; j++){ + var vm_info = roles[i].nodes[j].vm_info; + if (vm_info) { + vms.push([roles[i].name].concat(vMachineElementArray(vm_info).slice(1))); + } + }; + }; }; - }; - var servicevmsDataTable = $('#datatable_service_vms').dataTable({ - "bSortClasses": false, - "bAutoWidth":false, - "sDom" : '<"H">t<"F"p>', - "aoColumnDefs": [ - { "sWidth": "60px", "aTargets": [6,7] }, - { "sWidth": "35px", "aTargets": [1, 11] }, - { "sWidth": "150px", "aTargets": [5,10] }, - { "sWidth": "100px", "aTargets": [2,3,9] }, - { "bVisible": false, "aTargets": [6,7,10]} - ] - }); - - updateView(vms, servicevmsDataTable); + updateView(vms, servicevmsDataTable); + } //$('tbody tr',servicevmsDataTable).click(function(e){ diff --git a/oneapps/postinstall.sh b/oneapps/postinstall.sh index 3c5e436bd3..c0f457cb63 100755 --- a/oneapps/postinstall.sh +++ b/oneapps/postinstall.sh @@ -110,7 +110,7 @@ add_view " apptools-appflow-services:" \ " apptools-appflow-services: panel_tabs: service_info_tab: true - service_role_tab: true + service_roles_tab: true service_vms_tab: true service_log_tab: true table_columns: