You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by mi...@apache.org on 2015/08/21 23:48:18 UTC
fauxton commit: updated refs/heads/master to 20efb08
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master b464db8c1 -> 20efb08b9
Fix url loop in login screen when couchdb is not running
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/20efb08b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/20efb08b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/20efb08b
Branch: refs/heads/master
Commit: 20efb08b965ecf8f2eb4d83ab582d73b9bbf6ceb
Parents: b464db8
Author: Michelle Phung <mi...@apache.org>
Authored: Fri Aug 21 15:58:34 2015 -0400
Committer: Michelle Phung <mi...@apache.org>
Committed: Fri Aug 21 17:17:24 2015 -0400
----------------------------------------------------------------------
app/addons/auth/base.js | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/20efb08b/app/addons/auth/base.js
----------------------------------------------------------------------
diff --git a/app/addons/auth/base.js b/app/addons/auth/base.js
index 8f4b1b3..0d3a04a 100644
--- a/app/addons/auth/base.js
+++ b/app/addons/auth/base.js
@@ -97,6 +97,11 @@ function (app, FauxtonAPI, Auth) {
var authDenied = function () {
var url = window.location.hash.replace('#', '');
+ var pattern = /login\?urlback=/g;
+
+ if (pattern.test(url)) {
+ url = url.replace('login?urlback=', '');
+ }
FauxtonAPI.navigate('/login?urlback=' + url, {replace: true});
};