cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [10/25] git commit: updated refs/heads/ui-mixed-zone-management to c3009e3
Date Wed, 17 Apr 2013 18:09:21 GMT
CLOUDSTACK-1910: cloudstack UI - Regions menu - GSLB - load balancer rules - implement "Assign
load balancer rule to GSLB" action.


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

Branch: refs/heads/ui-mixed-zone-management
Commit: 4b636a10aaa49d3f1908b524ec98ff25e51c80b3
Parents: 32ccb8a
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Tue Apr 16 16:26:20 2013 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Tue Apr 16 16:26:20 2013 -0700

----------------------------------------------------------------------
 ui/scripts/regions.js |   82 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 72 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b636a10/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index d8e0db0..ef6f976 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -451,16 +451,15 @@
 					}					
         }
       },
-			
-			//???
+						
 			lbUnderGSLB: {
         id: 'lbUnderGSLB',
         type: 'select',
-        title: 'load balancer rules assigned to this GSLB',
+        title: 'assigned load balancer rules',
         listView: {
           section: 'lbUnderGSLB',
           id: 'lbUnderGSLB',
-          label: 'load balancer rules assigned to this GSLB',
+          label: 'assigned load balancer rules',
           fields: {
             name: { label: 'label.name' },
             publicport: { label: 'label.public.port' },
@@ -482,7 +481,71 @@
                 });
               }
             });
-          },					
+          },	        
+					actions: {            
+            add: {
+              label: 'assign load balancer rule to GSLB',
+              messages: {
+                confirm: function(args) {
+                  return 'Please confirm you want to assign load balancer rule to GSLB';
+                },
+                notification: function(args) {
+                  return 'assign load balancer rule to GSLB';
+                }
+              },
+              createForm: {
+                title: 'assign load balancer rule to GSLB',              
+                fields: {                  
+                  loadbalancerrule: {
+                    label: 'load balancer rule',                    
+                    select: function(args) {		
+											var data = {
+												globalloadbalancerruleid: args.context.GSLB[0].id,
+												listAll: true
+											};
+											$.ajax({
+												url: createURL('listLoadBalancerRules'),
+												data: data,
+												success: function(json) {
+													var items = json.listloadbalancerrulesresponse.loadbalancerrule;
+													args.response.success({								 
+														data: items,
+														descriptionField: 'name'
+													});													
+												}
+											});																						
+                    }
+                  }  
+                }
+              },
+              action: function(args) {							  
+								var data = {
+								  id: args.context.GSLB[0].id,
+									loadbalancerrulelist: args.data.loadbalancerrule
+								};			
+                $.ajax({
+                  url: createURL('assignToGlobalLoadBalancerRule'),
+                  data: data,                 
+                  success: function(json) {
+                    var jid = json.assigntogloballoadbalancerruleresponse.jobid;
+                    args.response.success(
+                      {_custom:
+                       {jobId: jid,
+                        getUpdatedItem: function(json) {
+                          return json.queryasyncjobresultresponse.jobresult.loadbalancerrule;
+                        }
+                       }
+                      }
+                    );
+                  }
+                });
+              },
+              notification: {
+                poll: pollAsyncJobResult
+              }
+            }
+					},						
+									
 					detailView: {
             name: 'load balancer rule details',            
             actions: {              
@@ -528,12 +591,12 @@
 										publicport: { label: 'label.public.port' },
 										privateport: { label: 'label.private.port' },
 										algorithm: { label: 'label.algorithm' },
-										publicip: { label: 'label.public.ip' },										
+										publicip: { label: 'label.public.ip' },	
+                    state: { label: 'label.state' },												
 										id: { label: 'label.id' },
                     cidrlist: { label: 'label.cidr' },
                     domain: { label: 'label.domain' },
-                    account: { label: 'label.account' },
-                    state: { label: 'label.state' }										
+                    account: { label: 'label.account' }                    								
                   }
                 ],
                 dataProvider: function(args) {									
@@ -554,8 +617,7 @@
             }
           }
 				}
-			}
-			//???
+			}			
     }
   };
 		


Mime
View raw message