Merge branch 'feature/fix_backlogoverview' of https://github.com/adam111316/SickRage into develop

This commit is contained in:
Adam 2014-10-31 07:22:46 +08:00
commit f733ea936d
2 changed files with 16 additions and 10 deletions

View File

@ -30,6 +30,7 @@
* Fix errors occurring when a show folder is deleted outside of SickRage
* Combined delete and remove buttons in to one on individual show pages
* Other small UI tweaks
* Fix keyerrors on backlog overview preventing the page to load
[develop changelog]
* Improve display of progress bars in the Downloads columns of the show list page

View File

@ -90,17 +90,22 @@ Jump to Show
<tr class="seasoncols"><th>Episode</th><th>Name</th><th class="nowrap">Airdate</th></tr>
#for $curResult in $showSQLResults[$curShow.indexerid]:
#set $whichStr = $str($curResult["season"]) + "x" + $str($curResult["episode"])
#set $overview = $showCats[$curShow.indexerid][$whichStr]
#if $overview not in ($Overview.QUAL, $Overview.WANTED):
#continue
#end if
<tr class="seasonstyle $Overview.overviewStrings[$showCats[$curShow.indexerid][$whichStr]]">
<td class="tableleft" align="center">$whichStr</td>
<td>$curResult["name"]</td>
<td class="tableright" align="center" class="nowrap"><div class="${fuzzydate}">#if int($curResult["airdate"]) == 1 then "never" else $sbdatetime.sbdatetime.sbfdate($network_timezones.parse_date_time($curResult["airdate"],$curShow.airs,$curShow.network))#</div></td>
</tr>
#set $whichStr = $str($curResult["season"]) + "x" + $str($curResult["episode"])
#try:
#set $overview = $showCats[$curShow.indexerid][$whichStr]
#except Exception
#continue
#end try
#if $overview not in ($Overview.QUAL, $Overview.WANTED):
#continue
#end if
<tr class="seasonstyle $Overview.overviewStrings[$showCats[$curShow.indexerid][$whichStr]]">
<td class="tableleft" align="center">$whichStr</td>
<td>$curResult["name"]</td>
<td class="tableright" align="center" class="nowrap"><div class="${fuzzydate}">#if int($curResult["airdate"]) == 1 then "never" else $sbdatetime.sbdatetime.sbfdate($network_timezones.parse_date_time($curResult["airdate"],$curShow.airs,$curShow.network))#</div></td>
</tr>
#end for
#end for