suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Display repos with no builds, but which are active in 'My repositories'"

Browse Source 
This reverts commit fbed80f166.

Conflicts:
	assets/scripts/app/templates/repos/list.hbs
This commit is contained in:
Sven Fuchs 2013-11-12 16:06:26 +01:00
parent 028733df90
commit eaf260a516
5 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/scripts/app/controllers.coffee
View File

@ -48,14 +48,6 @@ Travis.FirstSyncController = Em.Controller.extend
isSyncing: Ember.computed.alias('user.isSyncing') 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/accounts'
require 'controllers/build' require 'controllers/build'
require 'controllers/builds' require 'controllers/builds'

3
assets/scripts/app/models/repo.coffee
View File

@ -12,7 +12,6 @@ require 'travis/model'
lastBuildFinishedAt: Ember.attr('string') lastBuildFinishedAt: Ember.attr('string')
githubLanguage: Ember.attr('string') githubLanguage: Ember.attr('string')
_lastBuildDuration: Ember.attr(Number, key: 'last_build_duration') _lastBuildDuration: Ember.attr(Number, key: 'last_build_duration')
active: Ember.attr('boolean')
lastBuild: Ember.belongsTo('Travis.Build', key: 'last_build_id') lastBuild: Ember.belongsTo('Travis.Build', key: 'last_build_id')
@ -114,7 +113,7 @@ require 'travis/model'
@find(owner_name: login, orderBy: 'name') @find(owner_name: login, orderBy: 'name')
accessibleBy: (login) -> accessibleBy: (login) ->
@find(member: login, active: true) @find(member: login, orderBy: 'name')
search: (query) -> search: (query) ->
@find(search: query, orderBy: 'name') @find(search: query, orderBy: 'name')

2
assets/scripts/app/routes.coffee
View File

@ -125,7 +125,7 @@ Travis.SetupLastBuild = Ember.Mixin.create
repo = @controllerFor('repo').get('repo') repo = @controllerFor('repo').get('repo')
if repo && repo.get('isLoaded') && !repo.get('lastBuild') if repo && repo.get('isLoaded') && !repo.get('lastBuild')
Ember.run.next => 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 Travis.GettingStartedRoute = Ember.Route.extend
setupController: -> setupController: ->

6
assets/scripts/app/templates/builds/not_found.hbs
View File

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

13
assets/scripts/app/templates/repos/list.hbs
View File

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