working toward 0.5.2 release

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1378 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index 3f1ea6e71264cadeddac650e2b7444ca39eff502..4385dd59869b6a66df2824ee8e90817c9a872343 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,9 @@ are given with the most recent entry first.
 - added ID to the search page (sf bug 631601)
 - fixed filtering by id in anydbm
 - show issue ID in the headings (sf bug 631598)
+- show entire messages by default in issues (sf bug 625995)
+- fixed journalling to save old values instead of new (sorry it took so long GM)
+- handle missing REQUEST_URI for cgi-bin users (sf bug 620163)
 
 
 2002-10-16 0.5.1

diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi
index 22cf5cf817cf8d1444afbddbf11a9b94bb536b21..3e4c2f7c80066b18fd9565ebf62ab11b5600669f 100755 (executable)
--- a/cgi-bin/roundup.cgi
+++ b/cgi-bin/roundup.cgi
@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup.cgi,v 1.34 2002-10-08 03:31:09 richard Exp $
+# $Id: roundup.cgi,v 1.35 2002-11-06 11:38:42 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -149,7 +149,7 @@ def main(out, err):
             else:
                 protocol = 'http'
             absolute_url = '%s://%s%s/'%(protocol, os.environ['HTTP_HOST'],
-                os.environ['REQUEST_URI'])
+                os.environ.get('REQUEST_URI', ''))
             request.send_header('Location', absolute_url)
             request.end_headers()
             out.write('Moved Permanently')

diff --git a/doc/FAQ.txt b/doc/FAQ.txt
index 270a3fb8aaafb73b3a37e8abe90f271c888a9a80..e0b442f692772f3d0e60648a3595411ecdaf4808 100644 (file)
--- a/doc/FAQ.txt
+++ b/doc/FAQ.txt
@@ -2,16 +2,13 @@
 Roundup FAQ
 ===========
 
-:Version: $Revision: 1.10 $
+:Version: $Revision: 1.11 $
 
 NOTE: This is just a grabbag, most of this should go into documentation.
 
 .. contents::
 
 
-Changing HTML layout
---------------------
-
 Installation
 ------------
 
@@ -34,11 +31,6 @@ Different jobs run under different users.
 * roundup-mailgw called via .forward from MTA, or running a cron job
   fetching via pop.
 
-see Troubleshooting_.
-
-
-Troubleshooting
----------------
 
 -----------------
 

diff --git a/doc/Makefile b/doc/Makefile
index dcfb826731a1a5ae8b0c1d24cb8ae2d9900d29d3..eb1701ce06a2f852a64ea4f1ff5ef4de171a9b67 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 PYTHON = /usr/bin/python2
-STXTOHTML = -c "from docutils.core import publish;publish(writer_name='html')"
+STXTOHTML = stx2html
 
 SOURCE = announcement.txt customizing.txt developers.txt FAQ.txt features.txt \
     glossary.txt implementation.txt index.txt design.txt \
@@ -10,7 +10,7 @@ COMPILED := $(SOURCE:.txt=.html)
 all: ${COMPILED}
 
 %.html: %.txt
-       ${PYTHON} ${STXTOHTML} --report=warning -d $< $@
+       ${STXTOHTML} --report=warning -d $< $@
 
 clean:
        rm -f ${COMPILED}

diff --git a/doc/announcement.txt b/doc/announcement.txt
index c1500c35a53b1a9f3726ce277672e267aadda301..a6fad280cdb571cb72e55b8f8649f017f58a2053 100644 (file)
--- a/doc/announcement.txt
+++ b/doc/announcement.txt
@@ -13,6 +13,32 @@ sqlite backend are encouraged to upgrade sqlite to version 2.7.3.
 
 We've had a good crack at bugs (thanks to all who contributed!):
 
