CLOUDSTACK-1065: cloudstack UI - AWS Style Regions - allow user to delete region whose end point matches the current URL, but set region button on top menu to blank after the region is deleted.

Jessica Wang · Jessica Wang · commit 8ecdbd8537d3 · 2013-03-22T12:02:27.000-07:00
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
@@ -136,10 +136,12 @@
 							region.endpoint	== "http://localhost:8080/client/" 
 							document.location.href == "http://localhost:8080/client/#" 
 							*/
+							/*
 							if(document.location.href.indexOf(region.endpoint) != -1) {	
 							  cloudStack.dialog.notice({ message: _l('You can not remove the region that you are currently in.') });
                 return false;
-							}						
+							}				
+              */							
               return true;
             },	
             action: function(args) {
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
@@ -50,7 +50,10 @@
 							
             if(currentRegion != null)	{						
 						  $regionSwitcherButton.find('.title').html(_s(currentRegion.name)).attr('title', _s(currentRegion.name));   
-            }							
+            }		
+            else {
+              $regionSwitcherButton.find('.title').html('').attr('title', '');   
+            }						
           }
         }
       });

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,10 @@`
`50`	`50`
`51`	`51`	`if(currentRegion != null) {`
`52`	`52`	`$regionSwitcherButton.find('.title').html(_s(currentRegion.name)).attr('title', _s(currentRegion.name));`
`53`		`- }`
	`53`	`+ }`
	`54`	`+ else {`
	`55`	`+ $regionSwitcherButton.find('.title').html('').attr('title', '');`
	`56`	`+ }`
`54`	`57`	`}`
`55`	`58`	`}`
`56`	`59`	`});`