diff --git a/gui/slick/views/displayShow.mako b/gui/slick/views/displayShow.mako index 39b3909c39099f6715691f66465c663e948d97bf..686eed6f992339599e31606cc8a099e2a69e03f4 100644 --- a/gui/slick/views/displayShow.mako +++ b/gui/slick/views/displayShow.mako @@ -250,11 +250,12 @@ <div class="pull-right clearfix" id="checkboxControls"> <div style="padding-bottom: 5px;"> + <% total_snatched = epCounts[Overview.SNATCHED] + epCounts[Overview.SNATCHED_PROPER] + epCounts[Overview.SNATCHED_BEST] %> <label for="wanted"><span class="wanted"><input type="checkbox" id="wanted" checked="checked" /> Wanted: <b>${epCounts[Overview.WANTED]}</b></span></label> <label for="qual"><span class="qual"><input type="checkbox" id="qual" checked="checked" /> Low Quality: <b>${epCounts[Overview.QUAL]}</b></span></label> <label for="good"><span class="good"><input type="checkbox" id="good" checked="checked" /> Downloaded: <b>${epCounts[Overview.GOOD]}</b></span></label> <label for="skipped"><span class="skipped"><input type="checkbox" id="skipped" checked="checked" /> Skipped: <b>${epCounts[Overview.SKIPPED]}</b></span></label> - <label for="snatched"><span class="snatched"><input type="checkbox" id="snatched" checked="checked" /> Snatched: <b>${epCounts[Overview.SNATCHED]}</b></span></label> + <label for="snatched"><span class="snatched"><input type="checkbox" id="snatched" checked="checked" /> Snatched: <b>${total_snatched}</b></span></label> </div> <button id="popover" type="button" class="btn btn-xs">Select Columns <b class="caret"></b></button> diff --git a/gui/slick/views/manage_backlogOverview.mako b/gui/slick/views/manage_backlogOverview.mako index 3a811493e5650f851bd8e3bd1d666b0fb17e8501..5484580449cbd194a3ea4239ce56735f2967c57c 100644 --- a/gui/slick/views/manage_backlogOverview.mako +++ b/gui/slick/views/manage_backlogOverview.mako @@ -23,7 +23,7 @@ showQualSnatched = lambda x: Quality.splitQuality(x.quality)[1] totalWanted = totalQual = totalQualSnatched = 0 - backLogShows = sorted([x for x in sickbeard.showList if showCounts[x.indexerid][Overview.QUAL] + showCounts[x.indexerid][Overview.WANTED] + showCounts[x.indexerid][Overview.SNATCHED]], key=lambda x: x.name) + backLogShows = sorted([x for x in sickbeard.showList if showCounts[x.indexerid][Overview.QUAL] + showCounts[x.indexerid][Overview.WANTED] + (0, showCounts[x.indexerid][Overview.SNATCHED])[len(showQualSnatched(x)) > 0]], key=lambda x: x.name) for curShow in backLogShows: totalWanted += showCounts[curShow.indexerid][Overview.WANTED] totalQual += showCounts[curShow.indexerid][Overview.QUAL] @@ -73,9 +73,8 @@ Jump to Show if whichStr not in showCats[curShow.indexerid] or showCats[curShow.indexerid][whichStr] not in (Overview.QUAL, Overview.WANTED, Overview.SNATCHED): continue - if not showQualSnatched(curShow): - if showCats[curShow.indexerid][whichStr] == Overview.SNATCHED: - continue + if not showQualSnatched(curShow) and showCats[curShow.indexerid][whichStr] == Overview.SNATCHED: + continue %> <tr class="seasonstyle ${Overview.overviewStrings[showCats[curShow.indexerid][whichStr]]}"> <td class="tableleft" align="center">${whichStr}</td> diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 4d66995f2667af2f6a74974048ea18ea6caeca98..beed26dafef3b55db286e88916d936e93f4bc529 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -699,7 +699,7 @@ class Home(WebRoot): myDB = db.DBConnection() today = str(datetime.date.today().toordinal()) - status_quality = '(' + ','.join([str(x) for x in Quality.SNATCHED + Quality.SNATCHED_PROPER]) + ')' + status_quality = '(' + ','.join([str(x) for x in Quality.SNATCHED + Quality.SNATCHED_PROPER + Quality.SNATCHED_BEST]) + ')' status_download = '(' + ','.join([str(x) for x in Quality.DOWNLOADED + Quality.ARCHIVED]) + ')' sql_statement = 'SELECT showid, '