diff --git a/assets/scripts/app/controllers.coffee b/assets/scripts/app/controllers.coffee index 960e2024..f1b4f520 100644 --- a/assets/scripts/app/controllers.coffee +++ b/assets/scripts/app/controllers.coffee @@ -48,14 +48,6 @@ Travis.FirstSyncController = Em.Controller.extend isSyncing: Ember.computed.alias('user.isSyncing') -Travis.BuildNotFoundController = Em.Controller.extend - needs: ['repo', 'currentUser'] - ownedAndActive: (-> - if permissions = @get('controllers.currentUser.permissions') - if repo = @get('controllers.repo.repo') - repo.get('active') && permissions.contains(parseInt(repo.get('id'))) - ).property('controllers.repo.repo', 'controllers.currentUser.permissions') - require 'controllers/accounts' require 'controllers/build' require 'controllers/builds' diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee index 54fbdb42..790b3f67 100644 --- a/assets/scripts/app/models/repo.coffee +++ b/assets/scripts/app/models/repo.coffee @@ -12,7 +12,6 @@ require 'travis/model' lastBuildFinishedAt: Ember.attr('string') githubLanguage: Ember.attr('string') _lastBuildDuration: Ember.attr(Number, key: 'last_build_duration') - active: Ember.attr('boolean') lastBuild: Ember.belongsTo('Travis.Build', key: 'last_build_id') @@ -114,7 +113,7 @@ require 'travis/model' @find(owner_name: login, orderBy: 'name') accessibleBy: (login) -> - @find(member: login, active: true) + @find(member: login, orderBy: 'name') search: (query) -> @find(search: query, orderBy: 'name') diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index cb68dee1..02f86e62 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -125,7 +125,7 @@ Travis.SetupLastBuild = Ember.Mixin.create repo = @controllerFor('repo').get('repo') if repo && repo.get('isLoaded') && !repo.get('lastBuild') Ember.run.next => - @render('builds/not_found', outlet: 'pane', into: 'repo', controller: 'buildNotFound') + @render('builds/not_found', outlet: 'pane', into: 'repo') Travis.GettingStartedRoute = Ember.Route.extend setupController: -> diff --git a/assets/scripts/app/templates/builds/not_found.hbs b/assets/scripts/app/templates/builds/not_found.hbs index 1226b546..7fbeea2e 100644 --- a/assets/scripts/app/templates/builds/not_found.hbs +++ b/assets/scripts/app/templates/builds/not_found.hbs @@ -1,5 +1 @@ -{{#if ownedAndActive}} - This repository is active, but there are no builds yet. Builds will appear here after you push new commits to the repository. -{{else}} - There are no builds for this repository. -{{/if}} +There are no builds for this repository. diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs index 626ffb3c..378891fc 100644 --- a/assets/scripts/app/templates/repos/list.hbs +++ b/assets/scripts/app/templates/repos/list.hbs @@ -14,14 +14,11 @@ {{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}} {{/if}} - - {{#if lastBuildHash.number}} - {{#with lastBuildHash}} - {{#if repo.slug}} - {{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}} - {{/if}} - {{/with}} - {{/if}} + {{#with lastBuildHash}} + {{#if repo.slug}} + {{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}} + {{/if}} + {{/with}}
{{t repositories.duration}}: