Merge lp:~aelkner/schooltool/first_last_crash into lp:schooltool/1.7

[Alan Elkner]

=== modified file 'src/schooltool/schoolyear/browser/ftests/first_last_crash.txt'
--- src/schooltool/schoolyear/browser/ftests/first_last_crash.txt	2011-03-31 23:50:26 +0000
+++ src/schooltool/schoolyear/browser/ftests/first_last_crash.txt	2011-04-19 05:20:55 +0000
@@ -46,3 +46,10 @@
     <input type="checkbox" name="delete.first" id="delete.first" />
     <input type="checkbox" name="delete.last" id="delete.last" />
 
+The School Years view also needs to not crash.
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('School Years').click()
+    >>> manager.printQuery("id('content-body')/p[1]/text()")
+    The active school year is (... - ...)
+

=== modified file 'src/schooltool/schoolyear/browser/schoolyear.py'
--- src/schooltool/schoolyear/browser/schoolyear.py	2011-03-31 23:50:26 +0000
+++ src/schooltool/schoolyear/browser/schoolyear.py	2011-04-19 05:20:55 +0000
@@ -119,6 +119,18 @@
     index_title = _("School Years")
     error = None
 
+    @property
+    def first(self):
+        year = self.context.getActiveSchoolYear()
+        if year is not None:
+            return year.first
+
+    @property
+    def last(self):
+        year = self.context.getActiveSchoolYear()
+        if year is not None:
+            return year.last
+
     def setUpTableFormatter(self, formatter):
         columns_before = []
         if self.canModify():

=== modified file 'src/schooltool/schoolyear/browser/templates/schoolyear_container.pt'
--- src/schooltool/schoolyear/browser/templates/schoolyear_container.pt	2010-09-15 13:52:08 +0000
+++ src/schooltool/schoolyear/browser/templates/schoolyear_container.pt	2011-04-19 05:20:55 +0000
@@ -22,9 +22,9 @@
     <p i18n:translate="">
       The active school year is
       <strong tal:content="active_year/@@title" i18n:name="year" />
-      (<tal:block content="active_year/first/@@mediumDate"
+      (<tal:block content="view/first/@@mediumDate"
                   i18n:name="start_date"/> -
-       <tal:block content="active_year/last/@@mediumDate"
+       <tal:block content="view/last/@@mediumDate"
                   i18n:name="end_date"/>)
     </p>
   </tal:block>