Merge tag 'c2import' into develop

1.0.6
2016-11-01 22:42:01 +01:00
parent 9d2633bfde 47569c23c4
commit 030e2df146
4 changed files with 1082 additions and 2 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -320,7 +320,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
 	    t = data['comments'].split('\n', 1)[0]
 	    title += t[:20]
 	except:
-	    pass
+	    title = 'Imported'

    starttimeunix = mktime(rowdatetime.timetuple())