[Python-checkins] r73543 - in tracker/instances/python-dev: html/issue.item.html html/user.item.html schema.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Wed Jun 24 06:39:22 2009
New Revision: 73543

Log:
Issue 268: add information about contrib agreements.


Modified:
   tracker/instances/python-dev/html/issue.item.html
   tracker/instances/python-dev/html/user.item.html
   tracker/instances/python-dev/schema.py

Modified: tracker/instances/python-dev/html/issue.item.html
==============================================================================
--- tracker/instances/python-dev/html/issue.item.html	(original)
+++ tracker/instances/python-dev/html/issue.item.html	Wed Jun 24 06:39:22 2009
@@ -236,7 +236,9 @@
      <a tal:content="mid" tal:attributes="id mid; 
         href string:#$mid;"></a> - <a tal:attributes="href mid">(view)</a></th>
    <th i18n:translate="">Author: <tal:x replace="python:msg.author.realname.plain(unchecked=1)"
-       i18n:name="author" /> (<tal:x replace="msg/author"/>)</th>
+       i18n:name="author" /> (<tal:x replace="msg/author"/>)
+       <tal:if condition="msg/author/contrib_form"><span title="Contributor form received">*</span></tal:if>
+   </th>
    <th i18n:translate="">Date: <tal:x replace="python:msg.date.pretty('%Y-%m-%d %H:%M')"
        i18n:name="date" /></th>
    <th>

Modified: tracker/instances/python-dev/html/user.item.html
==============================================================================
--- tracker/instances/python-dev/html/user.item.html	(original)
+++ tracker/instances/python-dev/html/user.item.html	Wed Jun 24 06:39:22 2009
@@ -107,6 +107,15 @@
   </td>
  </tr>
 
+ <tr>
+   <th>Contributor Form Received</th>
+   <td><span tal:replace="structure context/contrib_form/field"/>
+   <tal:if condition="context/contrib_form">
+   on: <span tal:replace="structure context/contrib_form_date/field"/>
+   </tal:if>
+   </td>
+</tr>
+
  <tr tal:define="name string:address; label string:E-mail address; value context/address">
   <th metal:use-macro="th_label">E-mail address</th>
   <td tal:define="mailto python:context.address.field(id='address');

Modified: tracker/instances/python-dev/schema.py
==============================================================================
--- tracker/instances/python-dev/schema.py	(original)
+++ tracker/instances/python-dev/schema.py	Wed Jun 24 06:39:22 2009
@@ -93,7 +93,9 @@
              alternate_addresses=String(),
              queries=Multilink('query'),
              roles=String(),     # comma-separated string of Role names
-             timezone=String())
+             timezone=String(),
+             contrib_form=Boolean(),
+             contrib_form_date=Date())
 user.setkey("username")
 
 # FileClass automatically gets this property in addition to the Class ones:
@@ -302,7 +304,7 @@
                 'phone', 'organisation',
                 'alternate_addresses',
                 'queries',
-                'timezone')) # Note: 'roles' excluded - users should not be able to edit their own roles. 
+                'timezone')) # Note: 'roles' excluded - users should not be able to edit their own roles. Also excluded: contrib_form, contrib_form_date
 for r in 'User', 'Developer':
     db.security.addPermissionToRole(r, p)