+- added quotes around python interpreter in windows bat (sf bug 623963)
+- fixed link at end of installation doc (sf bug 623957)
+- handle "classname" URL path errors cleaner (generate a 404)
+- added CGI :remove:<propname> and :add:<propname> which specify item
+  ids to remove / add in <propname> multilink.
+- bugfix in boolean templating
+- remember the change note on bad submissions (sf bug 625989)
+- highlight required form fields (sf bug 625989)
+- force non-word boundary to match re: in subject (sf bug 626303)
+- handle sqlite bug (<2.7.2) (sf bug 630828)
+- handle missing props in anydbm stringFind
+- updated email package address formatting (deprecation)
+- copied email address quoting from email v2.4.3 so we're consistent
+  with 2.2
+- email summary extraction now takes the first whole sentence or line -
+  whichever is longer
+- documented dependency on Active State (sf bug 623959)
+- ensured there's no zero-length files in source (sf bug 633622)
+- added ID to the search page (sf bug 631601)
+- fixed filtering by id in anydbm
+- show issue ID in the headings (sf bug 631598)
+- show entire messages by default in issues (sf bug 625995)
+- fixed journalling to save old values instead of new (sorry I took so
+  long, GM)
+- handle missing REQUEST_URI for cgi-bin users (sf bug 620163)
+
 
 Source and documentation is available at the website:
      http://roundup.sourceforge.net/

diff --git a/doc/customizing.txt b/doc/customizing.txt
index 60ec72115ee1308d2091910cc0c50619ef19093b..5053b66c4d39193314af8f1abab8d3806fd2b6af 100644 (file)
--- a/doc/customizing.txt
+++ b/doc/customizing.txt
@@ -2,7 +2,7 @@
 Customising Roundup
 ===================
 
-:Version: $Revision: 1.61 $
+:Version: $Revision: 1.62 $
 
 .. This document borrows from the ZopeBook section on ZPT. The original is at:
    http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -2144,26 +2144,23 @@ to.
    which displays only the allowed status to transition to.
 
 
-Displaying entire message contents in the issue display
--------------------------------------------------------
+Displaying only message summaries in the issue display
+------------------------------------------------------
 
 Alter the issue.item template section for messages to::
 
  <table class="messages" tal:condition="context/messages">
-  <tr><th colspan=3 class="header">Messages</th></tr>
-  <tal:block tal:repeat="msg context/messages/reverse">
-   <tr>
-    <th><a tal:attributes="href string:msg${msg/id}"
-           tal:content="string:msg${msg/id}"></a></th>
-    <th tal:content="string:Author: ${msg/author}">author</th>
-    <th tal:content="string:Date: ${msg/date}">date</th>
-   </tr>
-   <tr>
-    <td colspan="3" class="content">
-     <pre tal:content="msg/content">content</pre>
-    </td>
-   </tr>
-  </tal:block>
+  <tr><th colspan=5 class="header">Messages</th></tr>
+  <tr tal:repeat="msg context/messages">
+   <td><a tal:attributes="href string:msg${msg/id}"
+          tal:content="string:msg${msg/id}"></a></td>
+   <td tal:content="msg/author">author</td>
+   <td nowrap tal:content="msg/date/pretty">date</td>
+   <td tal:content="msg/summary">summary</td>
+   <td>
+    <a tal:attributes="href string:?:remove:messages=${msg/id}&:action=edit">remove</a>
+   </td>
+  </tr>
  </table>
 
 Restricting the list of users that are assignable to a task
@@ -2718,7 +2715,7 @@ Enabling display of either message summaries or the entire messages
 -------------------------------------------------------------------
 
 This is pretty simple - all we need to do is copy the code from the example
-`displaying entire message contents in the issue display`_ into our template
+`displaying only message summaries in the issue display`_ into our template
 alongside the summary display, and then introduce a switch that shows either
 one or the other. We'll use a new form variable, ``:whole_messages`` to
 achieve this::

diff --git a/roundup/__init__.py b/roundup/__init__.py
index 2cc04f0cac73403bbc7c535e678928576ef93ac3..b5440b9ff9d47a21325025bb8b3a1ded5d48aac9 100644 (file)
--- a/roundup/__init__.py
+++ b/roundup/__init__.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.15 2002-10-16 06:55:17 richard Exp $
+# $Id: __init__.py,v 1.16 2002-11-06 11:38:42 richard Exp $
 
 ''' Roundup - issue tracking for knowledge workers.
 
@@ -67,6 +67,6 @@ written by Ka-Ping Yee in the "doc" directory. If nothing else, it has a
 much prettier cake :)
 '''
 
