basic announcements functionality

rowers/views.py

@@ -20,7 +20,7 @@ from rowers.forms import PredictedPieceForm,DateRangeForm,DeltaDaysForm
 from rowers.forms import SummaryStringForm,IntervalUpdateForm,StrokeDataForm
 from rowers.models import Workout, User, Rower, WorkoutForm,FavoriteChart
 from rowers.models import RowerPowerForm,RowerForm,GraphImage,AdvancedWorkoutForm
-from rowers.models import FavoriteForm,BaseFavoriteFormSet
+from rowers.models import FavoriteForm,BaseFavoriteFormSet,SiteAnnouncement
 from django.forms.formsets import formset_factory
 import StringIO
 from django.contrib.auth.decorators import login_required,user_passes_test
@@ -1988,6 +1988,9 @@ def workouts_view(request,message='',successmessage='',
         except EmptyPage:
             workouts = paginator.page(paginator.num_pages)
             
+
+        announcements = SiteAnnouncement.objects.all().order_by("-created")
+            
 	return render(request, 'list_workouts.html',
 		      {'workouts': workouts,
 		       'message': message,
@@ -1995,6 +1998,7 @@ def workouts_view(request,message='',successmessage='',
                        'dateform':dateform,
                        'startdate':startdate,
                        'enddate':enddate,
+                       'announcements':announcements,
 		       })
     except Rower.DoesNotExist:
 	return HttpResponse("User has no rower instance")
@@ -3152,12 +3156,12 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 
 
 	except Workout.DoesNotExist:
-	    form = WorkoutForm(
-		initial = {'workouttype' : 'rower'}
-	    )
-	    return render(request, 
-			  'workout_form.html',
-			  {'form':form})
+            message = "workout doesn't exist"
+            url = reverse(workouts_view,
+			  kwargs = {
+			      'message': str(message)
+			  })
+	    return HttpResponseRedirect(url)
 
 @user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_add_otw_powerplot_view(request,id):