From c70ed06848a543055107260d46b11866854f4ad6 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 14 Jan 2016 15:40:06 +0100 Subject: [PATCH] Fix sorting on builds list --- app/controllers/builds.js | 12 ++++++------ app/templates/builds.hbs | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/builds.js b/app/controllers/builds.js index 66d94a07..e28cf923 100644 --- a/app/controllers/builds.js +++ b/app/controllers/builds.js @@ -1,8 +1,8 @@ import Ember from 'ember'; export default Ember.Controller.extend({ - sortAscending: false, - sortProperties: ['number'], + buildsSorting: ['number:desc'], + builds: Ember.computed.sort('model', 'buildsSorting'), repoController: Ember.inject.controller('repo'), repoBinding: 'repoController.repo', tabBinding: 'repoController.tab', @@ -12,14 +12,14 @@ export default Ember.Controller.extend({ showMore() { var id, number, type; id = this.get('repo.id'); - number = this.get('model.lastObject.number'); + number = this.get('builds.lastObject.number'); type = this.get('tab') === "builds" ? 'push' : 'pull_request'; - return this.get('model').load(this.olderThanNumber(id, number, type)); + return this.get('builds').load(this.olderThanNumber(id, number, type)); }, displayShowMoreButton: function() { - return this.get('tab') !== 'branches' && parseInt(this.get('model.lastObject.number')) > 1; - }.property('tab', 'model.lastObject.number'), + return this.get('tab') !== 'branches' && parseInt(this.get('builds.lastObject.number')) > 1; + }.property('tab', 'builds.lastObject.number'), displayPullRequests: function() { return this.get('tab') === 'pull_requests'; diff --git a/app/templates/builds.hbs b/app/templates/builds.hbs index 87829b57..cd6306a1 100644 --- a/app/templates/builds.hbs +++ b/app/templates/builds.hbs @@ -1,7 +1,7 @@ {{#builds-wrapper contentType=contentType repo=repo}} -{{#if model.isLoaded}} +{{#if isLoaded}}