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 719FB200BD0 for ; Wed, 30 Nov 2016 22:10:13 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 701C3160B13; Wed, 30 Nov 2016 21:10:13 +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 B992B160B06 for ; Wed, 30 Nov 2016 22:10:12 +0100 (CET) Received: (qmail 48236 invoked by uid 500); 30 Nov 2016 21:10:12 -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 48227 invoked by uid 99); 30 Nov 2016 21:10:11 -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; Wed, 30 Nov 2016 21:10:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5964DFCF9; Wed, 30 Nov 2016 21:10:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sangeetar@apache.org To: commits@ambari.apache.org Message-Id: <4e548ee0b69c485a929b33ceab4b2b58@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18600: Workflow Designer View: When logs are empty, you see the spinner, instead of a message (sangeetar) Date: Wed, 30 Nov 2016 21:10:11 +0000 (UTC) archived-at: Wed, 30 Nov 2016 21:10:13 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.5 037ed6326 -> 47d2f7074 AMBARI-18600: Workflow Designer View: When logs are empty, you see the spinner, instead of a message (sangeetar) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47d2f707 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47d2f707 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47d2f707 Branch: refs/heads/branch-2.5 Commit: 47d2f707499275a35269f7335182e5c8715d7f8b Parents: 037ed63 Author: Sangeeta Ravindran Authored: Wed Nov 30 13:09:19 2016 -0800 Committer: Sangeeta Ravindran Committed: Wed Nov 30 13:09:35 2016 -0800 ---------------------------------------------------------------------- .../wfmanager/src/main/resources/ui/app/components/job-details.js | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/47d2f707/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js index e403dc4..0e5fd36 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js @@ -349,6 +349,7 @@ export default Ember.Component.extend({ url = url + '&type=action&scope='+ params.logActionList; } Ember.$.get(url,function(response){ + response = response.trim().length > 0 ? response : "No messages present"; this.set('model.jobLog', response); }.bind(this)).fail(function(error){ this.set('error', error); @@ -356,6 +357,7 @@ export default Ember.Component.extend({ }, getErrorLog : function (){ Ember.$.get(Ember.ENV.API_URL+'/v2/job/'+this.get('id')+'?show=errorlog',function(response){ + response = response.trim().length > 0 ? response : "No messages present"; this.set('model.errorLog', response); }.bind(this)).fail(function(error){ this.set('error', error); @@ -363,6 +365,7 @@ export default Ember.Component.extend({ }, getAuditLog : function (){ Ember.$.get(Ember.ENV.API_URL+'/v2/job/'+this.get('id')+'?show=auditlog',function(response){ + response = response.trim().length > 0 ? response : "No messages present"; this.set('model.auditLog', response); }.bind(this)).fail(function(error){ this.set('error', error);