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

[Alan Elkner]

[Justas Sadzevičius (justas.sadzevicius)]

Changes not needed anymore.

review: Disapprove

Unmerged revisions

2636. By Alan Elkner <aelkner@ubuntu> on 2010-03-06

changes needed for cambodia

2635. By Alan Elkner <aelkner@ubuntu> on 2010-03-01

created series of traversal adapters to allow access to messages and goals
updated security.txt tests, getting rid of XXX comments that were no longer needed
reversed order of evolve4 and evolve5 due to tricky persons_responsible get/set property
fixed permission to message and goal views to be schooltool.view as they should be
removed various security proxies to get to student data

2634. By Justas Sadzevičius on 2010-02-16

Merge Alan's widget macros.

2633. By Justas Sadzevičius on 2010-02-15

Merge mail enhancments by Douglas:
Douglas Cerna 2010-02-15 Changed the SMTPDataError message id
Douglas Cerna 2010-02-03 Formatted email form notifications (#497492)
Douglas Cerna 2010-02-03 Handled SMTPDataError exceptions
Douglas Cerna 2010-01-31 Handled empty required fields in the Send Test view

=== modified file 'buildout.cfg'
--- buildout.cfg	2010-01-21 17:15:59 +0000
+++ buildout.cfg	2010-03-06 21:34:21 +0000
@@ -1,6 +1,10 @@
 [buildout]
 extends = base.cfg
-develop = .
+develop = . ../schooltool.lyceum.journal ../schooltool.intervention ../schooltool.gradebook
 
 [package]
 eggs = schooltool
+       schooltool.gradebook
+       schooltool.intervention
+       schooltool.lyceum.journal
+

=== modified file 'src/schooltool/app/browser/ftests/setup.py'
--- src/schooltool/app/browser/ftests/setup.py	2009-06-24 13:58:38 +0000
+++ src/schooltool/app/browser/ftests/setup.py	2010-03-06 21:34:21 +0000
@@ -81,7 +81,7 @@
     manager.getLink('Resource', index=2).click()
     assert title in manager.contents
 
-def addCourse(title, schoolyear, description=""):
+def addCourse(title, schoolyear, description="", credits=''):
     """Add a course."""
     manager = logInManager()
     manager.getLink('Manage').click()
@@ -91,6 +91,7 @@
     manager.getLink('New Course').click()
     manager.getControl('Title').value = title
     manager.getControl('Description').value = description
+    manager.getControl('Credits').value = credits
     manager.getControl('Add').click()
 
 def addSection(course, schoolyear, term, title=None, instructors=[], members=[]):

=== modified file 'src/schooltool/course/browser/section.py'
--- src/schooltool/course/browser/section.py	2010-01-19 12:09:22 +0000
+++ src/schooltool/course/browser/section.py	2010-03-06 21:34:21 +0000
@@ -304,12 +304,12 @@
         terms = self.term_subform.terms
         if course is None or not terms:
             return None
+        section.courses.add(removeSecurityProxy(course))
 
         # add the section to the first term
         sections = ISectionContainer(terms[0])
         name = INameChooser(sections).chooseName('', section)
         sections[name] = section
-        section.courses.add(removeSecurityProxy(course))
 
         # overwrite section title.
         section.title = "%s (%s)" % (course.title, section.__name__)

=== modified file 'src/schooltool/email/browser/email.py'
--- src/schooltool/email/browser/email.py	2009-10-19 12:32:19 +0000
+++ src/schooltool/email/browser/email.py	2010-03-06 21:34:21 +0000
@@ -487,7 +487,10 @@
 
     @button.buttonAndHandler(_('Send'))
     def handle_send_action(self, action):
-        data, some = self.extractData()
+        data, errors = self.extractData()
+        if errors:
+            self.status = _('There were some errors.')
+            return
         from_address = data['from_address']
         to_addresses = [address.strip()
                         for address in data['to_addresses'].split(',')]

=== modified file 'src/schooltool/email/browser/ftests/__init__.py'
--- src/schooltool/email/browser/ftests/__init__.py	2009-10-19 12:32:19 +0000
+++ src/schooltool/email/browser/ftests/__init__.py	2010-03-06 21:34:21 +0000
@@ -65,6 +65,11 @@
                         'addresses': '[e-mail], [e-mail]'})
             return False
 
