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

Fix search

Browse Source
This commit is contained in:
Piotr Sarnacki 2015-12-09 10:11:00 +01:00
parent 00653e9420
commit 09f27d47be
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/repos.js
View File

@ -50,6 +50,8 @@ var sortCallback = function(repo1, repo2) {
var Controller = Ember.Controller.extend({ var Controller = Ember.Controller.extend({
ajax: Ember.inject.service(),
actions: { actions: {
activate: function(name) { activate: function(name) {
return this.activate(name); return this.activate(name);
@ -174,7 +176,7 @@ var Controller = Ember.Controller.extend({
viewSearch(phrase) { viewSearch(phrase) {
this.set('search', phrase); this.set('search', phrase);
this.set('isLoaded', false); this.set('isLoaded', false);
Repo.search(this.store, phrase).then( (reposRecordArray) => { Repo.search(this.store, this.get('ajax'), phrase).then( (reposRecordArray) => {
this.set('isLoaded', true); this.set('isLoaded', true);
this.set('_repos', reposRecordArray); this.set('_repos', reposRecordArray);
}); });

19
app/models/repo.coffee
View File

@ -140,17 +140,20 @@ Repo.reopenClass
promise promise
search: (store, query) -> search: (store, ajax, query) ->
promise = store.query('repo', search: query, orderBy: 'name') queryString = $.param(search: query, orderBy: 'name', limit: 5)
promise = ajax.ajax("/repos?#{queryString}", 'get')
result = Ember.ArrayProxy.create(content: []) result = Ember.ArrayProxy.create(content: [])
promise.then -> promise.then (data, status, xhr) ->
result.pushObjects(promise.get('content').toArray()) promises = data.repos.map (repoData) ->
result.set('isLoaded', true) store.findRecord('repo', repoData.id).then (record) ->
result.pushObject(record)
result.set('isLoaded', true)
record
result Ember.RSVP.allSettled(promises).then ->
result
promise
withLastBuild: (store) -> withLastBuild: (store) ->
repos = store.filter('repo', {}, (build) -> repos = store.filter('repo', {}, (build) ->

4
app/routes/getting-started.coffee
View File

@ -1,5 +1,7 @@
`import TravisRoute from 'travis/routes/basic'` `import TravisRoute from 'travis/routes/basic'`
Route = TravisRoute.extend() Route = TravisRoute.extend
setupController: (controller)->
@container.lookup('controller:repos').activate('owned')
`export default Route` `export default Route`

2
app/routes/main.coffee
View File

@ -14,6 +14,6 @@ Route = TravisRoute.extend
setupController: (controller)-> setupController: (controller)->
# TODO: this is redundant with repositories and recent routes # TODO: this is redundant with repositories and recent routes
@container.lookup('controller:repos').activate('owned') #@container.lookup('controller:repos').activate('owned')
`export default Route` `export default Route`

1
app/routes/repo.coffee
View File

@ -11,6 +11,7 @@ Route = TravisRoute.extend
@render 'repo', into: 'main' @render 'repo', into: 'main'
setupController: (controller, model) -> setupController: (controller, model) ->
@container.lookup('controller:repos').activate('owned')
# TODO: if repo is just a data hash with id and slug load it # TODO: if repo is just a data hash with id and slug load it
# as incomplete record # as incomplete record
model = @get('store').find('repo', model.id) if model && !model.get model = @get('store').find('repo', model.id) if model && !model.get