Merge branch 'release/v8.64'

rowers/models.py

@@ -1764,6 +1764,9 @@ class PlannedSession(models.Model):
 	return stri
 
     def save(self, *args, **kwargs):
+        if self.sessionvalue <= 0:
+            self.sessionvalue = 1
+        
         # sort units
         if self.sessionmode == 'distance':
             if self.sessionunit not in ['m','km']:
@@ -2005,6 +2008,14 @@ class IndoorVirtualRaceForm(ModelForm):
         cd = self.cleaned_data
         timezone_str = cd['timezone']
 
+        value = cd['sessionvalue']
+        if value <= 0:
+            raise forms.ValidationError('The Value must be a positive, non-zero value')
+
+        unit = cd['sessionunit']
+        if unit == 'm' and value < 100:
+            raise forms.ValidationError('Minimum distance is 100m')
+        
         start_time = cd['start_time']
         if start_time is None:
             raise forms.ValidationError(

rowers/plannedsessions.py

@@ -327,7 +327,10 @@ def is_session_complete_ws(ws,ps):
         if not completiondate and score>=cratiomin*value:
             completiondate = w.date
 
+    try:
         ratio = score/float(value)
+    except ZeroDivisionError:
+        ratio = 0
 
     verdict = 'better than nothing'
 
@@ -581,7 +584,7 @@ def get_sessions(r,startdate=date.today(),
         startdate__lte=enddate,
         enddate__gte=startdate,
     ).order_by("preferreddate","startdate","enddate").exclude(
-                sessiontype='race')
+                sessiontype='race').exclude(sessiontype='indoorrace')
 
     return sps
 

rowers/templates/virtualevent.html

@@ -128,6 +128,8 @@ data-text="@rowsandall #rowingdata Participate in Indoor Rowing virtual race '{{
         </table>
       </p>
     </div>
+  </li>
+  <li class="grid_2">
     <div id="registerbuttons">
         {% if request.user.is_anonymous %}
         <p>

rowers/views.py

@@ -15584,6 +15584,9 @@ def plannedsession_edit_view(request,id=0,userid=0):
     if ps.manager != request.user:
         raise PermissionDenied("You are not allowed to edit this planned session")
 
+    if ps.sessiontype in ['race','indoorrace']:
+        raise PermissionDenied("You are not allowed to edit this planned session because it is a race")
+ 
     if ps.team.all() or len(ps.rower.all())>1:
         url = reverse(plannedsession_teamedit_view,
                       kwargs={

rowsandall_app/settings.py

@@ -306,6 +306,7 @@ RQ_QUEUES = {
 #SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"
 SESSION_ENGINE = "django.contrib.sessions.backends.cache"
 SESSION_SAVE_EVERY_REQUEST = True
+SESSION_EXPIRE_AT_BROWSER_CLOSE = True
 
 # admin stuff for error reporting
 SERVER_EMAIL='admin@rowsandall.com'