+        # If fakes a unexpected data error
+        if "bad data" in email.body:
+            self.queue(email, 70, {'info': server_info})
+            return False
+
         # It fakes a bad username for login
         if self.container.username == 'wronguser':
             self.queue(email, 40, {'info': server_info,

=== modified file 'src/schooltool/email/browser/ftests/email.txt'
--- src/schooltool/email/browser/ftests/email.txt	2009-12-24 15:25:47 +0000
+++ src/schooltool/email/browser/ftests/email.txt	2010-03-06 21:34:21 +0000
@@ -86,6 +86,13 @@
     >>> manager.getControl('Hostname').value = 'localhost'
     >>> manager.getControl('Apply').click()
 
+We see a confirmation message:
+
+    >>> manager.printQuery('id("message")')
+    <div id="message">
+      <div class="summary">Data successfully updated.</div>
+    </div>
+
 Note that just setting up the hostname for the SMTP server enables the
 service:
 
@@ -481,8 +488,8 @@
     >>> manager.getControl('New Password', index=1).value = 'secret'
     >>> manager.getControl('Confirm New Password').value = 'public'
     >>> manager.getControl('Apply').click()
-    >>> manager.printQuery('//div[@class="status"]')
-    <div class="status">
+    >>> manager.printQuery('id("message")')
+    <div id="message">
       <div class="summary">There were some errors.</div>
       <ul class="errors"><li>
           <div class="error">New passwords don't match</div>
@@ -543,9 +550,49 @@
     >>> manager.getControl('Username').value = 'rightuser'
     >>> manager.getControl('Apply').click()
 
-And Retry our lastest email:
-
-    >>> manager.getLink('Queue (5 failed)').click()
+And let's raise an unexpected data error:
+
+    >>> manager.getLink('Send Test').click()
+    >>> manager.getControl('From').value = '[e-mail]'
+    >>> manager.getControl('To').value = '[e-mail]'
+    >>> manager.getControl('Subject').value = "This is bad"
+    >>> manager.getControl('Body').value = 'This is bad data on the message'
+    >>> manager.getControl('Send').click()
+
+    >>> manager.printQuery('//form/table[@class="data"]/tbody/tr[1]/td')
+    <td>
+      <input type="checkbox" name="delete.Email-6" id="delete.Email-6" /></td>
+    <td>
+      <a href="http://localhost/email/Email-6">[e-mail]</a>
+    </td>
+    <td>
+      [e-mail]
+    </td>
+    <td>
+      This is bad
+    </td>
+    <td>
+      ...
+    </td>
+    <td>
+      ...
+    </td>
+
+    >>> manager.getLink('[e-mail]').click()
+
+    >>> # EMAIL STATUS
+    >>> manager.printQuery('id("form-widgets-status-row")//label')
+    <label for="form-widgets-status">
+      <span>Email Status</span>
+    </label>
+    >>> manager.printQuery('id("form-widgets-status-row")/'
+    ...                    'div[@class="widget"]/span')
+    <span id="form-widgets-status" class="..." style="color: red;">The server (localhost:25) replied that the message data was malformed</span>
+    >>> manager.getControl('Cancel').click()
+
+Let's Retry one of our previous emails:
+
+    >>> manager.getLink('Queue (6 failed)').click()
     >>> manager.getControl(name='delete.Email-5').value = True
     >>> manager.getControl('Retry').click()
 
@@ -554,9 +601,10 @@
 
     >>> manager.printQuery('id("content-nav-group")/div[@class="content-nav"][1]')
     <div class="content-nav">
-      <a href="http://localhost/email/index.html">Queue (4 failed)</a>
+      <a href="http://localhost/email/index.html">Queue (5 failed)</a>
     </div>
     >>> manager.printQuery('//form/table[@class="data"]/tbody/tr/td[1]/input')
+    <input type="checkbox" name="delete.Email-6" id="delete.Email-6" />
     <input type="checkbox" name="delete.Email-4" id="delete.Email-4" />
     <input type="checkbox" name="delete.Email-3" id="delete.Email-3" />
     <input type="checkbox" name="delete.Email-2" id="delete.Email-2" />
@@ -569,9 +617,10 @@
 
     >>> manager.printQuery('id("content-nav-group")/div[@class="content-nav"][1]')
     <div class="content-nav">
-      <a href="http://localhost/email/index.html">Queue (3 failed)</a>
+      <a href="http://localhost/email/index.html">Queue (4 failed)</a>
     </div>
     >>> manager.printQuery('//form/table[@class="data"]/tbody/tr/td[1]/input')
+    <input type="checkbox" name="delete.Email-6" id="delete.Email-6" />
     <input type="checkbox" name="delete.Email-4" id="delete.Email-4" />
     <input type="checkbox" name="delete.Email-3" id="delete.Email-3" />
     <input type="checkbox" name="delete.Email" id="delete.Email" />
@@ -591,7 +640,29 @@
 
     >>> manager.printQuery('id("content-nav-group")/div[@class="content-nav"][1]')
     <div class="content-nav">
-      <a href="http://localhost/email/index.html">Queue (1 failed)</a>
+      <a href="http://localhost/email/index.html">Queue (2 failed)</a>
     </div>
     >>> manager.printQuery('//form/table[@class="data"]/tbody/tr/td[1]/input')
+    <input type="checkbox" name="delete.Email-6" id="delete.Email-6" />
     <input type="checkbox" name="delete.Email-3" id="delete.Email-3" />
+
+Now, let's handle empty values in the Send Test form:
+
+    >>> manager.getLink('Send Test').click()
+    >>> manager.getControl('Send').click()
+    >>> manager.printQuery('id("message")')
+    <div id="message">
+      <div class="summary">There were some errors.</div>
+      <ul class="errors"><li>
+          From:
+          <div class="error">Required input is missing.</div>
+        </li>
+        <li>
+          To:
+          <div class="error">Required input is missing.</div>
+        </li>
+        <li>
+          Body:
+          <div class="error">Required input is missing.</div>
+        </li>
+      </ul></div>

=== modified file 'src/schooltool/email/browser/templates/email_form.pt'
--- src/schooltool/email/browser/templates/email_form.pt	2009-10-19 12:32:19 +0000
+++ src/schooltool/email/browser/templates/email_form.pt	2010-03-06 21:34:21 +0000
@@ -2,7 +2,119 @@
   <body>
     <metal:nothing metal:fill-slot="content-header" />
     <metal:block metal:fill-slot="body">
-      <div metal:use-macro="macro:form" />
+      <div id="message" tal:condition="view/status">
+        <div class="summary" i18n:translate="" tal:content="view/status">
+          Form status summary
+        </div>
+        <ul class="errors" tal:condition="view/widgets/errors">
+          <li tal:repeat="error view/widgets/errors">
+            <tal:block condition="error/widget">
+              <span tal:replace="error/widget/label" />:
+            </tal:block>
+            <span tal:replace="structure error/render">Error Type</span>
+          </li>
+        </ul>
+      </div>
+      <form action="." method="post" enctype="multipart/form-data"
+            class="standalone"
+            metal:define-macro="form"
+            tal:attributes="method view/method;
+                            enctype view/enctype;
+                            acceptCharset view/acceptCharset;
+                            accept view/accept;
+                            action view/action;
+                            name view/name;
+                            id view/id">
+        <metal:subform define-macro="subform">
+          <div class="viewspace" metal:define-slot="viewspace">
+            <metal:label define-slot="label">
+              <h3 metal:define-macro="label"
+                  tal:condition="view/label|nothing"
+                  tal:content="view/label">
+                Form Label
+              </h3>
+            </metal:label>
+            <metal:info define-slot="info">
+              <div class="required-info"
+                   metal:define-macro="required-info">
+                <!--<span class="required">*</span>
+                    &ndash; required -->
+              </div>
+            </metal:info>
+            <div metal:define-slot="extra-info" tal:replace="nothing">
+            </div>
+            <div metal:define-slot="main">
+              <metal:widget-rows define-macro="widget-rows">
+                <fieldset>
+                  <tal:block repeat="widget view/widgets/values">
+                    <div id="" class="row"
+                         tal:attributes="id string:${widget/id}-row"
+                         tal:condition="python:widget.mode != 'hidden'">
+                      <metal:widget-row define-macro="widget-row">
+                        <div class="label">
+                          <label tal:attributes="for widget/id">
+                            <span i18n:translate=""
+                                  tal:content="widget/label">label</span>
+                            <span class="required"
+                                  tal:condition="widget/required">*</span>
+                          </label>
+                        </div>
+                        <p class="hint" tal:content="widget/field/description">Description of this field.</p>
+                        <div class="widget" tal:content="structure widget/render">
+                          <input type="text" size="24" value="" />
+                        </div>
+                        <div class="error"
+                             tal:condition="widget/error">
+                          <span tal:replace="structure widget/error/render">error</span>
+                        </div>
+                      </metal:widget-row>
+                    </div>
+                    <input type="hidden" value=""
+                           tal:condition="python:widget.mode == 'hidden'"
+                           tal:replace="structure widget/render" />
+                  </tal:block>
+                  
+                  <div metal:define-slot="extra-widgets" tal:replace="nothing">
+                  </div>
+                  
+                </fieldset>
+              </metal:widget-rows>
+              <metal:groups define-macro="groups">
+                <fieldset tal:condition="view/groups|nothing"
+                          tal:repeat="view view/groups">
+                  <legend tal:condition="view/label"
+                          tal:content="view/label">Label</legend>
+                  <metal:group-header define-slot="group-header">
+                    <div class="status"
+                         tal:condition="view/widgets/errors">
+                      <div metal:use-macro="template/macros/errors" />
+                    </div>
+                  </metal:group-header>
+                  <metal:group-rows define-slot="group-rows">
+                    <div metal:use-macro="template/macros/widget-rows" />
+                  </metal:group-rows>
+                </fieldset>
+              </metal:groups>
+            </div>
+            <metal:above-buttons define-slot="above-buttons">
+            </metal:above-buttons>
+          </div>
+          <metal:buttons define-slot="buttons">
+            <div metal:define-macro="buttons">
+              <div class="buttons controls"
+                   metal:define-slot="bottom-buttons">
+                <tal:block condition="view/actions|nothing">
+                  <input tal:repeat="action view/actions/values"
+                         tal:replace="structure action/render"
+                         />
+                </tal:block>
+              </div>
+            </div>
+          </metal:buttons>
+          <metal:bottom define-slot="bottom">
+          </metal:bottom>
+        </metal:subform>
+      </form>
     </metal:block>
   </body>
 </html>

=== modified file 'src/schooltool/email/mail.py'
--- src/schooltool/email/mail.py	2010-01-19 12:09:22 +0000
+++ src/schooltool/email/mail.py	2010-03-06 21:34:21 +0000
@@ -56,6 +56,7 @@
     50: _('The server (${info}) rejected the From address: ${from_address}'),
     60: _('The server (${info}) rejected the following recipient addresses: '
           '${addresses}'),
+    70: _('The server (${info}) replied that the message data was malformed'),
     }
 
 
@@ -197,9 +198,14 @@
                                    'addresses': ', '.join(addresses)})
             connection.quit()
             return False
