Skip to content

Commit

Permalink
Fix series with multiple episodes not respecting calendar display opt…
Browse files Browse the repository at this point in the history
…ion properly

fixes SchizoDuckie#1100
  • Loading branch information
Js41637 committed Jul 23, 2018
1 parent 3c606ea commit 30b8da1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions templates/datepicker.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ <h2>{{date|date:"MMMM yyyy"}} <i class="glyphicon glyphicon-chevron-up" uib-tool
<td ng-repeat="day in week" class="day">
<div ng-repeat="episodes in getSeries(day)" ng-if="hasEvent(day)">
<calendar-event serie="event.serie" episode="event.episode" ng-if="episodes.length <= 2" ng-repeat="event in episodes|filterEvents|orderBy:['episode.getAirTime()','serie.name','episode.getFormattedEpisode()']"></calendar-event>
<calendar-event serie="episodes[0].serie" episode="episodes[0].episode" count="episodes.length" ng-if="episodes.length > 2 && !isExpanded(day, episodes[0].serie.ID_Serie)" style='color:red'></calendar-event>
<calendar-event serie="event.serie" episode="event.episode" ng-repeat="event in episodes|filterEvents|orderBy:['episode.getAirTime()','serie.name','episode.getFormattedEpisode()']" ng-if="episodes.length > 2 && isExpanded(day, episodes[0].serie.ID_Serie)" style='color:red'></calendar-event>
<calendar-event serie="episodes[0].serie" episode="episodes[0].episode" count="episodes.length" ng-if="episodes[0].serie.displaycalendar === 1 && episodes.length > 2 && !isExpanded(day, episodes[0].serie.ID_Serie)" style='color:red'></calendar-event>
<calendar-event serie="event.serie" episode="event.episode" ng-repeat="event in episodes|filterEvents|orderBy:['episode.getAirTime()','serie.name','episode.getFormattedEpisode()']" ng-if="episodes.length > 2 && isExpanded(day, episodes[0].serie.ID_Serie)" style='color:red'></calendar-event>
</div>
<span ng-class="{'now':isNow(day),'active':isSameDay(day),'disabled':(day.getMonth()!=date.getMonth()),'after':isAfter(day),'before':isBefore(day)}">
<em class="dayofweek">{{ day|date:"EEE" }}
Expand Down

0 comments on commit 30b8da1

Please sign in to comment.