git commit: CS-16190:InterVlan - UI - Non-VPC Virtual Routers are not provided with an option to reboot unlike VPC Virtual Routers- Check on the vpc id being not NULL was making the reboot action hidden for a normal VR , but if the vpc id is NULL , VPC VR

[pr...@apache.org]

Updated Branches:
  refs/heads/master 5e0ede8bd -> 36ce46c31


CS-16190:InterVlan - UI - Non-VPC Virtual Routers are not provided with an option to reboot unlike VPC Virtual Routers- Check on the vpc id being not NULL was making the reboot action hidden for a normal VR ,but if the vpc id is NULL , VPC VR won't exist


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

Branch: refs/heads/master
Commit: 36ce46c319a97949d22b27d11955539e47d4af61
Parents: 5e0ede8
Author: Pranav Saxena <pr...@citrix.com>
Authored: Tue Aug 28 13:31:27 2012 +0530
Committer: Pranav Saxena <pr...@citrix.com>
Committed: Tue Aug 28 13:31:27 2012 +0530

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/36ce46c3/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ae45f27..2a4cf5f 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9699,7 +9699,7 @@
     if (jsonObj.state == 'Running') {
       allowedActions.push("stop");
       			
-			if(jsonObj.vpcid != null) 
+		//	if(jsonObj.vpcid != null) 
         allowedActions.push("restart");
 				
       allowedActions.push("viewConsole");