Merge branch 'develop' into feature/icu_sessions

rowers/views/statements.py

@@ -186,7 +186,7 @@ from rowers.models import ( RowerPowerForm, RowerHRZonesForm, SimpleRowerPowerFo
                             RowerExportFormSportTracks, RowerExportFormTrainingPeaks,
                             RowerExportFormConcept2, RowerExportFormGarmin,
                             RowerExportFormIntervals, RowerExportFormRP3,
-                            RowerExportFormNK, 
+                            RowerExportFormNK, RowerPrivateImportForm,
                            )
 from rowers.models import (
     FavoriteForm, BaseFavoriteFormSet, SiteAnnouncement, BasePlannedSessionFormSet,

rowers/views/userviews.py

@@ -479,6 +479,7 @@ def rower_exportsettings_view(request, userid=0):
         'intervals': RowerExportFormIntervals(instance=r),
         'nk': RowerExportFormNK(instance=r),
         'garmin': RowerExportFormGarmin(instance=r),
+        'imports_are_private': RowerPrivateImportForm(instance=r)
     }
 
     if request.method == 'POST':
@@ -493,6 +494,7 @@ def rower_exportsettings_view(request, userid=0):
             'intervals': RowerExportFormIntervals(request.POST, instance=r),
             'nk': RowerExportFormNK(request.POST, instance=r),
             'garmin': RowerExportFormGarmin(request.POST, instance=r),
+            'imports_are_private': RowerPrivateImportForm(request.POST, instance=r),
         }
         if form.is_valid():
             cd = form.cleaned_data
@@ -593,11 +595,13 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
     if request.method == 'POST':
         accountform = AccountRowerForm(request.POST, instance=r)
         userform = UserForm(request.POST, instance=r.user)
+        privateform = RowerPrivateImportForm(request.POST, instance=r)
 
-        if accountform.is_valid() and userform.is_valid():
+        if accountform.is_valid() and userform.is_valid() and privateform.is_valid():
             # process
             cd = accountform.cleaned_data
             ucd = userform.cleaned_data
+            pcd = privateform.cleaned_data
 
             first_name = ucd['first_name']
             last_name = ucd['last_name']
@@ -633,6 +637,7 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
                 resetbounce = True
 
             emailalternatives = cd['emailalternatives']
+            imports_are_private = pcd['imports_are_private']
 
             u.save()
             r.defaulttimezone = defaulttimezone
@@ -644,6 +649,7 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
             r.defaultlandingpage = defaultlandingpage
             r.showfavoritechartnotes = showfavoritechartnotes
             r.share_course_results = share_course_results
+            r.imports_are_private = imports_are_private
             r.sex = sex
             r.birthdate = birthdate
             r.autojoin = autojoin
@@ -658,11 +664,13 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
 
             accountform = AccountRowerForm(instance=r)
             userform = UserForm(instance=u)
+            privateform = RowerPrivateImportForm(instance=r)
             successmessage = 'Account Information changed'
             messages.info(request, successmessage)
     else:
         accountform = AccountRowerForm(instance=r)
         userform = UserForm(instance=r.user)
+        privateform = RowerPrivateImportForm(instance=r)
 
     grants = AccessToken.objects.filter(user=request.user)
     try:
@@ -678,6 +686,7 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
                       'grants': grants,
                       'userform': userform,
                       'accountform': accountform,
+                      'privateform': privateform,
                       'rower': r,
                       'apikey': apikey.key,
                   })

rowers/views/workoutviews.py

@@ -687,7 +687,7 @@ def addmanual_view(request, raceid=0):
             empowerside = form.cleaned_data.get('empowerside','port')
 
             if private:  # pragma: no cover
-                privacy = 'private'
+                privacy = 'hidden'
             else:
                 privacy = 'visible'
 
@@ -4270,7 +4270,7 @@ def workout_flexchart_stacked_view(request, *args, **kwargs):
 def workout_unsubscribe_view(request, id=0):
     w = get_workout(id)
 
-    if w.privacy == 'private' and w.user.user != request.user:  # pragma: no cover
+    if w.privacy == 'hidden' and w.user.user != request.user:  # pragma: no cover
         return HttpResponseForbidden("Permission error")
 
     comments = WorkoutComment.objects.filter(workout=w,
@@ -4300,7 +4300,7 @@ def workout_unsubscribe_view(request, id=0):
 def workout_comment_view(request, id=0):
     w = get_workout(id)
 
-    if w.privacy == 'private' and w.user.user != request.user:  # pragma: no cover
+    if w.privacy == 'hidden' and w.user.user != request.user:  # pragma: no cover
         return HttpResponseForbidden("Permission error")
 
     comments = WorkoutComment.objects.filter(workout=w).order_by("created")
@@ -4490,7 +4490,7 @@ def workout_edit_view(request, id=0, message="", successmessage=""):
             
 
             if private:
-                privacy = 'private'
+                privacy = 'hidden'
             else:  # pragma: no cover
                 privacy = 'visible'
 
@@ -5197,6 +5197,8 @@ def workout_upload_view(request,
         is_ajax = False
 
     r = getrower(request.user)
+    if r.imports_are_private:
+        uploadoptions['makeprivate'] = True
     if r.rowerplan == 'freecoach':  # pragma: no cover
         url = reverse('team_workout_upload_view')
         return HttpResponseRedirect(url)