Merge branch 'master' into radarr

1 files changed, 16 insertions, 10 deletions

diff --git a/views/series.tpl b/views/series.tpl
index 4f9e183ab..a391ad904 100644
--- a/views/series.tpl
+++ b/views/series.tpl
@@ -89,15 +89,20 @@
 						</td>

 						<td>{{!"" if row[4] == None else row[4]}}</td>

 						<td>

-							%for total_subtitles in total_subtitles_list:

-							%	if total_subtitles[0] == row[5]:

-							%		total_subs = total_subtitles[1]

+							%if not total_subtitles_list:

+							%	pass

+							%else:

+							%	total_subs = 0

+							%	for total_subtitles in total_subtitles_list:

+							%		if total_subtitles[0] == row[5]:

+							%			total_subs = total_subtitles[1]

+							%		end

 							%	end

-							%end

-							%missing_subs = 0

-							%for missing_subtitles in missing_subtitles_list:

-							%	if missing_subtitles[0] == row[5]:

-							%		missing_subs = missing_subtitles[1]

+							%	missing_subs = 0

+							%	for missing_subtitles in missing_subtitles_list:

+							%		if missing_subtitles[0] == row[5]:

+							%			missing_subs = missing_subtitles[1]

+							%		end

 							%	end

 							%end

 							<div class="ui progress" data-value="{{total_subs - missing_subs}}" data-total="{{total_subs}}">

@@ -283,10 +288,11 @@
 

 	$( ".progress" ).each(function() {

 		if ($(this).progress('is complete') != true) {

-			$(this).progress('set warning');

+			$(this).addClass('yellow');

 		}

 		if ($(this).progress('get total') == 0) {

-			$(this).progress('set success');

+			$(this).progress('update progress', '99');

+			$(this).addClass('grey disabled');

 			$(this).progress('set bar label', '0 / 0');

 		}

 	});