From 09075e880d9152986a934432a8198e778d253cec Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 9 Jan 2015 15:02:34 +0100 Subject: [PATCH] Don't display remove log button if it's already removed --- assets/scripts/app/models/job.coffee | 6 ++---- assets/scripts/app/models/log.coffee | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/scripts/app/models/job.coffee b/assets/scripts/app/models/job.coffee index ec8d3b00..b1d20d25 100644 --- a/assets/scripts/app/models/job.coffee +++ b/assets/scripts/app/models/job.coffee @@ -132,10 +132,8 @@ require 'travis/model' ).property('finishedAt') canRemoveLog: (-> - # This should somehow get the status of removed log, but unfortunately there is - # no easy way to do that at the moment - true - ).property() + !@get('log.removed') + ).property('log.removed') slug: (-> "#{@get('repo.slug')} ##{@get('number')}" diff --git a/assets/scripts/app/models/log.coffee b/assets/scripts/app/models/log.coffee index 6056731f..08fb1973 100644 --- a/assets/scripts/app/models/log.coffee +++ b/assets/scripts/app/models/log.coffee @@ -39,7 +39,10 @@ require 'travis/log_chunks' console.log 'log model: fetching log' if Log.DEBUG @clearParts() handlers = - json: (json) => @loadParts(json['log']['parts']) + json: (json) => + if json['log']['removed_at'] + @set('removed', true) + @loadParts(json['log']['parts']) text: (text) => @loadText(text) Travis.Log.Request.create(id: id, handlers: handlers).run() if id = @get('job.id')