diff --git a/app/controllers/caches.coffee b/app/controllers/caches.coffee index 3c7fd3c4..70940d3a 100644 --- a/app/controllers/caches.coffee +++ b/app/controllers/caches.coffee @@ -7,6 +7,10 @@ Controller = Ember.Controller.extend isDeleting: false + cachesExist: (-> + @get('model.pushes.length') || @get('model.pullRequests.length') + ).property('model.pushes.length', 'model.pullRequests.length') + actions: deleteRepoCache: -> return if @get('isDeleting') diff --git a/app/routes/caches.coffee b/app/routes/caches.coffee index b1ee7944..a792236f 100644 --- a/app/routes/caches.coffee +++ b/app/routes/caches.coffee @@ -12,11 +12,11 @@ Route = TravisRoute.extend repo = @modelFor('repo') Ajax.get("/repos/#{repo.get('id')}/caches").then( (data) -> caches = {} - + data["caches"].forEach (cacheData) -> branch = cacheData.branch cache = caches[branch] - + if cache cache.size += cacheData.size @@ -28,7 +28,7 @@ Route = TravisRoute.extend pushes = [] pullRequests = [] - + for branch, cache of caches if /PR./.test(branch) cache.type = "pull_request" diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index bdcda3d7..fdf1343e 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -10,10 +10,6 @@ Route = TravisRoute.extend "#{model.name}" model: (params) -> - owner = {} - - $.get(config.apiEndpoint + "/v3/owner/#{params.owner}?include=user.repositories,organization.repositories,build.commit,repository.active").then( (data) -> - data - ) + $.get(config.apiEndpoint + "/v3/owner/#{params.owner}?include=user.repositories,organization.repositories,build.commit,repository.active") `export default Route` diff --git a/app/templates/caches.hbs b/app/templates/caches.hbs index c79ca46a..64dc9753 100644 --- a/app/templates/caches.hbs +++ b/app/templates/caches.hbs @@ -1,17 +1,18 @@ -{{#if model.pushes.length}} - +{{#if cachesExist}}

All caches (documentation)

Delete all repository caches
-

Pushes

- + {{#if model.pushes.length}} +

Pushes

+ + {{/if}} {{#if model.pullRequests.length}}

Pull Requests