openerp-dev-web team mailing list archive

["Ravi Gadhia \(OpenERP\)" <rga@xxxxxxxxxxx>]

Ravi Gadhia (OpenERP) has proposed merging lp:~openerp-dev/openobject-client/trunk-bug-527025-rga into lp:openobject-client.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-527025-rga/+merge/60492

Hello sir
          I fixed regression which is created on previous commit.  thank you for review and point out regression.
-- 
https://code.launchpad.net/~openerp-dev/openobject-client/trunk-bug-527025-rga/+merge/60492
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client/trunk-bug-527025-rga.

=== modified file 'bin/widget/screen/screen.py'
--- bin/widget/screen/screen.py	2011-04-13 09:12:58 +0000
+++ bin/widget/screen/screen.py	2011-05-10 11:35:49 +0000
@@ -228,17 +228,23 @@
         if not self.auto_search:
             self.auto_search = True
             return
+        limit = self.screen_container.get_limit()
+        self.screen_container.show_limit()
         val = self.filter_widget and self.filter_widget.value or {}
-        if self.current_view.view_type == 'graph' and self.current_view.view.key:
-            self.domain = self.domain_init[:]
-            self.domain += val.get('domain',[]) + self.sort_domain
+        if self.current_view.view_type == 'graph':
+            self.screen_container.hide_limit()
+            limit = False
+            if self.current_view.view.key:
+                self.domain = self.domain_init[:]
+                self.domain += val.get('domain',[]) + self.sort_domain
+            else:
+                self.context_update(val.get('context',{}), val.get('domain',[]) + self.sort_domain)
         else:
             self.context_update(val.get('context',{}), val.get('domain',[]) + self.sort_domain)
 
         v = self.domain
         if self.win_search:
             v += self.win_search_domain
-        limit = self.screen_container.get_limit()
         if self.current_view.view_type == 'calendar':
             field_name = self.current_view.view.date_start
             old_date = self.current_view.view.date
@@ -538,6 +544,8 @@
             self.current_model.validate_set()
         elif self.current_view.view_type=='form':
             self.new()
+        if self.current_view.view_type == 'graph':
+             self.current_view.view.key = False
         self.display()
         self.current_view.set_cursor()
 

=== modified file 'bin/widget/view/form_gtk/action.py'
--- bin/widget/view/form_gtk/action.py	2010-12-21 05:18:43 +0000
+++ bin/widget/view/form_gtk/action.py	2011-05-10 11:35:49 +0000
@@ -96,9 +96,10 @@
         return True
 
     def display(self, model, model_field):
+        limit = self.screen.current_view.view_type != 'graph' and self.action.get('limit', 100)  or False  
         res_id = rpc.session.rpc_exec_auth('/object', 'execute',
                 self.action['res_model'], 'search', self.domain, 0,
-                self.action.get('limit', 100),False,self.context)
+                limit, False, self.context)
         self.screen.clear()
         self.screen.load(res_id)
         return True

=== modified file 'bin/widget/view/screen_container.py'
--- bin/widget/view/screen_container.py	2011-04-13 08:42:29 +0000
+++ bin/widget/view/screen_container.py	2011-05-10 11:35:49 +0000
@@ -48,6 +48,7 @@
         self.context = {}
         self.handler_id = None
         self.custom_panels = []
+        self.next_prev_box = None
 
     def __del__(self):
         for (ref, value) in self.__dict__.items():
@@ -201,13 +202,13 @@
         self.but_next.set_image(icon2)
         self.but_next.set_relief(gtk.RELIEF_NONE)
         self.but_next.connect('clicked', screen.search_offset_next)
-        next_prev_box = hb3
+        self.next_prev_box = hb3
         if self.win_search:
-            next_prev_box = gtk.HBox(homogeneous=False, spacing=0)
-            hs.pack_start(next_prev_box, expand=False, fill=False)
-        next_prev_box.pack_start(gtk.VSeparator(),padding=3, expand=False, fill=False)
-        next_prev_box.pack_start(self.but_previous, expand=False, fill=False)
-        next_prev_box.pack_start(self.but_next, expand=False, fill=False)
+            self.next_prev_box = gtk.HBox(homogeneous=False, spacing=0)
+            hs.pack_start(self.next_prev_box, expand=False, fill=False)
+        self.next_prev_box.pack_start(gtk.VSeparator(),padding=3, expand=False, fill=False)
+        self.next_prev_box.pack_start(self.but_previous, expand=False, fill=False)
+        self.next_prev_box.pack_start(self.but_next, expand=False, fill=False)
         hs.show_all()
         self.filter_vbox.pack_start(hs, expand=False, fill=False)
         hs = gtk.HSeparator()
@@ -224,6 +225,14 @@
     def hide_filter(self):
         if self.filter_vbox:
             self.filter_vbox.hide()
+            
+    def hide_limit(self):
+        if self.filter_vbox:
+            self.next_prev_box.hide()
+    
+    def show_limit(self):
+        if self.filter_vbox:
+            self.next_prev_box.show()
 
     def set(self, widget):
         if self.vp.get_child():