Merge lp:~unifield-team/unifield-web/web-jfb-utp-760 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/listgrid.py'
--- addons/openerp/controllers/listgrid.py	2013-08-14 12:26:34 +0000
+++ addons/openerp/controllers/listgrid.py	2013-12-18 18:32:16 +0000
@@ -270,7 +270,7 @@
                 del params.context['group_by']
             params.group_by_ctx = []
 
-
+        #params.forced_domain = params.domain[:]
         if source == '_terp_list':
             if not params.view_type == 'graph':
                 params.view_type = 'tree'
@@ -314,13 +314,12 @@
             view=ustr(wid.render())
 
         server_logs = ''
-
         if frm.logs and frm.screen.view_type == 'tree':
             server_logs = ustr(frm.logs.render())
 
         concurrency_info = getattr(cherrypy.request, 'terp_concurrency_info', None)
 
-        return dict(ids=ids, count=count, view=view, logs=server_logs, concurrency_info=concurrency_info)
+        return dict(ids=ids, count=count, view=view, logs=server_logs, concurrency_info=concurrency_info, previously_selected=frm.screen.set_previously_selected)
 
     @expose('json')
     def button_action(self, **kw):

=== modified file 'addons/openerp/controllers/templates/closepopup.mako'
--- addons/openerp/controllers/templates/closepopup.mako	2013-08-06 09:55:16 +0000
+++ addons/openerp/controllers/templates/closepopup.mako	2013-12-18 18:32:16 +0000
@@ -50,7 +50,7 @@
                                 return;
                             }
                         case 'tree':
-                            new topWindow.ListView('_terp_list').reload();
+                            new topWindow.ListView('_terp_list').reload_from_wizard();
                             return;
                     }
                     topWindow.location.reload();

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2013-12-12 06:23:09 +0000
+++ addons/openerp/static/javascript/listgrid.js	2013-12-18 18:32:16 +0000
@@ -827,7 +827,10 @@
         this.reload();
     },
 
-    reload: function(edit_inline, concurrency_info, default_get_ctx, clear, ids_to_show) {
+    reload_from_wizard: function() {
+        return this.reload(undefined, undefined, undefined, undefined, undefined, true);
+    },
+    reload: function(edit_inline, concurrency_info, default_get_ctx, clear, ids_to_show, from_close_wizard) {
         if (openobject.http.AJAX_COUNT > 0) {
             return callLater(1, bind(this.reload, this), edit_inline, concurrency_info);
         }
@@ -849,8 +852,13 @@
             jQuery.extend(args, {
                 _terp_search_domain: openobject.dom.get('_terp_search_domain').value,
                 _terp_search_data: openobject.dom.get('_terp_search_data').value,
-                _terp_filter_domain: openobject.dom.get('_terp_filter_domain').value
+                _terp_filter_domain: openobject.dom.get('_terp_filter_domain').value,
             });
+            if (from_close_wizard) {
+                jQuery.extend(args, {
+                    _terp_reload_previously_selected: '['+self.get_previously_selected().join(',')+']',
+                });
+            }
         }
 
         if(this.sort_key) {
@@ -889,7 +897,9 @@
                     _terp_ids.value = self.ids = '[' + obj.ids.join(',') + ']';
                     _terp_count.value = obj.count;
                 }
-
+                if ('previously_selected' in obj && obj.previously_selected != null) {
+                    self.update_previously_selected(obj.previously_selected);
+                }
                 self.current_record = edit_inline;
                 if(obj.logs) {
                     jQuery('div#server_logs').append(obj.logs)

=== modified file 'addons/openerp/widgets/screen.py'
--- addons/openerp/widgets/screen.py	2013-08-06 08:39:06 +0000
+++ addons/openerp/widgets/screen.py	2013-12-18 18:32:16 +0000
@@ -73,7 +73,7 @@
         if self.view_ids and self.view_type in self.view_mode:
             idx = self.view_mode.index(self.view_type)
             self.view_id = self.view_ids[idx]
- 
+
         self.search_domain = params.search_domain or []
         self.domain        = params.domain or []
         self.context       = params.context or {}
@@ -88,6 +88,13 @@
                 self.count = len(self.ids)
             else:
                 self.count = rpc.RPCProxy(self.model).search_count(self.domain, self.context)
+        self.set_previously_selected = None
+
+        #forced_domain = params.forced_domain or []
+        if params.get('_terp_reload_previously_selected'):
+            self.set_previously_selected = rpc.RPCProxy(self.model).search(self.domain+[('id', 'in', params['_terp_reload_previously_selected'])], 0, 0, 0, self.context)
+            #self.set_previously_selected = rpc.RPCProxy(self.model).search(forced_domain+[('id', 'in', params['_terp_reload_previously_selected'])], 0, 0, 0, self.context)
+
         self.prefix             = prefix
         self.views_preloaded    = views_preloaded or (params.views or {})