[CMF-checkins] CVS: CMF/CMFCollector/skins/collector - collector_add_issue.py:1.7 collector_add_issue_form.pt:1.8

[Ken Manheimer]

Update of /cvs-repository/CMF/CMFCollector/skins/collector
In directory cvs.zope.org:/tmp/cvs-serv32133/skins/collector

Modified Files:
	collector_add_issue.py collector_add_issue_form.pt 
Log Message:
Enable submitter to specify email and full name.


=== CMF/CMFCollector/skins/collector/collector_add_issue.py 1.6 => 1.7 ===
-##parameters=submitter, title, security_related, topic, importance, classification, description, version_info
+##parameters=title, security_related, submitter_email, topic, importance, classification, description, version_info
 ##title=Submit a Request
 
-REQUEST = context.REQUEST
+REQGET = context.REQUEST.get
 
-id = context.add_issue(submitter=submitter,
-                       title=title,
-                       description=description,
+id = context.add_issue(title=title,
                        security_related=security_related,
+                       submitter_name=REQGET('submitter_name'),
+                       submitter_email=submitter_email,
+                       description=description,
                        topic=topic,
                        classification=classification,
                        importance=importance,
                        version_info=version_info,
-                       assignees=REQUEST.get('assignees', []),
-                       file=REQUEST.get('file'),
-                       fileid=REQUEST.get('fileid', ''),
-                       filetype=REQUEST.get('filetype', 'file'))
+                       assignees=REQGET('assignees', []),
+                       file=REQGET('file'),
+                       fileid=REQGET('fileid', ''),
+                       filetype=REQGET('filetype', 'file'))
 
 context.REQUEST.RESPONSE.redirect("%s/%s" % (context.absolute_url(), id))
 


=== CMF/CMFCollector/skins/collector/collector_add_issue_form.pt 1.7 => 1.8 ===
          <input type="text" name="title" value="" size="40">
         </td>
-        <td colspan="2">
+        <td colspan="3">
             <input type=hidden name="security_related:boolean" value="">
             <input type=checkbox name="security_related:boolean">
             Security Related?
@@ -49,27 +49,17 @@
 
         <tr>
           <th valign="middle" align="right"> Submitter </th>
-          <td>
-            <input type="text" name="submitter" value="" size="20"
-                   tal:attributes="value python:
-                                         getattr(member, 'full_name', '')">
-          </td>
-          <th valign="middle" align="right"
-              tal:condition="authenticated"> Email </th>
-          <td tal:content="python: member.getProperty('email', '')"
-              tal:condition="authenticated">
-            EMAIL ADDR
+          <td tal:condition="authenticated"
+              tal:content="python: getattr(member, 'full_name', str(member))">
           </td>
-        </tr>
-
-        <tr tal:condition="not: authenticated">
-          <td> &nbsp;
+          <td tal:condition="not: authenticated">
+            <input type="text" name="submitter_name" size="30">
           </td>
-          <td colspan="4">
-            <font color="red"> <em> If you wish to be able to followup to your
-              issue, receive email notifications about its conduct, etc.,
-              you must log in. </em>
-            </font>
+          <th valign="middle" align="right"> Email </th>
+          <td colspan="2">
+            <input type="text" name="submitter_email" size="30"
+                   tal:attributes="value python: member.getProperty('email',
+                                                                    '')">
           </td>
         </tr>
 
@@ -109,8 +99,8 @@
 
        <tr>
         <th> Version Info </th>
-        <td>
-            <textarea name="version_info" rows="3" cols="30"></textarea>
+        <td colspan="2">
+            <textarea name="version_info" rows="3" cols="35"></textarea>
         </td>
         <td colspan="2">
           <font color="gray">
@@ -123,8 +113,8 @@
         <th align="right"> </th>
         <td colspan=3>
           <font color="gray" size="-1">
-            Provide pertinent details to help the supporters pinpoint
-            the causes.
+            Provide relevant details to help supporters isolate the
+            causes.
           </font>
         </td>
        </tr>