cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.3 to fc1dc04
Date Wed, 08 Jan 2014 22:54:26 GMT
Updated Branches:
  refs/heads/4.3 b18071747 -> fc1dc04d4


CLOUDSTACK-5733: UI > Virtual Routers > group by zone/pod/cluster: fix a bug that "Total
of Virtual Routers" in first row is blank.


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

Branch: refs/heads/4.3
Commit: fc1dc04d42c3220849b0a475bb76e9f9a2db970f
Parents: b180717
Author: Jessica Wang <jessicawang@apache.org>
Authored: Wed Jan 8 14:54:08 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Wed Jan 8 14:54:17 2014 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc1dc04d/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index d3dbfd7..fb12bb2 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -18019,6 +18019,8 @@
                         		groupbyObj.routerCount = routerCountFromAllPages;
                         		
                             	routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
     	        	                                                		
+                        	} else {
+                        		groupbyObj.routerCount = routerCountFromAllPages;
                         	}
                         }    	                                                		
                 	});    	                                                	
@@ -18047,13 +18049,31 @@
                                 		projectid: -1
                                 	}),
                             		success: function(json) {  
-                            			routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
   	                                                    			                              
                     			
-                            			var items = json.listroutersresponse.router;
-                            			for (var k = 0; k < items.length; k++) {    	         
                                          				
-                            				if (items[k].requiresupgrade) {
-                            					routerRequiresUpgrade++;
-                            				}
-                            			}       	    	                                           
        			
+                            			if (json.listroutersresponse.count != undefined) {       
                    		                                            		    	                
                           		
+                                    		routerCountFromAllPages += json.listroutersresponse.count;
   
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    		
+                                        	routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
     	        	                                                		
+                                    	} else {
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    	}
+                            			
+                            			
+                            			if (json.listroutersresponse.count != undefined) {       
                    		                                            		    	                
                           		
+                                    		routerCountFromAllPages += json.listroutersresponse.count;
   
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    		
+                                        	routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
                                                       			                               
                    			
+	                            			
+	                            			var items = json.listroutersresponse.router;
+	                            			for (var k = 0; k < items.length; k++) {    	        
                                           				
+	                            				if (items[k].requiresupgrade) {
+	                            					routerRequiresUpgrade++;
+	                            				}
+	                            			}  
+                            			} else {
+                                    		groupbyObj.routerCount = routerCountFromAllPages;
+                                    	}
                             		}
                     			});    	                                                    			
                     			


Mime
View raw message