Updated Branches:
  refs/heads/master 062190ccd -> 2b36ad8f9

CS-16612: cloudstack UI - create network offering - show all services 
regardless of guestIpType(Shared/Isolated).


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

Branch: refs/heads/master
Commit: 2b36ad8f923544421cfc1ecb1116cb61365b3121
Parents: 062190c
Author: Jessica Wang <[email protected]>
Authored: Thu Oct 25 12:05:40 2012 -0700
Committer: Jessica Wang <[email protected]>
Committed: Thu Oct 25 12:09:38 2012 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b36ad8f/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 0e77d37..7d1d1dd 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -1165,7 +1165,9 @@
                                                                                
                                                                                
                          $(':ui-dialog').dialog('option', 'position', 
'center');
                                                                                
-                                                                               
//hide/show service fields upon guestIpType(Shared/Isolated), 
zoneType(Advanced/Basic), having VpcVirtualRouter or not ***** (begin) *****    
                                          
+                                                                               
//CS-16612 show all services regardless of guestIpType(Shared/Isolated)
+                                                                               
/*
+                                                                               
//hide/show service fields upon guestIpType(Shared/Isolated), having 
VpcVirtualRouter or not ***** (begin) *****                                     
           
                                                                                
var serviceFieldsToHide = [];                                                   
                        
                                                                                
if($guestTypeField.val() == 'Shared') { //Shared network offering
                                                                                
  serviceFieldsToHide = [
@@ -1230,7 +1232,8 @@
                         }                                                      
                                                
                                                                                
        }                                                                       
                
                                                                                
}
-                                                                               
//hide/show service fields upon guestIpType(Shared/Isolated), 
zoneType(Advanced/Basic), having VpcVirtualRouter or not ***** (end) *****      
                  
+                                                                               
//hide/show service fields upon guestIpType(Shared/Isolated), having 
VpcVirtualRouter or not ***** (end) *****                  
+                                                                               
*/
                                                                                
                
 
                     //show LB InlineMode dropdown only when (1)LB Service is 
checked (2)Service Provider is F5                                               
          

Reply via email to