Merge lp:~numerigraphe/openobject-client/6.x-o2m-focus-reset into lp:openobject-client/6.0

[Numérigraphe]

Same proposal as https://code.launchpad.net/~numerigraphe/openobject-client/6.x-o2m-focus-reset/+merge/138148
I propose to include as a bugfix in 6.0.
Lionel Sausin

Unmerged revisions

1792. By Chris Biersbach (OpenERP) on 2012-12-05

[FIX] Fix latest improvement in cases where the o2m field has more lines than can be displayed at once

1791. By Chris Biersbach (OpenERP) on 2012-12-05

[IMP] Keep the current selection in o2m tree views when parent record is reloaded

1790. By Chris Biersbach (OpenERP) on 2012-12-05

[IMP] Keep the current selection in o2m forms when parent record is reloaded

=== modified file 'bin/widget/model/record.py'
--- bin/widget/model/record.py	2012-02-28 09:14:57 +0000
+++ bin/widget/model/record.py	2012-12-05 13:44:30 +0000
@@ -397,7 +397,7 @@
             else:
                 raise Exception, 'Unallowed button type'
             if screen.current_model and screen.current_view.view_type != 'tree':
-                screen.reload()
+                screen.reload(res_id=id)
 
             del screen
 

=== modified file 'bin/widget/screen/screen.py'
--- bin/widget/screen/screen.py	2012-01-24 10:31:18 +0000
+++ bin/widget/screen/screen.py	2012-12-05 13:44:30 +0000
@@ -731,11 +731,11 @@
                     return True
         return False
 
-    def reload(self):
+    def reload(self, res_id=None):
         self.current_model.reload()
         if self.parent:
             self.parent.reload()
-        self.display()
+        self.display(res_id=res_id)
 
     def remove(self, unlink = False):
         id = False

=== modified file 'bin/widget/view/form_gtk/one2many_list.py'
--- bin/widget/view/form_gtk/one2many_list.py	2012-09-28 12:12:59 +0000
+++ bin/widget/view/form_gtk/one2many_list.py	2012-12-05 13:44:30 +0000
@@ -424,6 +424,7 @@
             name = str(signal_data[0] + 1)
         line = '(%s/%s of %s)' % (name, signal_data[1], signal_data[2])
         self.label.set_text(line)
+        self.pager.set_sensitivity()
 
     def _sig_refresh(self, *args):
         pass

=== modified file 'bin/widget/view/list.py'
--- bin/widget/view/list.py	2011-09-20 13:29:15 +0000
+++ bin/widget/view/list.py	2012-12-05 13:44:30 +0000
@@ -583,6 +583,21 @@
                         if self.screen.parent and isinstance(self.screen.parent, ModelRecord):
                             self.screen.parent.reload()
                         current_active_model.reload()
+                        # we force setting current_model here to avoid tree view blinking
+                        # (cause by view selecting the 1st record, then re-displaying itself,
+                        # then selecting real active record)
+                        self.screen.current_model = current_active_model
+                        if selection.get_mode() == gtk.SELECTION_MULTIPLE:
+                            path_active_model = self.store.on_get_path(current_active_model)
+                            if path_active_model not in paths:
+                                # clicked row is not in active selection,
+                                # select only the current row
+                                selection.select_path(path_active_model)
+                            else:
+                                # keep current rows selected
+                                for path in paths:
+                                    selection.select_path(path)
+                            self.widget_tree.scroll_to_cell(path_active_model)
 
             else:
                 # Here it goes for right click