cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: CS-15863: cloudstack 3.0 UI - autoscale - LB listing - VM listing - hide delete button based on vm displayname instead of vm name (Reviewed-by: Brian)
Date Mon, 20 Aug 2012 22:43:41 GMT
Updated Branches:
  refs/heads/autoscale 9d60d5d08 -> ae10740ae


CS-15863: cloudstack 3.0 UI - autoscale - LB listing - VM listing - hide delete button based
on vm displayname instead of vm name (Reviewed-by: Brian)


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

Branch: refs/heads/autoscale
Commit: ae10740ae11722a7cae48d9a07c0f47c9fc3f654
Parents: 9d60d5d
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Mon Aug 20 15:34:07 2012 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Mon Aug 20 15:43:06 2012 -0700

----------------------------------------------------------------------
 ui/scripts/network.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ae10740a/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a1ad2ab..3649a62 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2372,7 +2372,7 @@
                                   data.listloadbalancerruleinstancesresponse.loadbalancerruleinstance
: [];
 																																																	
                                 $(lbInstances).each(function() {																  						
									
-																	if(this.name.indexOf('AutoScale-LB-') > -1) //autoscale VM is not allowed
to be deleted manually. So, hide destroy button
+																	if(this.displayname.indexOf('AutoScale-LB-') > -1) //autoscale VM is
not allowed to be deleted manually. So, hide destroy button
                                     this._hideActions = ['destroy'];	                   
              																	
 																});                                				
                               },


Mime
View raw message