From c9a36fe4b29d7c87252ef2d78c34d42abaacb757 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Thu, 22 Oct 2015 19:49:10 +0200 Subject: [PATCH] Fixed sorting on Progress in Queue. Fixes #882 --- src/UI/Activity/Queue/QueueCollection.js | 13 +++++++++++++ src/UI/Activity/Queue/QueueLayout.js | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/UI/Activity/Queue/QueueCollection.js b/src/UI/Activity/Queue/QueueCollection.js index d53eb511a..474cafe6b 100644 --- a/src/UI/Activity/Queue/QueueCollection.js +++ b/src/UI/Activity/Queue/QueueCollection.js @@ -61,6 +61,19 @@ var QueueCollection = PageableCollection.extend({ return Number.MAX_VALUE; } + }, + + sizeleft : { + sortValue : function(model, attr) { + var size = model.get('size'); + var sizeleft = model.get('sizeleft'); + + if (size && sizeleft) { + return sizeleft / size; + } + + return 0; + } } } }); diff --git a/src/UI/Activity/Queue/QueueLayout.js b/src/UI/Activity/Queue/QueueLayout.js index ba51238ad..585c27766 100644 --- a/src/UI/Activity/Queue/QueueLayout.js +++ b/src/UI/Activity/Queue/QueueLayout.js @@ -61,7 +61,7 @@ module.exports = Marionette.Layout.extend({ cellValue : 'this' }, { - name : 'episode', + name : 'sizeleft', label : 'Progress', cell : ProgressCell, cellValue : 'this'