More 24 hour fixes

pull/6/head
Mark McDowall 10 years ago
parent 158e20bfe7
commit 940c3bdf08

@ -4,8 +4,10 @@ define(
[ [
'Cells/NzbDroneCell', 'Cells/NzbDroneCell',
'filesize', 'filesize',
'moment' 'moment',
], function (NzbDroneCell, fileSize, moment) { 'Shared/UiSettingsModel',
'Shared/FormatHelpers'
], function (NzbDroneCell, fileSize, moment, UiSettingsModel, FormatHelpers) {
return NzbDroneCell.extend({ return NzbDroneCell.extend({
className: 'timeleft-cell', className: 'timeleft-cell',
@ -17,8 +19,11 @@ define(
//If the release is pending we want to use the timeleft as the time it will be processed at //If the release is pending we want to use the timeleft as the time it will be processed at
if (this.cellValue.get('status').toLowerCase() === 'pending') { if (this.cellValue.get('status').toLowerCase() === 'pending') {
var ect = this.cellValue.get('estimatedCompletionTime');
var time = '{0} at {1}'.format(FormatHelpers.relativeDate(ect), moment(ect).format(UiSettingsModel.time(true, false)));
this.$el.html('-'); this.$el.html('-');
this.$el.attr('title', 'Will be processed during the first RSS Sync after {0}'.format(moment(this.cellValue.get('estimatedCompletionTime')).calendar())); this.$el.attr('title', 'Will be processed during the first RSS Sync after {0}'.format(time));
this.$el.attr('data-container', 'body'); this.$el.attr('data-container', 'body');
return this; return this;

@ -4,7 +4,7 @@ define(
'backgrid', 'backgrid',
'Shared/UiSettingsModel', 'Shared/UiSettingsModel',
'Shared/FormatHelpers' 'Shared/FormatHelpers'
], function (moment, Backgrid, UiSettings, FormatHelpers) { ], function (moment, Backgrid, UiSettings) {
return Backgrid.Cell.extend({ return Backgrid.Cell.extend({
className: 'age-cell', className: 'age-cell',

Loading…
Cancel
Save