Merge branch 'show-active-repos'

This commit is contained in:
Piotr Sarnacki 2013-10-29 18:05:33 +01:00
commit f089ee91a3
5 changed files with 27 additions and 9 deletions

View File

@ -48,6 +48,14 @@ 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'

View File

@ -12,6 +12,7 @@ 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')
@ -113,7 +114,7 @@ require 'travis/model'
@find(owner_name: login, orderBy: 'name')
accessibleBy: (login) ->
@find(member: login, orderBy: 'name')
@find(member: login, active: true)
search: (query) ->
@find(search: query, orderBy: 'name')

View File

@ -124,7 +124,8 @@ Travis.SetupLastBuild = Ember.Mixin.create
# TODO: it would be nicer to do it with promises
repo = @controllerFor('repo').get('repo')
if repo && repo.get('isLoaded') && !repo.get('lastBuild')
@render('builds/not_found', outlet: 'pane', into: 'repo')
Ember.run.next =>
@render('builds/not_found', outlet: 'pane', into: 'repo', controller: 'buildNotFound')
Travis.GettingStartedRoute = Ember.Route.extend
setupController: ->
@ -281,7 +282,8 @@ Travis.RepoRoute = Ember.Route.extend
proxy.set 'isLoading', false
if repos.get('length') == 0
self.render('repos/not_found', outlet: 'main')
Ember.run.next ->
self.render('repos/not_found', outlet: 'main')
else
proxy.set 'content', repos.objectAt(0)

View File

@ -1 +1,5 @@
There are no builds for this repository.
{{#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}}

View File

@ -14,11 +14,14 @@
{{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}}
{{/if}}
</div>
{{#with lastBuildHash}}
{{#if repo.slug}}
{{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}}
{{/if}}
{{/with}}
{{#if lastBuild}}
{{#with lastBuildHash}}
{{#if repo.slug}}
{{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}}
{{/if}}
{{/with}}
{{/if}}
<p class="summary">
<span class="duration-icon"></span><span class="duration_label">{{t repositories.duration}}:</span>