Merge branch 'release/v6.74'

rowers/models.py

@@ -2194,7 +2194,7 @@ class SiteAnnouncement(models.Model):
                 status = tweetapi.PostUpdate(self.announcement)
             except:
                 try:
-                    status = tweetapi.PostUpdate(self.announcement[:135])
+                    status = tweetapi.PostUpdate(self.announcement[:270])
                 except:
                     pass
         return super(SiteAnnouncement,self).save(*args, **kwargs)

rowers/views.py

@@ -8480,11 +8480,11 @@ def workout_flexchart3_view(request,*args,**kwargs):
             reststrokes = not workstrokesonly
 	    r = getrower(request.user)
             try:
-                r = metrics.yaxmaxima[xparam]
+                range = metrics.yaxmaxima[xparam]
                 if yparam1 is not None:
-                    r = metrics.yaxmaxima[yparam1]
+                    range = metrics.yaxmaxima[yparam1]
                 if yparam2 is not None:
-                    r = metrics.yaxmaxima[yparam2]
+                    range = metrics.yaxmaxima[yparam2]
                 f = FavoriteChart(user=r,xparam=xparam,
                               yparam1=yparam1,yparam2=yparam2,
                               plottype=plottype,workouttype=workouttype,
@@ -13665,7 +13665,22 @@ def virtualevent_create_view(request):
 
             vs.save()
 
-            
+            # create Site Announcement & Tweet
+            if settings.DEBUG:
+                dotweet = False
+            elif 'dev' in settings.SITE_URL:
+                dotweet = False
+            else:
+                dotweet = True
+            sa = SiteAnnouncement(
+                announcement = "New Virtual Race on rowsandall.com: {name} on course {course}".format(
+                    name = name,
+                    course = course.name.encode('utf8')
+                    ),
+                dotweet = dotweet
+                )
+
+            sa.save()
 
             url = reverse(virtualevents_view)
             return HttpResponseRedirect(url)

templates/basebase.html

@@ -227,11 +227,11 @@
 	  {% endif %}
 	</div>
         <div class="grid_1 tooltip">
-          {% block teams %}
+          {% block challenges %}
           {% endblock %}
         </div>
         <div class="grid_1 tooltip">
-          {% block challenges %}
+          {% block teams %}
           {% endblock %}
         </div>
       </div>