From: Frédéric Péters Date: Fri, 27 Dec 2013 14:25:07 +0000 (+0100) Subject: force week view to display Monday by default (#1137) X-Git-Tag: v2021~485 X-Git-Url: https://git.0d.be/?p=panikweb.git;a=commitdiff_plain;h=ca78556783547edfd4cd7569ac6d76e966fa06c3 force week view to display Monday by default (#1137) --- diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py index ee673f4..90b108d 100644 --- a/panikweb/paniktags/templatetags/paniktags.py +++ b/panikweb/paniktags/templatetags/paniktags.py @@ -152,7 +152,7 @@ def weekview(year=None, week=None): def weeknav(year=None, week=None, weekday=None): year = year if year else datetime.today().isocalendar()[0] week = week if week else datetime.today().isocalendar()[1] - weekday = weekday if weekday else datetime.today().weekday() + weekday = weekday if weekday is not None else datetime.today().weekday() date = utils.tofirstdayinisoweek(year, week) date = datetime(*date.timetuple()[:3]) diff --git a/panikweb_templates/templates/program.html b/panikweb_templates/templates/program.html index 388458f..e1b1e40 100644 --- a/panikweb_templates/templates/program.html +++ b/panikweb_templates/templates/program.html @@ -16,7 +16,7 @@ Du {{week_first_day|date:"l j N"}} au {{week_last_day|date:"l j N"}} - {% weeknav year=year week=week %} + {% weeknav year=year week=week weekday=0 %}