cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [16/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 2a99064
Date Tue, 09 Apr 2013 13:20:53 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/fc946ae5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc946ae5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc946ae5

Branch: refs/heads/marvin_refactor
Commit: fc946ae542a9e3d48cfde42ae4cd8a1f81d7dfb3
Parents: b9dc546
Author: Jessica Wang <jessica.wang@citrix.com>
Authored: Fri Mar 22 12:02:27 2013 -0700
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sun Mar 31 22:02:55 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc946ae5/ui/scripts/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
index a271a1a..70d18ef 100644
--- a/ui/scripts/regions.js
+++ b/ui/scripts/regions.js
@@ -130,10 +130,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/fc946ae5/ui/scripts/ui-custom/regions.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
index 9c139e5..8210898 100644
--- a/ui/scripts/ui-custom/regions.js
+++ b/ui/scripts/ui-custom/regions.js
@@ -51,6 +51,9 @@
             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