From 38b8bc57024b634f04772ec5d34ad483461bf144 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 26 May 2018 21:07:20 +0200 Subject: [PATCH 1/3] added site announcement + tweet when race created --- rowers/models.py | 2 +- rowers/views.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 491bda83..f4d59ded 100644 --- a/rowers/models.py +++ b/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) diff --git a/rowers/views.py b/rowers/views.py index ae511b83..a2558be9 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13665,7 +13665,20 @@ def virtualevent_create_view(request): vs.save() - + # create Site Announcement & Tweet + if settings.DEBUG: + 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) From b5f0f41b415996285b3ebf7e1e9bed88860c8a86 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 27 May 2018 10:19:54 +0200 Subject: [PATCH 2/3] two parameters with same name - bug fix --- rowers/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index a2558be9..bc42b34d 100644 --- a/rowers/views.py +++ b/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, From 03745e306e4bc5f387e2cb00eaa1ec42bf7cbc01 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 27 May 2018 10:36:43 +0200 Subject: [PATCH 3/3] bugfix, plus swapping racing & teams buttons --- rowers/views.py | 2 ++ templates/basebase.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index bc42b34d..41277afc 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13668,6 +13668,8 @@ def virtualevent_create_view(request): # create Site Announcement & Tweet if settings.DEBUG: dotweet = False + elif 'dev' in settings.SITE_URL: + dotweet = False else: dotweet = True sa = SiteAnnouncement( diff --git a/templates/basebase.html b/templates/basebase.html index d56bd658..855c26fe 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -227,11 +227,11 @@ {% endif %}
- {% block teams %} + {% block challenges %} {% endblock %}
- {% block challenges %} + {% block teams %} {% endblock %}