Merge pull request #4148 from waldenraines/5913

Fixes #5913, BZ1093601 let org-switcher clear URLs pass through bastion.
Katello · May 23, 2014 · 3d8709f · 3d8709f
2 parents a8d5af3 + 3a3992f
commit 3d8709f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/engines/bastion/app/assets/javascripts/bastion/bastion.module.js b/engines/bastion/app/assets/javascripts/bastion/bastion.module.js
@@ -212,7 +212,7 @@ angular.module('Bastion').run(['$rootScope', '$state', '$stateParams', 'gettextC
         );
 
         // Prevent angular from handling org/location switcher URLs
-        orgSwitcherRegex = new RegExp("/(organizations|locations)/.+/select");
+        orgSwitcherRegex = new RegExp("/(organizations|locations)/(.+/)*(select|clear)");
         $rootScope.$on('$locationChangeStart', function (event, newUrl) {
             if (newUrl.match(orgSwitcherRegex)) {
                 event.preventDefault();