sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'bugfix/somefixes' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-09-02 11:51:51 +02:00
parent ea965c58f3 73ffbf7e75
commit 9c8392d426
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/views/workoutviews.py
View File

@@ -3418,9 +3418,14 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
else: else:
privacy = 'visible' privacy = 'visible'
startdatetime = datetime.datetime.combine( try:
date,starttime startdatetime = datetime.datetime.combine(
date,starttime
) )
except TypeError:
startdatetime = datetime.datetime.combine(
date,datetime.datetime.min.time()
)
try: try:
startdatetime = pytz.timezone(thetimezone).localize( startdatetime = pytz.timezone(thetimezone).localize(

2
static/css/styles2.css
View File

@@ -366,10 +366,12 @@
background: white; background: white;
} }
/*
nav li.selected { nav li.selected {
color: #1c75bc; color: #1c75bc;
background: white; background: white;
} }
*/
.nav-active, .nav-active,
.nav-active a, .nav-active a,