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 B6034177E0 for ; Tue, 14 Apr 2015 20:48:40 +0000 (UTC) Received: (qmail 17393 invoked by uid 500); 14 Apr 2015 20:48:40 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 17335 invoked by uid 500); 14 Apr 2015 20:48:40 -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 17326 invoked by uid 99); 14 Apr 2015 20:48:40 -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, 14 Apr 2015 20:48:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 585A8E0416; Tue, 14 Apr 2015 20:48:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: michellep@apache.org To: commits@couchdb.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: fauxton commit: updated refs/heads/master to 9d8be3b Date: Tue, 14 Apr 2015 20:48:40 +0000 (UTC) Repository: couchdb-fauxton Updated Branches: refs/heads/master a34579ad8 -> 9d8be3bb2 error handling for Active Tasks Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/9d8be3bb Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/9d8be3bb Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/9d8be3bb Branch: refs/heads/master Commit: 9d8be3bb26fde37637f9555aa4361f207fb5d96a Parents: a34579a Author: michellephung@gmail.com Authored: Tue Apr 14 15:05:55 2015 -0400 Committer: michellephung@gmail.com Committed: Tue Apr 14 16:47:55 2015 -0400 ---------------------------------------------------------------------- app/addons/activetasks/components.react.jsx | 2 +- app/addons/activetasks/routes.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9d8be3bb/app/addons/activetasks/components.react.jsx ---------------------------------------------------------------------- diff --git a/app/addons/activetasks/components.react.jsx b/app/addons/activetasks/components.react.jsx index 235b25d..0110580 100644 --- a/app/addons/activetasks/components.react.jsx +++ b/app/addons/activetasks/components.react.jsx @@ -78,7 +78,7 @@ define([ var setSearchTerm = this.setNewSearchTerm; var onTableHeaderClick = this.tableHeaderOnClick; - if (collection.length === 0 ) { + if (_.isUndefined(collection) || collection.length === 0) { return (

No active tasks.

); } return ( http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/9d8be3bb/app/addons/activetasks/routes.js ---------------------------------------------------------------------- diff --git a/app/addons/activetasks/routes.js b/app/addons/activetasks/routes.js index 0340100..cb9f673 100644 --- a/app/addons/activetasks/routes.js +++ b/app/addons/activetasks/routes.js @@ -23,6 +23,7 @@ function (app, FauxtonAPI, ActiveTasksResources, ActiveTasksComponents, Actions) var ActiveTasksRouteObject = FauxtonAPI.RouteObject.extend({ selectedHeader: 'Active Tasks', layout: 'one_pane', + disableLoader: true, routes: { 'activetasks/:id': 'showActiveTasks', 'activetasks': 'showActiveTasks' @@ -40,7 +41,7 @@ function (app, FauxtonAPI, ActiveTasksResources, ActiveTasksComponents, Actions) }, showActiveTasks: function () { Actions.fetchAndSetActiveTasks(this.allTasks); - Actions.changePollingInterval(5); + Actions.changePollingInterval(1); this.setComponent('#dashboard-content', ActiveTasksComponents.ActiveTasksController); this.setComponent('#right-header', ActiveTasksComponents.ActiveTasksPollingWidgetController);