[gnue] r9430 - trunk/gnue-forms/src/GFObjects

[reinhard]

Author: reinhard
Date: 2007-03-07 04:12:09 -0600 (Wed, 07 Mar 2007)
New Revision: 9430

Modified:
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Disable all navigation in unbound blocks; enable query functions independently
from current focus position.


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2007-03-06 17:39:30 UTC (rev 
9429)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2007-03-07 10:12:09 UTC (rev 
9430)
@@ -875,35 +875,36 @@
             result.append('cancel_query')
             result.append('execute_query')
         else:
-            rs = self.__resultset
-            if rs is not None:
-                rec = self.__resultset.current
-                status = self.get_record_status()
+            result.append('init_query')
+            result.append('copy_query')
 
-                if rec is not None:
-                    if not rs.isFirstRecord():
-                        result.append('first_record')
-                        result.append('prev_record')
-                    if not rs.isLastRecord():
-                        result.append('next_record')
-                        result.append('last_record')
-                    result.append('goto_record')
+            if self._dataSourceLink.type != 'unbound':
+                rs = self.__resultset
+                if rs is not None:
+                    rec = rs.current
+                    status = self.get_record_status()
 
-                if not self._form.readonly:
-                    if self.editable in ('Y', 'new') and status != 'empty':
-                        result.append('new_record')
-                        result.append('duplicate_record')
-                        if self.autoCreate and rs.isLastRecord():
+                    if rec is not None:
+                        if not rs.isFirstRecord():
+                            result.append('first_record')
+                            result.append('prev_record')
+                        if not rs.isLastRecord():
                             result.append('next_record')
+                            result.append('last_record')
+                        result.append('goto_record')
 
-                    if self.deletable:
-                        if status not in ('void', 'deleted'):
-                            result.append('delete_record')
-                        else:
-                            result.append('undelete_record')
+                    if not self._form.readonly:
+                        if self.editable in ('Y', 'new') and status != 'empty':
+                            result.append('new_record')
+                            result.append('duplicate_record')
+                            if self.autoCreate and rs.isLastRecord():
+                                result.append('next_record')
 
-                result.append('init_query')
-                result.append('copy_query')
+                        if self.deletable:
+                            if status not in ('void', 'deleted'):
+                                result.append('delete_record')
+                            else:
+                                result.append('undelete_record')
 
         return result