Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-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 413FF18A7A for ; Fri, 11 Dec 2015 16:55:44 +0000 (UTC) Received: (qmail 39112 invoked by uid 500); 11 Dec 2015 16:55:44 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 39083 invoked by uid 500); 11 Dec 2015 16:55:44 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 39073 invoked by uid 99); 11 Dec 2015 16:55:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Dec 2015 16:55:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2CC4E03C8; Fri, 11 Dec 2015 16:55:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: alexantonenko@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?ambari_git_commit=3A_AMBARI-14331=2E_Ambari_local_admin_?= =?utf-8?q?endpoint_doesn=E2=80=99t_work_when_sso_is_enabled=2E?= Date: Fri, 11 Dec 2015 16:55:43 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk c5065addc -> 06855e843 AMBARI-14331. Ambari local admin endpoint doesn’t work when sso is enabled. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/06855e84 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/06855e84 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/06855e84 Branch: refs/heads/trunk Commit: 06855e8433a2ac82cca4ce67f88a91f2f46f395b Parents: c5065ad Author: Alex Antonenko Authored: Fri Dec 11 18:51:29 2015 +0200 Committer: Alex Antonenko Committed: Fri Dec 11 18:55:39 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/utils/ember_reopen.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/06855e84/ambari-web/app/utils/ember_reopen.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ember_reopen.js b/ambari-web/app/utils/ember_reopen.js index 9de23db..29d14c8 100644 --- a/ambari-web/app/utils/ember_reopen.js +++ b/ambari-web/app/utils/ember_reopen.js @@ -259,6 +259,7 @@ Ember.Router.reopen({ var args = arguments; var transitionTo = self._super; var callback = function () { + self.get('location').setURL(path); transitionTo.apply(self, args); }; var realPath; @@ -270,4 +271,4 @@ Ember.Router.reopen({ this.get('currentState').exitRoute(this, path, callback); } } -}); \ No newline at end of file +});