cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [41/50] [abbrv] git commit: refs/heads/ui-multiple-pod-ranges - 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 delet
Date Mon, 25 Mar 2013 17:52:41 GMT
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.


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

Branch: refs/heads/ui-multiple-pod-ranges
Commit: 8ecdbd8537d34a6f44aa5b005cd6ee0bdf02bbcb
Parents: b932059
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Fri Mar 22 12:02:27 2013 -0700
Committer: Jessica Wang <jessica.wang@citrix.com>
Committed: Fri Mar 22 12:02:27 2013 -0700

----------------------------------------------------------------------
 ui/scripts/regions.js           |    4 +++-
 ui/scripts/ui-custom/regions.js |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ecdbd85/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index 14346c8..8839dec 100644
--- 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) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ecdbd85/ui/scripts/ui-custom/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
index 4620ea4..17bc86c 100644
--- 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', '');   
+            }						
           }
         }
       });


Mime
View raw message