[gnue] r10269 - in trunk/gnue-forms: . src/GFObjects

Author: reinhard
Date: 2010-12-12 15:50:33 -0600 (Sun, 12 Dec 2010)
New Revision: 10269

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
If there was no current record in a block before the commit, don't jump t=
o the
first record after the commit.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-12-08 00:43:52.178999901 +0100
committer: Reinhard M=C3=BCller <[email protected]>
properties:=20
	branch-nick: forms

   + timestamp: 2010-12-08 01:03:04.076999903 +0100
committer: Reinhard M=C3=BCller <[email protected]>
properties:=20
	branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFEntry.py	1459@3a364389-8fce-0310-8f11-cc363fde16c7:t=
runk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py

   + src/GFObjects/GFBlock.py	1459@3a364389-8fce-0310-8f11-cc363fde16c7:t=
runk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py

Name: bzr:revision-id:v4
   - 3116 [email protected]
3117 [email protected]
3118 [email protected]
3119 [email protected]
3120 [email protected]
3121 [email protected]
3122 [email protected]
3123 [email protected]
3124 [email protected]
3125 [email protected]
3126 [email protected]
3127 [email protected]
3128 [email protected]
3129 [email protected]
3130 [email protected]
3131 [email protected]
3132 [email protected]
3133 [email protected]
3134 [email protected]
3135 [email protected]
3136 [email protected]
3137 [email protected]
3138 [email protected]
3139 [email protected]
3140 [email protected]
3141 [email protected]
3142 [email protected]
3143 [email protected]
3144 [email protected]
3145 [email protected]
3146 [email protected]
3147 [email protected]
3148 [email protected]
3149 [email protected]
3150 [email protected]
3151 [email protected]
3152 [email protected]
3153 [email protected]
3154 [email protected]
3155 [email protected]
3156 [email protected]
3157 [email protected]
3158 [email protected]
3159 [email protected]
3160 [email protected]
3161 [email protected]
3162 [email protected]
3163 [email protected]
3164 [email protected]
3165 [email protected]
3166 [email protected]
3167 [email protected]
3168 [email protected]
3169 [email protected]
3170 [email protected]
3171 [email protected]
3172 [email protected]
3173 [email protected]
3174 [email protected]

   + 3116 [email protected]
3117 [email protected]
3118 [email protected]
3119 [email protected]
3120 [email protected]
3121 [email protected]
3122 [email protected]
3123 [email protected]
3124 [email protected]
3125 [email protected]
3126 [email protected]
3127 [email protected]
3128 [email protected]
3129 [email protected]
3130 [email protected]
3131 [email protected]
3132 [email protected]
3133 [email protected]
3134 [email protected]
3135 [email protected]
3136 [email protected]
3137 [email protected]
3138 [email protected]
3139 [email protected]
3140 [email protected]
3141 [email protected]
3142 [email protected]
3143 [email protected]
3144 [email protected]
3145 [email protected]
3146 [email protected]
3147 [email protected]
3148 [email protected]
3149 [email protected]
3150 [email protected]
3151 [email protected]
3152 [email protected]
3153 [email protected]
3154 [email protected]
3155 [email protected]
3156 [email protected]
3157 [email protected]
3158 [email protected]
3159 [email protected]
3160 [email protected]
3161 [email protected]
3162 [email protected]
3163 [email protected]
3164 [email protected]
3165 [email protected]
3166 [email protected]
3167 [email protected]
3168 [email protected]
3169 [email protected]
3170 [email protected]
3171 [email protected]
3172 [email protected]
3173 [email protected]
3174 [email protected]
3175 [email protected]

Name: bzr:text-parents
   - src/GFObjects/GFEntry.py	[email protected]=
-kv3x2nnl7ljp8ywo

   + src/GFObjects/GFBlock.py	[email protected]=
-rw7t0y2fxoqksceo


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/gnue-forms/src/GFObjects/GFBlock.py	2010-12-12 21:50:29 UTC (re=
v 10268)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py	2010-12-12 21:50:33 UTC (re=
v 10269)
@@ -364,11 +364,17 @@
         if not self.__in_query:
             self._focus_out()
=20
+        # Determine whether we want to jump to the first record within t=
he new
+        # resultset. We don't want this if the resultset hasn't really c=
hanged
+        # and we were on "no current record" before.
+        want_a_record =3D (event.resultSet is not self.__resultset \
+                or self._currentRecord !=3D -1)
+
         self.__resultset =3D event.resultSet
=20
         if self.__resultset is not None:
             recno =3D self.__resultset.getRecordNumber()
-            if recno =3D=3D -1:
+            if recno =3D=3D -1 and want_a_record:
                 self.__scrolling_blocked =3D True
                 try:
                     if not self.__resultset.firstRecord():