cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [08/39] git commit: updated refs/heads/ui-vpc-redesign to 8d9a8ca
Date Thu, 16 May 2013 17:12:29 GMT
CLOUDSTACK-2348: PVLAN - UI - infrastructure menu - create guest network - add new field Private
VLAN ID.


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

Branch: refs/heads/ui-vpc-redesign
Commit: 87b7a8450742b28183bc3e3245ba791959ce4e98
Parents: 70da1b3
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon May 6 12:14:19 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon May 6 12:14:19 2013 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/87b7a845/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7aa0566..5eb88e0 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -1375,7 +1375,10 @@
                             label: 'label.vlan.id',
                             docID: 'helpGuestNetworkZoneVLANID'
                           },
-
+                          isolatedpvlanId: {
+                            label: 'Private VLAN ID'                           
+                          },
+                          
                           scope: {
                             label: 'label.scope',
                             docID: 'helpGuestNetworkZoneScope',
@@ -1589,11 +1592,15 @@
 																  if(this.id == selectedNetworkOfferingId) {																		
 																		if(this.specifyvlan == false) {
 																		  $form.find('.form-item[rel=vlanId]').hide();
-																			cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=vlanId]'));
//make vlanId optional 	 	
+																			cloudStack.dialog.createFormField.validation.required.remove($form.find('.form-item[rel=vlanId]'));
//make vlanId optional 	
+																			
+																			$form.find('.form-item[rel=isolatedpvlanId]').hide();
 																		}
 																		else {
 																		  $form.find('.form-item[rel=vlanId]').css('display', 'inline-block');
																		
-																			cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=vlanId]'));
	//make vlanId required		
+																			cloudStack.dialog.createFormField.validation.required.add($form.find('.form-item[rel=vlanId]'));
	//make vlanId required	
+																			
+																			$form.find('.form-item[rel=isolatedpvlanId]').css('display', 'inline-block');
            
 																		}
 																		return false; //break each loop
 																	}
@@ -1679,7 +1686,10 @@
 
 											  if(($form.find('.form-item[rel=vlanId]').css("display") != "none") &&
(args.data.vlanId != null && args.data.vlanId.length > 0))
 												  array1.push("&vlan=" + todb(args.data.vlanId));
-
+											  
+											  if(($form.find('.form-item[rel=isolatedpvlanId]').css("display") != "none")
&& (args.data.isolatedpvlanId != null && args.data.isolatedpvlanId.length
> 0))
+                          array1.push("&isolatedpvlan=" + todb(args.data.isolatedpvlanId));
+											  											  
 												if($form.find('.form-item[rel=domainId]').css("display") != "none") {
 												  array1.push("&domainId=" + args.data.domainId);
 


Mime
View raw message