Merge branch 'release/v18.6.30'

rowers/alerts.py

@@ -93,7 +93,7 @@ def alert_get_stats(alert, nperiod=0):  # pragma: no cover
     columns = [alert.measured.metric]
 
     for condition in alert.filter.all():
-        columns += condition.metric
+        columns.append(condition.metric)
 
     workouts = Workout.objects.filter(date__gte=startdate, date__lte=enddate, user=alert.rower,
                                       workouttype=alert.workouttype, duplicate=False,

rowers/models.py

@@ -1377,6 +1377,16 @@ class Condition(models.Model):
     condition = models.CharField(
         max_length=20, choices=conditionchoices, null=True)
 
+    def __str__(self):
+        str = 'Condition: {metric} {condition} {value1} {value2}'.format(
+            metric=self.metric,
+            condition=self.condition,
+            value1 = self.value1,
+            value2 = self.value2,
+        )
+
+        return str
+
 
 class ConditionEditForm(ModelForm):
     class Meta:

rowers/views/userviews.py

@@ -1,6 +1,6 @@
 
 from rowers.views.statements import *
-from rowers.rower_rules import user_is_not_basic
+from rowers.rower_rules import user_is_not_basic, user_is_coachee
 
 @login_required()
 def deactivate_user(request):
@@ -399,7 +399,8 @@ def rower_exportsettings_view(request, userid=0):
                 except KeyError:
                     doset = True
                 if not user_is_not_basic(r.user):  # pragma: no cover
-                    doset = False
+                    if not user_is_coachee(r.user):
+                        doset = False
                 if not doset:
                     before = getattr(r, attr)
                     if before == value:
@@ -411,6 +412,7 @@ def rower_exportsettings_view(request, userid=0):
                         messages.error(
                             request, 'Could not set '+attr+'. You need to create the connection first.')
 
+
             r.save()
             messages.info(request, 'Settings saved')
     else: