Private GIT

Skip to content
Snippets Groups Projects
Commit fdd8a550 authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Fix airdates in displayShow and backlogOverview, so they all match with...

Fix airdates in displayShow and backlogOverview, so they all match with ComingEpisodes and history. Fixes errors on displayShow and incorrect airdate format on backlogOverview.
parent 16ad8e9a
No related branches found
No related tags found
No related merge requests found
...@@ -478,19 +478,16 @@ ...@@ -478,19 +478,16 @@
${file_size} ${file_size}
% endif % endif
</td> </td>
% if epResult['airdate'] > int(datetime.datetime.now().toordinal()) * 100:
<% tempDate = datetime.datetime.utcfromtimestamp(0) + datetime.timedelta(seconds=epResult['airdate']) %>
% else:
<% tempDate = epResult['airdate'] %>
% endif
<% date = sbdatetime.sbdatetime.convert_to_setting(network_timezones.parse_date_time(tempDate, show.airs, show.network)) %>
<td class="col-airdate"> <td class="col-airdate">
% if int(epResult['airdate']) != 1: % if int(epResult['airdate']) != 1:
<time datetime="${date.isoformat('T')}" class="date">${sbdatetime.sbdatetime.sbfdate(date)}</time> ## Lets do this exactly like ComingEpisodes and History
<% date = network_timezones.parse_date_time(epResult['airdate'], show.airs, show.network) %>
<% airDate = sbdatetime.sbdatetime.sbfdatetime(date) %>
<% isoDate = sbdatetime.sbdatetime.convert_to_setting(date).isoformat('T') %>
<time datetime="${isoDate}" class="date">${airDate}</time>
% else: % else:
Never Never
% endif % endif
<span class="sort_data">${date.isoformat('T')}</span>
</td> </td>
<td> <td>
% if sickbeard.DOWNLOAD_URL and epResult['location']: % if sickbeard.DOWNLOAD_URL and epResult['location']:
......
...@@ -18,11 +18,6 @@ ...@@ -18,11 +18,6 @@
layout = sickbeard.HISTORY_LAYOUT layout = sickbeard.HISTORY_LAYOUT
history_limit = sickbeard.HISTORY_LIMIT history_limit = sickbeard.HISTORY_LIMIT
%> %>
<%block name="css">
<style type="text/css">
.sort_data {display:none;}
</style>
</%block>
<%block name="scripts"> <%block name="scripts">
<script type="text/javascript" src="${srRoot}/js/new/history.js"></script> <script type="text/javascript" src="${srRoot}/js/new/history.js"></script>
</%block> </%block>
......
...@@ -79,14 +79,17 @@ Jump to Show ...@@ -79,14 +79,17 @@ Jump to Show
<td class="tableright" align="center" class="nowrap"> <td class="tableright" align="center" class="nowrap">
${curResult["name"]} ${curResult["name"]}
</td> </td>
<% date = sbdatetime.sbdatetime.convert_to_setting(network_timezones.parse_date_time(curResult['airdate'], curShow.airs, curShow.network)) %>
<td> <td>
## Match ComingEpisodes, displayShow, and History
<% date = network_timezones.parse_date_time(curResult['airdate'], curShow.airs, curShow.network) %>
<% airDate = sbdatetime.sbdatetime.sbfdatetime(date) %>
<% isoDate = sbdatetime.sbdatetime.convert_to_setting(date).isoformat('T') %>
% if int(curResult['airdate']) != 1: % if int(curResult['airdate']) != 1:
<time datetime="${date.isoformat('T')}" class="date">${date}</time> <time datetime="${isoDate}" class="date">${airDate}</time>
% else: % else:
Never Never
% endif % endif
<span class="sort_data">${date.isoformat('T')}</span> <span class="sort_data">${airDate}</span>
</td> </td>
</tr> </tr>
% endfor % endfor
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment