merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -57,6 +57,7 @@ Fixed:
 - removed rlog module (py 2.3 is minimum version now)
 - fixed class "help" listing paging (sf bug 1106329)
 - nicer error looking up values of None (response to sf bug 1108697)
+- added "imapServer.py" script (sf patch 934567)
 - fallback for (list) popups if javascript disabled (sf patch 1101626)
 
 

doc/customizing.txt

@@ -2,7 +2,7 @@
 Customising Roundup
 ===================
 
-:Version: $Revision: 1.161.2.10 $
+:Version: $Revision: 1.161.2.11 $
 
 .. This document borrows from the ZopeBook section on ZPT. The original is at:
    http://www.zope.org/Documentation/Books/ZopeBook/current/ZPT.stx
@@ -3689,6 +3689,7 @@ resolved. To achieve this:
 
    The contents of the detector should be something like this::
 
+
     def blockresolution(db, cl, nodeid, newvalues):
         ''' If the issue has blockers, don't allow it to be resolved.
         '''
@@ -3719,18 +3720,21 @@ resolved. To achieve this:
         if newvalues['status'] == resolved_id:
             raise ValueError, "This issue can't be resolved until %s resolved."%s
 
-    def resolveblockers(db, cl, nodeid, newvalues):
+
+    def resolveblockers(db, cl, nodeid, oldvalues):
         ''' When we resolve an issue that's a blocker, remove it from the
             blockers list of the issue(s) it blocks.
         '''
-        if not newvalues.has_key('status'):
+        newstatus = cl.get(nodeid,'status')
+
+        # no change?
+        if oldvalues.get('status', None) == newstatus:
             return
 
-        # get the resolved state ID
         resolved_id = db.status.lookup('resolved')
 
         # interesting?
-        if newvalues['status'] != resolved_id:
+        if newstatus != resolved_id:
             return
 
         # yes - find all the blocked issues, if any, and remove me from
@@ -3742,7 +3746,6 @@ resolved. To achieve this:
                 blockers.remove(nodeid)
                 cl.set(issueid, blockers=blockers)
 
-
     def init(db):
         # might, in an obscure situation, happen in a create
         db.issue.audit('create', blockresolution)

doc/index.txt

@@ -133,7 +133,7 @@ Florian Schulze,
 Klamer Schutte,
 Dougal Scott,
 Stefan Seefeld,
-Jouni K Sepp�nen,
+Jouni K Seppanen,
 Jeffrey P Shell,
 Joel Shprentz,
 Terrel Shumway,

doc/upgrading.txt

@@ -52,6 +52,10 @@ Class.get() instead.
 0.8.0 New tracker layout
 ------------------------
 
+You will need to remove any reference to the "Web Registration" and
+"Email Registration" Permissions from your dbinit.py file before running
+the "genconfig" command.
+
 The ``config.py`` file has been replaced by ``config.ini``. You may use the
 roundup-admin command "genconfig" to generate a new config file::
 
@@ -111,6 +115,10 @@ assignation of the Edit Permission::
         p = db.security.getPermission('Create', cl)
         db.security.addPermissionToRole('User', p)
 
+You should remove any reference to the "Web Registration" and "Email
+Registration" Permissions from your schema.py file as the "Create" "user"
+Permission replaces them.
+
 You will need to explicitly let anonymous users access the web interface so
 that regular users are able to see the login form. Note that almost all
 trackers will need this Permission. The only situation where it's not