You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/10/16 19:01:35 UTC

git commit: CS-16326: cloudstack UI - instance page - listView - (1) the column that maps to name property in API response is labelled as "Name" instead of "Host Name".

Updated Branches:
  refs/heads/master 33ed37d87 -> ff8fccccb


CS-16326: cloudstack UI - instance page - listView - (1) the column that maps to name property in API response is labelled as "Name" instead of "Host Name".

(2) add back Internal Name column for root-admin.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ff8fcccc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ff8fcccc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ff8fcccc

Branch: refs/heads/master
Commit: ff8fccccb23f9a6ebd94e548f05b66bd3f75f4a3
Parents: 33ed37d
Author: Jessica Wang <je...@citrix.com>
Authored: Mon Oct 15 16:19:12 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Tue Oct 16 10:01:15 2012 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ff8fcccc/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 4f8ff3d..05400fd 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -42,9 +42,10 @@
 				}			
 				return hiddenFields;
 			},			
-      fields: {        
-        displayname: { label: 'label.display.name' },
-				name: { label: 'label.host.name' },
+      fields: {      
+				name: { label: 'label.name' },
+				instancename: { label: 'label.internal.name' },
+				displayname: { label: 'label.display.name' },
         zonename: { label: 'label.zone.name' },
         state: {
           label: 'label.state',