changeset f8b9230ad4a8 in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=f8b9230ad4a8
description:
        Reduce offset when no search result

        issue7966
        review60461002
diffstat:

 CHANGELOG                                    |   1 +
 tryton/gui/window/view_form/screen/screen.py |  17 +++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r ec6e6f31b244 -r f8b9230ad4a8 CHANGELOG
--- a/CHANGELOG Fri Jan 18 11:01:22 2019 +0100
+++ b/CHANGELOG Fri Jan 18 11:17:07 2019 +0100
@@ -1,3 +1,4 @@
+* Reduce offset when no search result
 * Ensure URL scheme of bus (issue7792)
 * Add drag & drop support on binary widget
 
diff -r ec6e6f31b244 -r f8b9230ad4a8 
tryton/gui/window/view_form/screen/screen.py
--- a/tryton/gui/window/view_form/screen/screen.py      Fri Jan 18 11:01:22 
2019 +0100
+++ b/tryton/gui/window/view_form/screen/screen.py      Fri Jan 18 11:17:07 
2019 +0100
@@ -238,7 +238,7 @@
 
     def search_prev(self, search_string):
         if self.limit:
-            self.offset -= self.limit
+            self.offset = max(self.offset - self.limit, 0)
         self.search_filter(search_string=search_string)
 
     def search_next(self, search_string):
@@ -271,11 +271,16 @@
         context = self.context
         if self.screen_container.but_active.get_active():
             context['active_test'] = False
-        try:
-            ids = RPCExecute('model', self.model_name, 'search', domain,
-                self.offset, self.limit, self.order, context=context)
-        except RPCException:
-            ids = []
+        ids = []
+        while True:
+            try:
+                ids = RPCExecute('model', self.model_name, 'search', domain,
+                    self.offset, self.limit, self.order, context=context)
+            except RPCException:
+                break
+            if ids or self.offset <= 0:
+                break
+            self.offset = max(self.offset - self.limit, 0)
         if not only_ids:
             if self.limit is not None and len(ids) == self.limit:
                 try:

Reply via email to