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 D7A47185E7 for ; Tue, 7 Jul 2015 23:19:09 +0000 (UTC) Received: (qmail 46948 invoked by uid 500); 7 Jul 2015 23:19:09 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 46917 invoked by uid 500); 7 Jul 2015 23:19:09 -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 46908 invoked by uid 99); 7 Jul 2015 23:19:09 -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; Tue, 07 Jul 2015 23:19:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A06E3E2F3C; Tue, 7 Jul 2015 23:19:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jaimin@apache.org To: commits@ambari.apache.org Message-Id: <00118c928e73487ebf7ac0ee9292ac0a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-12297. When in the Tez view, you cannot switch to the Hive view. (Erik via Jaimin) Date: Tue, 7 Jul 2015 23:19:09 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-2.1 94bc6aaec -> 62fa3550d AMBARI-12297. When in the Tez view, you cannot switch to the Hive view. (Erik via Jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/62fa3550 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/62fa3550 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/62fa3550 Branch: refs/heads/branch-2.1 Commit: 62fa3550d11655e854863027ffe83acad887b464 Parents: 94bc6aa Author: Jaimin Jetly Authored: Tue Jul 7 16:18:49 2015 -0700 Committer: Jaimin Jetly Committed: Tue Jul 7 16:18:49 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/routes/views.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/62fa3550/ambari-web/app/routes/views.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/views.js b/ambari-web/app/routes/views.js index 051d218..08396eb 100644 --- a/ambari-web/app/routes/views.js +++ b/ambari-web/app/routes/views.js @@ -39,7 +39,11 @@ module.exports = Em.Route.extend({ var href = ['/views', params.viewName, params.version, params.instanceName + "/"].join('/'); var viewPath = this.parseViewPath(window.location.href.slice(window.location.href.indexOf('?'))); if (viewPath) { - href = ['/views', params.viewName, params.version, params.instanceName.slice(0, params.instanceName.lastIndexOf('?')) + "/"].join('/'); + var slicedInstanceName = this._getSlicedInstanceName(params.instanceName); + if (slicedInstanceName === params.instanceName) { + viewPath = ''; + } + href = ['/views', params.viewName, params.version, slicedInstanceName + "/"].join('/'); //remove slash from viewPath since href already contains it at the end if (viewPath.charAt(0) === '/') viewPath = viewPath.slice(1); } @@ -50,6 +54,22 @@ module.exports = Em.Route.extend({ router.get('mainController').connectOutlet('mainViewsDetails', content); }); }, + + /** + * parse the instance name and slice if needed + * + * @param {string} + * @returns {string} + * @private + */ + _getSlicedInstanceName: function (instanceName) { + if (instanceName.lastIndexOf('?') > -1) { + return instanceName.slice(0, instanceName.lastIndexOf('?')); + } + + return instanceName; + }, + /** * parse internal view path * "viewPath" - used as a key of additional path