diff --git a/src/scripts/filters/taskStatus.js b/src/scripts/filters/taskStatus.js index 8029d38..7c33368 100644 --- a/src/scripts/filters/taskStatus.js +++ b/src/scripts/filters/taskStatus.js @@ -2,7 +2,7 @@ 'use strict'; angular.module('ariaNg').filter('taskStatus', function () { - return function (task) { + return function (task, simplify) { if (!task) { return ''; } @@ -17,11 +17,11 @@ return 'Waiting'; } else if (task.status === 'paused') { return 'Paused'; - } else if (task.status === 'complete') { + } else if (!simplify && task.status === 'complete') { return 'Completed'; - } else if (task.status === 'error') { + } else if (!simplify && task.status === 'error') { return (task.errorCode ? 'format.task.error-occurred' : 'Error Occurred'); - } else if (task.status === 'removed') { + } else if (!simplify && task.status === 'removed') { return 'Removed'; } else { return ''; diff --git a/src/views/list.html b/src/views/list.html index bff00e5..fefa46c 100644 --- a/src/views/list.html +++ b/src/views/list.html @@ -65,13 +65,13 @@ + ng-bind="(task.status === 'active' ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode}))">