From 663ba8c89856d998378a4b67d98d830bcb0ff199 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Tue, 10 Jul 2012 17:51:30 -0700
Subject: [PATCH] cloudstack 3.0 UI - VPC - IP Address - PF, LB - if IP is
 associated with a tier, hide tier dropdown when creating PF, LB rule.

---
 ui/scripts/network.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 29f3117f609..fef850d6650 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2421,13 +2421,18 @@
                       });
 
                       // Check if tiers are present; hide/show header drop-down                     
-                      var $headerFields = $multi.find('.header-fields');
-                      if ('vpc' in args.context) {
-                        $headerFields.show();
-                      } 
+											var $headerFields = $multi.find('.header-fields');													
+											if ('vpc' in args.context) {
+												if(args.context.ipAddresses[0].associatednetworkid == null) {
+													$headerFields.show();
+												}
+												else {
+													$headerFields.hide();
+												}
+											} 
 											else if('networks' in args.context){
-                        $headerFields.hide();
-                      }
+												$headerFields.hide();
+											}													
                     }
                   },
 
@@ -2653,9 +2658,14 @@
                           });
                  													
 													// Check if tiers are present; hide/show header drop-down                     
-													var $headerFields = $multi.find('.header-fields');
+													var $headerFields = $multi.find('.header-fields');													
 													if ('vpc' in args.context) {
-														$headerFields.show();
+													  if(args.context.ipAddresses[0].associatednetworkid == null) {
+														  $headerFields.show();
+														}
+														else {
+														  $headerFields.hide();
+														}
 													} 
 													else if('networks' in args.context){
 														$headerFields.hide();