diff --git a/src/sunstone/public/app/sunstone/panels.hbs b/src/sunstone/public/app/sunstone/panels.hbs index d5f7a3eceb..16f95956e8 100644 --- a/src/sunstone/public/app/sunstone/panels.hbs +++ b/src/sunstone/public/app/sunstone/panels.hbs @@ -15,6 +15,7 @@ {{! -------------------------------------------------------------------------- }}
+
{{{permissionsTableHTML}}}
-{{{errorMessageHTML}}} {{#isFeatureEnabled "show_attributes_info"}}
{{{templateTableVcenterHTML}}}
diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js index 2a379a7470..ec93cb5137 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js @@ -237,6 +237,8 @@ define(function(require) { var color_html = Status.state_lock_to_color("VM", value_state, element_json[RESOURCE.toUpperCase()]["LOCK"]); + var vm_name = element.USER_TEMPLATE.ERROR || element.USER_TEMPLATE.SCHED_MESSAGE ? " " + element.NAME : element.NAME; + return [ ""+color_html, element.ID, - element.NAME, + vm_name, element.UNAME, element.GNAME, state, diff --git a/src/sunstone/public/app/utils/info-error/html.hbs b/src/sunstone/public/app/utils/info-error/html.hbs index 6c92886f82..05e3583dd5 100644 --- a/src/sunstone/public/app/utils/info-error/html.hbs +++ b/src/sunstone/public/app/utils/info-error/html.hbs @@ -15,7 +15,7 @@ {{! -------------------------------------------------------------------------- }}
-
+