cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to 4f748e6
Date Fri, 05 Dec 2014 22:41:15 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 7c951a2fa -> 4f748e6e3


CLOUDSTACK-8039: UI > Infrastructure > router, systemvm > detailView > hide ChangeServiceOffering
action when vm's hypervisor is XenServer and vm's status is Running.


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

Branch: refs/heads/4.5
Commit: 4f748e6e308a804d2d2cb14798ff26b9d56ddc0e
Parents: 7c951a2
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Dec 5 14:40:21 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Dec 5 14:40:21 2014 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f748e6e/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a056343..005b47e 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -20567,8 +20567,8 @@
         if (jsonObj.state == 'Running') {
             allowedActions.push("stop");
                         
-            //when router is Running, only XenServer, VMware support scaleUp(change service
offering)
-            if (jsonObj.hypervisor == 'XenServer' || jsonObj.hypervisor == "VMware") {
+            //when router is Running, only VMware support scaleUp(change service offering)
+            if (jsonObj.hypervisor == "VMware") {
                 allowedActions.push("scaleUp");
             }                         
             
@@ -20613,8 +20613,8 @@
             allowedActions.push("restart");
             allowedActions.push("remove");
             
-            //when systemvm is Running, only XenServer, VMware support scaleUp(change service
offering)
-            if (jsonObj.hypervisor == 'XenServer' ||jsonObj.hypervisor == "VMware") {
+            //when systemvm is Running, only VMware support scaleUp(change service offering)
+            if (jsonObj.hypervisor == "VMware") {
                 allowedActions.push("scaleUp");
             }
             


Mime
View raw message