[CMF-checkins] CVS: CMF/CMFCollector/skins/collector - collector_add_issue.py:1.6 collector_add_issue_form.pt:1.7 collector_edit.py:1.4 collector_edit_form.pt:1.6 collector_issue_edit.py:1.4 collector_issue_notice.dtml:1.5 collector_search.py:1.10

Ken Manheimer klm@zope.com
Fri, 26 Oct 2001 13:53:12 -0400


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

Modified Files:
	collector_add_issue.py collector_add_issue_form.pt 
	collector_edit.py collector_edit_form.pt 
	collector_issue_edit.py collector_issue_notice.dtml 
	collector_search.py 
Log Message:
Eliminated "severities" trait, and consolidated "versions" and
"other_version_info" into a single "version_info" freeform-text
attribute.  Changed the spiel name accordingly, "version_info_spiel"


=== CMF/CMFCollector/skins/collector/collector_add_issue.py 1.5 => 1.6 ===
-##parameters=submitter, title, security_related, topic, importance, classification, severity, description, reported_version, other_version_info
+##parameters=submitter, title, security_related, topic, importance, classification, description, version_info
 ##title=Submit a Request
 
 REQUEST = context.REQUEST
@@ -9,11 +9,9 @@
                        description=description,
                        security_related=security_related,
                        topic=topic,
-                       importance=importance,
                        classification=classification,
-                       severity=severity,
-                       reported_version=reported_version,
-                       other_version_info=other_version_info,
+                       importance=importance,
+                       version_info=version_info,
                        assignees=REQUEST.get('assignees', []),
                        file=REQUEST.get('file'),
                        fileid=REQUEST.get('fileid', ''),


=== CMF/CMFCollector/skins/collector/collector_add_issue_form.pt 1.6 => 1.7 ===
         <th align="right"> Topic </th>
         <td>
-          <table>
-            <tr>
-              <td>
-                <select name="topic">
-                  <option value=""
-                          tal:repeat="it here/topics"
-                          tal:attributes="value it"
-                          tal:content="it"></option>
-                </select>
-                <th align="right"> Version </th>
-                <td>
-                 <select name="reported_version">
-                   <option value=""
-                           tal:repeat="it here/versions"
-                           tal:attributes="value it"
-                           tal:content="it"></option>
-                 </select>
-                </td>
-              </tr>
-            </table>
+            <select name="topic">
+              <option value=""
+                      tal:repeat="it here/topics"
+                tal:attributes="value it"
+                tal:content="it"></option>
+            </select>
         </td>
         <th align="right"> Importance </th>
         <td>
@@ -118,14 +104,18 @@
                    tal:content="it"></option>
          </select>
         </td>
-        <th align="right"> Severity </th>
+
+       </tr>
+
+       <tr>
+        <th> Version Info </th>
         <td>
-         <select name="severity">
-           <option value=""
-                   tal:repeat="it here/severities"
-                   tal:attributes="value it"
-                   tal:content="it"></option>
-         </select>
+            <textarea name="version_info" rows="3" cols="30"></textarea>
+        </td>
+        <td colspan="2">
+          <font color="gray">
+            <span tal:replace="here/version_info_spiel"></span>
+          </font>
         </td>
        </tr>
 
@@ -161,18 +151,6 @@
            </select>
          </td>
               
-       </tr>
-
-       <tr>
-        <th > Other Version Info </th>
-        <td>
-            <textarea name="other_version_info" rows="3" cols="30"></textarea>
-        </td>
-        <td colspan="2">
-          <font color="gray">
-            <span tal:replace="here/other_versions_spiel"></span>
-          </font>
-        </td>
        </tr>
 
        <tr>


=== CMF/CMFCollector/skins/collector/collector_edit.py 1.3 => 1.4 ===
-##parameters=title, description, email, abbrev, supporters, topics, classifications, importances, severities, versions, other_versions_spiel
+##parameters=title, description, email, abbrev, supporters, topics, classifications, importances, version_info_spiel
 ##title=Configure Collector
  
 from Products.PythonScripts.standard import url_quote_plus
@@ -12,9 +12,7 @@
                        topics=topics,
                        classifications=classifications,
                        importances=importances,
-                       severities=severities,
-                       versions=versions,
-                       other_versions_spiel=other_versions_spiel)
+                       version_info_spiel=version_info_spiel)
 
 if changed:
     changes = "Configuration changed"


=== CMF/CMFCollector/skins/collector/collector_edit_form.pt 1.5 => 1.6 ===
   
  <tr valign="top">
-  <th align="right"> Issue Importances
+  <th align="right"> Importance
   </th>
   <td>
    <textarea name="importances:lines" rows="5" cols="15">
 <span tal:repeat="it here/importances|nothing" tal:replace="it">
 </span></textarea>
   </td>
-  <th align="right"> Issue Severities
-  </th>
-  <td>
-   <textarea name="severities:lines" rows="5" cols="15">
-<span tal:repeat="it here/severities|nothing" tal:replace="it">
-</span></textarea>
-  </td>
  </tr>
   
  <tr valign="top">
-  <th align="right"> Product Versions
-  </th>
-  <td>
-   <textarea name="versions:lines" rows="5" cols="15">
-<span tal:repeat="it here/versions|nothing" tal:replace="it">
-</span></textarea>
-  </td>
-  <td colspan=2>
-    <b> Other Versions Spiel </b>
-    <font size="-1" color="gray"> Prompt text for new-issue form... </font>
+  <th align="right"> Version Info Spiel </th>
+  <td colspan=3>
+    <font size="-1" color="gray"> Something to prompt requesters for useful
+    version info... </font>
     <br> 
-   <textarea name="other_versions_spiel:text" rows="4" cols="33">
-<span tal:replace="here/other_versions_spiel|nothing">
+   <textarea name="version_info_spiel:text" rows="3" cols="50">
+<span tal:replace="here/version_info_spiel|nothing">
 </span></textarea>
   </td>
  </tr>


=== CMF/CMFCollector/skins/collector/collector_issue_edit.py 1.3 => 1.4 ===
                        classification=reqget('classification'),
                        importance=reqget('importance'),
-                       severity=reqget('severity'),
-                       reported_version=reqget('reported_version'),
-                       other_version_info=reqget('other_version_info'),
+                       version_info=reqget('version_info'),
+                       comment=reqget('comment'),
                        text=reqget('text'))
 
 if context.security_related != was_security_related:


=== CMF/CMFCollector/skins/collector/collector_issue_notice.dtml 1.4 => 1.5 ===
 Issue #<dtml-var issue_id> Update (<dtml-var action>) "<dtml-var title size=50>"
 <dtml-if security_related> ** Security Related ** (<dtml-if confidential>Confidential<dtml-else>Public</dtml-if>)
-</dtml-if> Status <dtml-var status>, <dtml-var topic>/<dtml-var klass> <dtml-var importance>/<dtml-var severity>
+</dtml-if> Status <dtml-var status>, <dtml-var topic>/<dtml-var klass> <dtml-var importance>
 To followup, visit:
   <dtml-var issue_url>
 


=== CMF/CMFCollector/skins/collector/collector_search.py 1.9 => 1.10 ===
 supplement_query("Creator")
 supplement_query("classifications", "classification")
-supplement_query("severities", "severity")
 supplement_query("supporters", "assigned_to")
 supplement_query("resolution")
-supplement_query("reported_version")
+supplement_query("version_info")
 
 sr = reqget("security_related", [])
 if sr: