[gnue] r8556 - trunk/gnue-forms/src

[reinhard]

Author: reinhard
Date: 2006-08-08 17:23:29 -0500 (Tue, 08 Aug 2006)
New Revision: 8556

Modified:
   trunk/gnue-forms/src/GFForm.py
Log:
Fixes for tabbing through forms without a block.

issue111 testing


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-08-08 21:38:49 UTC (rev 8555)
+++ trunk/gnue-forms/src/GFForm.py      2006-08-08 22:23:29 UTC (rev 8556)
@@ -1336,7 +1336,8 @@
         currentBlock = self._currentBlock
         mode = self.getCurrentMode()
 
-        if currentBlock.transparent and not ( \
+        if currentBlock is None or ( \
+            currentBlock.transparent and not ( \
               onlyInBlock or \
               currentBlock.autoNextRecord and not ( \
                   currentBlock.isEmpty() or \
@@ -1344,7 +1345,7 @@
                        not (currentBlock.autoCreate and \
                             currentBlock.editable in ('Y', 'new')) or \
                   (reverse and currentBlock.isFirstRecord()) \
-              ))):
+              )))):
           source = self._currentEntry._page.get_focus_order()
           stayInBlock = False
         else:
@@ -1390,10 +1391,11 @@
         if nextEntry == firstEntry:
 
           # If we should navigate to the next record, do it...
-          if reverse and not currentBlock.isFirstRecord():
+          if currentBlock is not None \
+                  and reverse and not currentBlock.isFirstRecord():
             currentBlock.prevRecord()
             self.changeFocus(nextEntry)
-          elif not reverse and \
+          elif currentBlock is not None and not reverse and \
              currentBlock.autoNextRecord and \
              not currentBlock.isEmpty() and \
              not (not currentBlock.autoCreate and \
@@ -1408,7 +1410,7 @@
                  self.changeFocus(nextEntry)
 
           # Otherwise, are we transparent? If so, go to next block/page
-          elif currentBlock.transparent and \
+          elif (currentBlock is None or currentBlock.transparent) and \
              self._currentPage.transparent:
 
             # Jump to the next/(previous) page if block is page as transparent