mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Downloaded overrides other statuses.

This commit is contained in:
Mark McDowall 2013-07-28 19:30:01 -07:00
parent a2054e782f
commit 56a34b5ea6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UI/Calendar/CalendarView.js
View File

@ -85,7 +85,11 @@ define(
var statusLevel = 'primary';
if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
if (hasFile) {
statusLevel = 'success';
}
else if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
statusLevel = 'warning';
}
@ -93,10 +97,6 @@ define(
statusLevel = 'danger';
}
else if (hasFile) {
statusLevel = 'success';
}
var test = currentTime.startOf('day').format('LLLL');
if (end.isBefore(currentTime.startOf('day'))) {

8
UI/Handlebars/Helpers/Episode.js
View File

@ -24,6 +24,10 @@ define(
var start = Moment(this.airDateUtc);
var end = Moment(this.end);
if (hasFile) {
return 'success';
}
if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
return 'warning';
}
@ -32,10 +36,6 @@ define(
return 'danger';
}
if (hasFile) {
return 'success';
}
return 'primary';
});