Merge branch 'develop' into feature/restapi

rowers/admin.py

@@ -21,7 +21,7 @@ class FavoriteChartAdmin(admin.ModelAdmin):
     list_display = ('user','xparam','yparam1','yparam2','plottype','workouttype','reststrokes')
 
 class SiteAnnouncementAdmin(admin.ModelAdmin):
-    list_display = ('announcement','created','modified','expires')
+    list_display = ('announcement','created','modified','expires','dotweet')
     
 admin.site.unregister(User)
 admin.site.register(User,UserAdmin)

rowers/models.py

@@ -9,6 +9,7 @@ from django.forms.widgets import SplitDateTimeWidget
 from django.forms.formsets import BaseFormSet
 from datetimewidget.widgets import DateTimeWidget
 import os
+import twitter
 
 from django.conf import settings
 from sqlalchemy import create_engine
@@ -17,6 +18,18 @@ from sqlite3 import OperationalError
 from django.utils import timezone
 import datetime
 
+from rowsandall_app.settings import (
+    TWEET_ACCESS_TOKEN_KEY,
+    TWEET_ACCESS_TOKEN_SECRET,
+    TWEET_CONSUMER_KEY,
+    TWEET_CONSUMER_SECRET,
+    )
+
+tweetapi = twitter.Api(consumer_key=TWEET_CONSUMER_KEY,
+                       consumer_secret=TWEET_CONSUMER_SECRET,
+                       access_token_key=TWEET_ACCESS_TOKEN_KEY,
+                       access_token_secret=TWEET_ACCESS_TOKEN_SECRET)
+
 user = settings.DATABASES['default']['USER']
 password = settings.DATABASES['default']['PASSWORD']
 database_name = settings.DATABASES['default']['NAME']
@@ -39,7 +52,6 @@ if settings.DEBUG or user=='':
 class Team(models.Model):
     name = models.CharField(max_length=150)
     notes = models.CharField(blank=True,max_length=200)
-    
 
 class Rower(models.Model):
     weightcategories = (
@@ -512,10 +524,13 @@ class SiteAnnouncement(models.Model):
     announcement = models.TextField(max_length=140)
     expires = models.DateField(default=timezone.now)
     modified = models.DateField(default=timezone.now)
+    dotweet = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
         if not self.id:
             self.created = timezone.now()
             self.expires = timezone.now()+datetime.timedelta(days=10)
         self.modified = timezone.now()
+        if self.dotweet:
+           status = tweetapi.PostUpdate(self.announcement) 
         return super(SiteAnnouncement,self).save(*args, **kwargs)

rowers/views.py

@@ -41,6 +41,7 @@ import ownapistuff
 from ownapistuff import TEST_CLIENT_ID, TEST_CLIENT_SECRET, TEST_REDIRECT_URI
 from rowsandall_app.settings import C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET, STRAVA_CLIENT_ID, STRAVA_REDIRECT_URI, STRAVA_CLIENT_SECRET
 from rowsandall_app.settings  import SPORTTRACKS_CLIENT_ID, SPORTTRACKS_REDIRECT_URI, SPORTTRACKS_CLIENT_SECRET
+
 import requests
 import json
 from rest_framework.renderers import JSONRenderer
@@ -1223,6 +1224,9 @@ def test_reverse_view(request):
 	      
     return imports_view(request,successmessage=successmessage)
 
+@login_required()
+def rower_process_twittercallback(request):
+    return "dummy"
 
 @login_required()
 def rower_process_stravacallback(request):