Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 02DA5200B48 for ; Mon, 18 Jul 2016 20:24:07 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 01699160A65; Mon, 18 Jul 2016 18:24:07 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4BB53160A5D for ; Mon, 18 Jul 2016 20:24:06 +0200 (CEST) Received: (qmail 66470 invoked by uid 500); 18 Jul 2016 18:24:05 -0000 Mailing-List: contact commits-help@zeppelin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zeppelin.apache.org Delivered-To: mailing list commits@zeppelin.apache.org Received: (qmail 66461 invoked by uid 99); 18 Jul 2016 18:24:05 -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; Mon, 18 Jul 2016 18:24:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5888DDFAF5; Mon, 18 Jul 2016 18:24:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: minalee@apache.org To: commits@zeppelin.apache.org Message-Id: <88cd0945a4984c4c974eea6e52051282@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zeppelin git commit: ZEPPELIN-1145 Zeppelin UI fails to load page with HTTP 500 error when user tries to login from dialog box Date: Mon, 18 Jul 2016 18:24:05 +0000 (UTC) archived-at: Mon, 18 Jul 2016 18:24:07 -0000 Repository: zeppelin Updated Branches: refs/heads/branch-0.6 c34aaf9f3 -> 4b1e7275e ZEPPELIN-1145 Zeppelin UI fails to load page with HTTP 500 error when user tries to login from dialog box ### What is this PR for? Please look at ZEPPELIN-1145 for detailed steps to reproduce this issue. ### What type of PR is it? Bug Fix ### What is the Jira issue? ZEPPELIN-1145 ### How should this be tested? Follow the steps in ZEPPELIN-1145 ### Questions: * Does the licenses files need update? n/a * Is there breaking changes for older versions? n/a * Does this needs documentation? n/a Author: Renjith Kamath Closes #1156 from r-kamath/ZEPPELIN-1145 and squashes the following commits: d9c730e [Renjith Kamath] ZEPPELIN-1145 Zeppelin UI fails to load page with HTTP 500 error when user tries to login from dialog box (cherry picked from commit 512f0526062ff4204448b76c9b17fbf247138591) Signed-off-by: Mina Lee Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4b1e7275 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4b1e7275 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4b1e7275 Branch: refs/heads/branch-0.6 Commit: 4b1e7275ea15ea5748e913b9fbf9e5140d549876 Parents: c34aaf9 Author: Renjith Kamath Authored: Sat Jul 9 12:09:25 2016 +0530 Committer: Mina Lee Committed: Tue Jul 19 03:23:58 2016 +0900 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/notebook.controller.js | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4b1e7275/zeppelin-web/src/app/notebook/notebook.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index b275601..d797d21 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -93,6 +93,10 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', $('html, body').scrollTo({top: top, left: 0}); } + // force notebook reload on user change + $scope.$on('setNoteMenu', function(event, note) { + initNotebook(); + }); }, 1000 );