Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 22105C7EE for ; Mon, 9 Sep 2013 09:53:50 +0000 (UTC) Received: (qmail 20921 invoked by uid 500); 9 Sep 2013 09:53:28 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 20351 invoked by uid 500); 9 Sep 2013 09:53:25 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 19597 invoked by uid 99); 9 Sep 2013 09:53:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Sep 2013 09:53:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0899B90396E; Mon, 9 Sep 2013 09:53:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org Date: Mon, 09 Sep 2013 09:53:45 -0000 Message-Id: <130e12ff53844d40bcd3e1cd445699de@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] git commit: updated refs/heads/1867-feature-plugins to 8aad450 Fauxton: Fix auth bug not showing accessible page Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/27b9feb9 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/27b9feb9 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/27b9feb9 Branch: refs/heads/1867-feature-plugins Commit: 27b9feb910229ca3ec01f79b7671dd7a9b9adc01 Parents: d8f1201 Author: Garren Smith Authored: Mon Aug 19 17:01:39 2013 +0200 Committer: Jan Lehnardt Committed: Mon Sep 9 11:16:43 2013 +0200 ---------------------------------------------------------------------- src/fauxton/app/addons/auth/base.js | 3 +-- src/fauxton/app/addons/auth/routes.js | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/27b9feb9/src/fauxton/app/addons/auth/base.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/auth/base.js b/src/fauxton/app/addons/auth/base.js index 3502edd..9f9a332 100644 --- a/src/fauxton/app/addons/auth/base.js +++ b/src/fauxton/app/addons/auth/base.js @@ -49,8 +49,7 @@ function(app, FauxtonAPI, Auth) { }; var authDenied = function () { - app.masterLayout.setView('#dashboard', new Auth.NoAccessView()); - app.masterLayout.renderView('#dashboard'); + FauxtonAPI.navigate('/noAccess'); }; FauxtonAPI.auth.registerAuth(auth); http://git-wip-us.apache.org/repos/asf/couchdb/blob/27b9feb9/src/fauxton/app/addons/auth/routes.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/auth/routes.js b/src/fauxton/app/addons/auth/routes.js index ecd45f2..fe40a77 100644 --- a/src/fauxton/app/addons/auth/routes.js +++ b/src/fauxton/app/addons/auth/routes.js @@ -52,6 +52,7 @@ function(app, FauxtonAPI, Auth) { noAccess: function () { this.crumbs = [{name: 'Access Denied', link:"#"}]; this.setView('#dashboard-content', new Auth.NoAccessView()); + this.apiUrl = 'noAccess'; }, });