From e002dd09985e65e8624357c1cc94b2fe57908f67 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Mon, 13 Aug 2012 12:43:46 -0700
Subject: [PATCH] CS-15957: cloudstack 3.0 UI - VPC - private gateway - if not
 root-admin, show private gateway listView instead of create private gateway
 dialog because only root-admin is allowed to create private gateway.

---
 ui/scripts/vpc.js | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 8cd5812f71a..dd0dc7deadb 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -566,26 +566,30 @@
     },
     gateways: {
       add: {
-        preCheck: function(args) {
-          var items;
-          
-          $.ajax({
-            url: createURL('listPrivateGateways'),
-            async: false,
-            data: {
-              vpcid: args.context.vpc[0].id,
-              listAll: true
-            },
-            success: function(json) {
-              items = json.listprivategatewaysresponse.privategateway;              
-            }
-          });
-
-          if (items && items.length) {
-            return true;
-          }
-
-          return false;
+        preCheck: function(args) {          
+					if(isAdmin()) { //root-admin
+						var items;          
+						$.ajax({
+							url: createURL('listPrivateGateways'),
+							async: false,
+							data: {
+								vpcid: args.context.vpc[0].id,
+								listAll: true
+							},
+							success: function(json) {
+								items = json.listprivategatewaysresponse.privategateway;              
+							}
+						});
+						if (items && items.length) {
+							return true; //show private gateway listView
+						}
+						else {
+							return false; //show create private gateway dialog
+						}
+					}
+					else {  //regular-user, domain-admin
+					  return true; //show private gateway listView instead of create private gateway dialog because only root-admin is allowed to create private gateway
+					}
         },
         label: 'Add new gateway',
         messages: {