diff --git a/webroot/common/ui/js/sm.detail.tmpls.js b/webroot/common/ui/js/sm.detail.tmpls.js
index 91ebfec2..25ba6073 100644
--- a/webroot/common/ui/js/sm.detail.tmpls.js
+++ b/webroot/common/ui/js/sm.detail.tmpls.js
@@ -36,20 +36,6 @@ define([
title: smwl.TITLE_OPENSTACK,
theme: detailTheme,
templateGeneratorConfig: [
- {
- key: 'parameters.openstack_mgmt_ip',
- templateGenerator: 'LinkGenerator',
- templateGeneratorConfig: {
- template: 'http://{{params.openstack_mgmt_ip}}/horizon',
- params: {
- openstack_mgmt_ip: 'parameters.openstack_mgmt_ip'
- }
- }
- },
- {
- key: 'parameters.keystone_ip',
- templateGenerator: 'TextGenerator'
- },
{
key: 'parameters.keystone_tenant',
templateGenerator: 'TextGenerator'
@@ -65,6 +51,20 @@ define([
{
key: 'parameters.keystone_region_name',
templateGenerator: 'TextGenerator'
+ },
+ {
+ key: 'parameters.openstack_mgmt_ip',
+ templateGenerator: 'LinkGenerator',
+ templateGeneratorConfig: {
+ template: 'http://{{params.openstack_mgmt_ip}}/horizon',
+ params: {
+ openstack_mgmt_ip: 'parameters.openstack_mgmt_ip'
+ }
+ }
+ },
+ {
+ key: 'parameters.keystone_ip',
+ templateGenerator: 'TextGenerator'
}
]
},
diff --git a/webroot/common/ui/js/sm.grid.config.js b/webroot/common/ui/js/sm.grid.config.js
index 4fed2086..c9eca657 100644
--- a/webroot/common/ui/js/sm.grid.config.js
+++ b/webroot/common/ui/js/sm.grid.config.js
@@ -251,7 +251,7 @@ define([
if ($.isEmptyObject(dc.roles)) {
return ''
} else {
- return (dc.roles.indexOf(roleValue) != -1) ? '' : '';
+ return (dc.roles.indexOf(roleValue) != -1) ? '' : '';
}
},
exportConfig: {
diff --git a/webroot/setting/sm/ui/js/views/ClusterTabView.js b/webroot/setting/sm/ui/js/views/ClusterTabView.js
index a8b80fb0..690058e5 100644
--- a/webroot/setting/sm/ui/js/views/ClusterTabView.js
+++ b/webroot/setting/sm/ui/js/views/ClusterTabView.js
@@ -32,6 +32,7 @@ define([
view: "TabsView",
viewConfig: {
theme: 'overcast',
+ active: 1,
activate: function (e, ui) {
var selTab = $(ui.newTab.context).text();
if (selTab == smwl.TITLE_SERVERS) {