-        # XXX: SMTPDataError is not caught yet.
-        #      For one, invalid recipient list may cause it (code 555)
-
+        except (smtplib.SMTPHeloError,), e:
+            self.queue(email, 30, {'info': server_info})
+            connection.quit()
+            return False
+        except (smtplib.SMTPDataError,), e:
+            self.queue(email, 70, {'info': server_info})
+            connection.quit()
+            return False
         if result:
             addresses = [address for address in email.to_addresses
                          if address in result.keys()]

=== modified file 'src/schooltool/skin/templates/widget_macros.pt'
--- src/schooltool/skin/templates/widget_macros.pt	2007-11-14 18:47:28 +0000
+++ src/schooltool/skin/templates/widget_macros.pt	2010-03-06 21:34:21 +0000
@@ -20,6 +20,39 @@
 </div>
 </metal:block>
 
+<metal:block define-macro="widget_split_row">
+  <label for="field.name" title="The widget's hint" style="width: 20em"
+    tal:condition="widget/label"
+    tal:attributes="for widget/name; title widget/hint"
+    tal:content="widget/label">The Label</label>
+  <p class="hint" tal:condition="widget/hint" tal:content="widget/hint" />
+  <div class="field">
+    <input type="text" style="width:100%" tal:replace="structure widget" />
+    <metal:block define-slot="extra" />
+  </div>
+  <div class="clear">&nbsp;</div>
+  <div class="error" tal:define="error widget/error"
+    tal:condition="error" tal:content="structure error">
+    The Error
+  </div>
+</metal:block>
+
+<metal:block define-macro="widget_fieldset_row">
+<fieldset>
+  <legend tal:content="widget/label" />
+  <p class="hint" tal:condition="widget/hint" tal:content="widget/hint" />
+  <div class="field">
+    <input type="text" style="width:100%" tal:replace="structure widget" />
+    <metal:block define-slot="extra" />
+  </div>
+  <div class="clear">&nbsp;</div>
+  <div class="error" tal:define="error widget/error"
+    tal:condition="error" tal:content="structure error">
+    The Error
+  </div>
+</fieldset>
+</metal:block>
+
 <div class="field" metal:define-macro="checkbox_widget">
   <input type="text" tal:replace="structure widget" />
   <label tal:attributes="for widget/name"

=== modified file 'src/schooltool/testing/analyze.py'
--- src/schooltool/testing/analyze.py	2009-02-08 02:01:07 +0000
+++ src/schooltool/testing/analyze.py	2010-03-06 21:34:21 +0000
@@ -41,5 +41,7 @@
 def printQuery(xpath, response):
     """Helper function to print xpath query results on an html response"""
     for result in queryHTML(xpath, response):
+        lines = result.splitlines()
+        result = '\n'.join([line for line in lines if line.strip()])
         print result