Merge branch 'release/v18.8.17'

rowers/dataroutines.py

@@ -1288,14 +1288,17 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
             else:
                 df = pd.DataFrame()
 
-    if compute and len(df):
-        data = df.copy()
-        if doclean:
-            data = clean_df_stats(data, ignorehr=True,
-                                  workstrokesonly=workstrokesonly)
-        data.dropna(axis=1, how='all', inplace=True)
-        data.dropna(axis=0, how='any', inplace=True)
-        return data
+    try:
+        if compute and len(df):
+            data = df.copy()
+            if doclean:
+                data = clean_df_stats(data, ignorehr=True,
+                                      workstrokesonly=workstrokesonly)
+            data.dropna(axis=1, how='all', inplace=True)
+            data.dropna(axis=0, how='any', inplace=True)
+            return data
+    except TypeError:
+        pass
 
     return df
 

rowers/templates/list_workouts.html

@@ -92,7 +92,7 @@
           {% if workout.rankingpiece %}
           <span style="font-size: smaller"><i class="fal fa-asterisk"></i></span>
           {% endif %}
-	  {% if workout.rpe == 0 %}
+	  {% if workout.rpe == 0 and not workout.duplicate %}
 	  <span style="font-size: smaller">
 	    <a href="/rowers/workout/{{ workout.id|encode }}/edit/">No RPE</a>
 	  </span>