Commits

Luke Plant committed bbd7176 Merge

Merged from default

  • Participants
  • Parent commits 4139c1a, e6a22e1
  • Branches live

Comments (0)

Files changed (2)

cciw/bookings/models.py

         # Check age.
         camper_age = self.age_on_camp()
         if camper_age.years < self.camp.minimum_age:
-            errors.append(u"Camper will be below the minimum age (%d) on the 31st August %d"
-                          % (self.camp.minimum_age, self.camp.year))
+            errors.append(u"Camper will be %d which is below the minimum age (%d) on the 31st August %d"
+                          % (camper_age.years, self.camp.minimum_age, self.camp.year))
 
         if camper_age.years > self.camp.maximum_age:
-            errors.append(u"Camper will be above the maximum age (%d) on the 31st August %d"
-                          % (self.camp.maximum_age, self.camp.year))
+            errors.append(u"Camper will be %d which is above the maximum age (%d) on the 31st August %d"
+                          % (camper_age.years, self.camp.maximum_age, self.camp.year))
 
         # Check place availability
         places_left, places_left_male, places_left_female = self.camp.get_places_left()

cciw/officers/views.py

         return dict(show_wiki_link=is_wiki_user(self.request.user))
 
 
+@booking_secretary_required
 def booking_secretary_reports(request, year=None):
     from cciw.bookings.models import SEX_MALE, SEX_FEMALE, Booking, BOOKING_BOOKED, BOOKING_CANCELLED, BookingAccount
     year = int(year)