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

[Justas Sadzevičius]

Fix for annoying bug when terms can't be named 'first' or 'last'.

[Justas Sadzevičius (justas.sadzevicius)]

I completely forgot that Alan is going to work on this branch further... Please merge only rev 2770.

=== added file 'src/schooltool/schoolyear/browser/ftests/first_last_crash.txt'
--- src/schooltool/schoolyear/browser/ftests/first_last_crash.txt	1970-01-01 00:00:00 +0000
+++ src/schooltool/schoolyear/browser/ftests/first_last_crash.txt	2011-04-01 05:43:28 +0000
@@ -0,0 +1,48 @@
+Adding terms named first or last
+================================
+
+Originally, when the schoolyear index.html view was coded, if the user
+chose either 'First' or 'Last' (any case) for the name of a term, the
+schoolyear view would no longer work, crashing becuase it traversed to
+the term (first or last) before applying the @@mediumDate adapter.  To
+fix this, the view class now has first and last properties that return
+the actual attributes rather than traversing to the term.  To test this,
+we will add two terms to a schoolyear, one named 'First' and one named
+'Last'.
+
+A manager logs in
+
+    >>> manager = Browser('manager', 'schooltool')
+
+And create a new school year:
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('School Years').click()
+    >>> manager.getLink('New School Year').click()
+    >>> manager.getControl('Title').value = '2010'
+    >>> manager.getControl('First day').value = '2010-01-01'
+    >>> manager.getControl('Last day').value = '2010-12-31'
+    >>> manager.getControl('Add').click()
+
+Now we'll add the two woefully-titled terms to see that it doesn't crash.
+
+    >>> manager.getLink('Add a new term').click()
+    >>> manager.getControl('Title').value = 'First'
+    >>> manager.getControl('Start date').value = '2010-01-01'
+    >>> manager.getControl('End date').value = '2010-06-30'
+    >>> manager.getControl('Next').click()
+    >>> manager.getControl('Add term').click()
+
+    >>> manager.getLink('Add a new term').click()
+    >>> manager.getControl('Title').value = 'Last'
+    >>> manager.getControl('Start date').value = '2010-07-01'
+    >>> manager.getControl('End date').value = '2010-12-31'
+    >>> manager.getControl('Next').click()
+    >>> manager.getControl('Add term').click()
+
+Also, we see that the terms are in fact there.
+
+    >>> manager.printQuery("id('content-body')//input[@type='checkbox']")
+    <input type="checkbox" name="delete.first" id="delete.first" />
+    <input type="checkbox" name="delete.last" id="delete.last" />
+

=== modified file 'src/schooltool/schoolyear/browser/schoolyear.py'
--- src/schooltool/schoolyear/browser/schoolyear.py	2010-09-15 13:52:08 +0000
+++ src/schooltool/schoolyear/browser/schoolyear.py	2011-04-01 05:43:28 +0000
@@ -458,6 +458,14 @@
     def sorted_terms(self):
         return sorted(self.context.values(), key=lambda t: t.last)
 
+    @property
+    def first(self):
+        return self.context.first
+
+    @property
+    def last(self):
+        return self.context.last
+
     def update(self):
         if 'CONFIRM' in self.request:
             for key in self.listIdsForDeletion():

=== modified file 'src/schooltool/schoolyear/browser/templates/schoolyear.pt'
--- src/schooltool/schoolyear/browser/templates/schoolyear.pt	2009-11-28 07:47:57 +0000
+++ src/schooltool/schoolyear/browser/templates/schoolyear.pt	2011-04-01 05:43:28 +0000
@@ -15,10 +15,10 @@
 <h1 metal:fill-slot="content-header" i18n:translate="">
   <tal:block tal:content="view/context/title"
              i18n:name="schoolyear_title">School Year Title</tal:block>
-  (<tal:block tal:content="view/context/first/@@mediumDate"
+  (<tal:block tal:content="view/first/@@mediumDate"
               i18n:name="start_date"/>
   &mdash;
-  <tal:block tal:content="view/context/last/@@mediumDate"
+  <tal:block tal:content="view/last/@@mediumDate"
              i18n:name="end_date"/>)
 </h1>
 <metal:block metal:fill-slot="body"