-__version__ = '0.5.1'
+__version__ = '0.5.2'
 
 # vim: set filetype=python ts=4 sw=4 et si

diff --git a/roundup/backends/back_anydbm.py b/roundup/backends/back_anydbm.py
index bad6989b53e9d7732782dd8b36c99a661f3d7160..c7f108f1b8d310b1fbceabe91b346bf5aef8702e 100644 (file)
--- a/roundup/backends/back_anydbm.py
+++ b/roundup/backends/back_anydbm.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-#$Id: back_anydbm.py,v 1.91 2002-11-06 05:39:49 richard Exp $
+#$Id: back_anydbm.py,v 1.92 2002-11-06 11:38:42 richard Exp $
 '''
 This module defines a backend that saves the hyperdatabase in a database
 chosen by anydbm. It is guaranteed to always be available in python
@@ -888,7 +888,7 @@ class Class(hyperdb.Class):
         # done
         self.db.addnode(self.classname, newid, propvalues)
         if self.do_journal:
-            self.db.addjournal(self.classname, newid, 'create', propvalues)
+            self.db.addjournal(self.classname, newid, 'create', {})
 
         self.fireReactors('create', newid, None)
 
@@ -970,7 +970,7 @@ class Class(hyperdb.Class):
             creation = None
         if d.has_key('activity'):
             del d['activity']
-        self.db.addjournal(self.classname, newid, 'create', d, creator,
+        self.db.addjournal(self.classname, newid, 'create', {}, creator,
             creation)
         return newid
 
@@ -1145,9 +1145,11 @@ class Class(hyperdb.Class):
 
             # if the value's the same as the existing value, no sense in
             # doing anything
-            if node.has_key(propname) and value == node[propname]:
+            current = node.get(propname, None)
+            if value == current:
                 del propvalues[propname]
                 continue
+            journalvalues[propname] = current
 
             # do stuff based on the prop type
             if isinstance(prop, Link):
@@ -1283,8 +1285,7 @@ class Class(hyperdb.Class):
         self.db.setnode(self.classname, nodeid, node)
 
         if self.do_journal:
-            propvalues.update(journalvalues)
-            self.db.addjournal(self.classname, nodeid, 'set', propvalues)
+            self.db.addjournal(self.classname, nodeid, 'set', journalvalues)
 
         self.fireReactors('set', nodeid, oldvalues)
 
@@ -1612,7 +1613,6 @@ class Class(hyperdb.Class):
         # now, find all the nodes that are active and pass filtering
         l = []
         cldb = self.db.getclassdb(cn)
-        print filterspec
         try:
             # TODO: only full-scan once (use items())
             for nodeid in self.db.getnodeids(cn, cldb):

diff --git a/roundup/backends/rdbms_common.py b/roundup/backends/rdbms_common.py
index cd24b8430dbf42144b428841247afb4832f5e3c9..cfe27b3563d8c467fad34dfbb00bed83a237c496 100644 (file)
--- a/roundup/backends/rdbms_common.py
+++ b/roundup/backends/rdbms_common.py
@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.23 2002-10-31 04:02:23 richard Exp $
+# $Id: rdbms_common.py,v 1.24 2002-11-06 11:38:42 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1102,7 +1102,7 @@ class Class(hyperdb.Class):
         # done
         self.db.addnode(self.classname, newid, propvalues)
         if self.do_journal:
-            self.db.addjournal(self.classname, newid, 'create', propvalues)
+            self.db.addjournal(self.classname, newid, 'create', {})
 
         self.fireReactors('create', newid, None)
 
@@ -1184,7 +1184,7 @@ class Class(hyperdb.Class):
             creation = None
         if d.has_key('activity'):
             del d['activity']
-        self.db.addjournal(self.classname, newid, 'create', d, creator,
+        self.db.addjournal(self.classname, newid, 'create', {}, creator,
             creation)
         return newid
 
@@ -1323,9 +1323,11 @@ class Class(hyperdb.Class):
 
             # if the value's the same as the existing value, no sense in
             # doing anything
-            if node.has_key(propname) and value == node[propname]:
+            current = node.get(propname, None)
+            if value == current:
                 del propvalues[propname]
                 continue
+            journalvalues[propname] = current
 
             # do stuff based on the prop type
             if isinstance(prop, Link):
@@ -1460,8 +1462,7 @@ class Class(hyperdb.Class):
         self.db.setnode(self.classname, nodeid, propvalues, multilink_changes)
 
         if self.do_journal:
-            propvalues.update(journalvalues)
-            self.db.addjournal(self.classname, nodeid, 'set', propvalues)
+            self.db.addjournal(self.classname, nodeid, 'set', journalvalues)
 
         self.fireReactors('set', nodeid, oldvalues)
 

diff --git a/roundup/templates/classic/html/issue.item b/roundup/templates/classic/html/issue.item
index 6afb146dc94611cf80dd83f64c15912f4382258c..d4e4e1f9f49299e7d4bcb6f6589b7ac639fd3f3e 100644 (file)
--- a/roundup/templates/classic/html/issue.item
+++ b/roundup/templates/classic/html/issue.item
@@ -127,17 +127,23 @@ python:db.user.classhelp('username,realname,address,phone')" /><br>
  </p>
 
  <table class="messages" tal:condition="context/messages">
-  <tr><th colspan=5 class="header">Messages</th></tr>
-  <tr tal:repeat="msg context/messages">
-   <td><a tal:attributes="href string:msg${msg/id}"
-          tal:content="string:msg${msg/id}"></a></td>
-   <td tal:content="msg/author">author</td>
-   <td nowrap tal:content="msg/date/pretty">date</td>
-   <td tal:content="msg/summary">summary</td>
-   <td>
-    <a tal:attributes="href string:?:remove:messages=${msg/id}&:action=edit">remove</a>
-   </td>
-  </tr>
+  <tr><th colspan="4" class="header">Messages</th></tr>
+  <tal:block tal:repeat="msg context/messages">
+   <tr>
+    <th><a tal:attributes="href string:msg${msg/id}"
+           tal:content="string:msg${msg/id}"></a></th>
+    <th tal:content="string:Author: ${msg/author}">author</th>
+    <th tal:content="string:Date: ${msg/date}">date</th>
+    <th>
+     <a tal:attributes="href string:?:remove:messages=${msg/id}&:action=edit">remove</a>
+    </th>
+   </tr>
+   <tr>
+    <td colspan="4" class="content">
+     <pre tal:content="msg/content">content</pre>
+    </td>
+   </tr>
+  </tal:block>
  </table>
 
  <table class="files" tal:condition="context/files">

diff --git a/roundup/templates/classic/html/user.item b/roundup/templates/classic/html/user.item
index ed5370205cee62b393172e17fbfbc3e5ce3e6a13..4400abe18d9ebdefa13d39caab062115805f4b5f 100644 (file)
--- a/roundup/templates/classic/html/user.item
+++ b/roundup/templates/classic/html/user.item
@@ -64,14 +64,17 @@ You are not allowed to view this page.
 </form>
 
 <table class="otherinfo" tal:condition="context/queries">
- <tr><th colspan="2" class="header">Queries</th></tr>
- <tr><th>Name</th><th>Display</th></tr>
+ <tr><th colspan="3" class="header">Queries</th></tr>
+ <tr><th>Name</th><th colspan="2">Actions</th></tr>
  <tr tal:repeat="query context/queries">
   <td><a tal:attributes="href string:query${query/id}"
          tal:content="query/name"></a></td>
   <td>
    <a tal:attributes="href python:'%s%s'%(query['klass'], query['url'])">display</a>
   </td>
+  <td>
+   <a tal:attributes="href string:?:remove:queries=${query/id}&:action=edit">remove</a>
+  </td>
  </tr>
 </table>