Merge lp:~jfb-tempo-consulting/unifield-web/US-4350 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/attachment.py'
--- addons/openerp/controllers/attachment.py	2017-02-06 11:21:15 +0000
+++ addons/openerp/controllers/attachment.py	2018-10-29 09:32:00 +0000
@@ -71,10 +71,9 @@
         raise Exception('Unknown attachment type %(type)s for attachment name %(name)s' % attachment)
 
     @expose('json', methods=('POST',))
-    def save(self, datas, **kwargs):
-        params, data = TinyDict.split(cherrypy.session['params'])
+    def save(self, model, model_id, datas, **kwargs):
         ctx = dict(rpc.session.context,
-                   default_res_model=params.model, default_res_id=params.id,
+                   default_res_model=model, default_res_id=model_id,
                    active_id=False, active_ids=[])
         ctx['from_web_interface'] = True
 
 
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2018-03-16 11:04:11 +0000
+++ addons/openerp/controllers/form.py	2018-10-29 09:32:00 +0000
@@ -181,8 +181,6 @@
         if tg_errors:
             return cherrypy.request.terp_form
 
-        cherrypy.session['params'] = params
-
         params.offset = params.offset or 0
         params.count = params.count or 0
         params.approximation = params.approximation or False
 
=== modified file 'addons/openerp/controllers/search.py'
--- addons/openerp/controllers/search.py	2018-02-09 14:29:44 +0000
+++ addons/openerp/controllers/search.py	2018-10-29 09:32:00 +0000
@@ -502,3 +502,7 @@
                 del context_own[ctx[0]]
 
         return context_own
+
+    @expose()
+    def kill_search_filter(self, model, unique_id):
+        rpc.session.execute('object', 'execute', model, 'kill_search_filter', unique_id, rpc.session.context)
 
=== modified file 'addons/openerp/po/messages/fr.po'
--- addons/openerp/po/messages/fr.po	2018-09-20 12:56:09 +0000
+++ addons/openerp/po/messages/fr.po	2018-10-29 09:32:00 +0000
@@ -1608,6 +1608,10 @@
 msgid "Clear all."
 msgstr "Tout effacer."
 
+#: widgets/templates/viewform.mako:33
+msgid "Cancel query"
+msgstr "Annuler la recherche"
+
 #: widgets/templates/viewform.mako:35
 msgid "Clear"
 msgstr "Effacer"
 
=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2018-07-26 15:07:43 +0000
+++ addons/openerp/static/javascript/listgrid.js	2018-10-29 09:32:00 +0000
@@ -692,6 +692,7 @@
     }
 });
 
+var current_search;
 // standard actions
 MochiKit.Base.update(ListView.prototype, {
 
@@ -925,6 +926,10 @@
 
         var prefix = this.name == '_terp_list' ? '' : this.name + '/';
         args[prefix+'_terp_force_limit'] = 1;
+
+        if (this.name == '_terp_list') {
+            jQuery('#kill_search').show();
+        }
         if (this.name == '_terp_list') {
             jQuery.extend(args, {
                 _terp_search_domain: openobject.dom.get('_terp_search_domain').value,
@@ -949,18 +954,24 @@
             args['_terp_clear'] = true;
         }
 
+        if (unique_id) {
+            args['_terp_unique_id'] = unique_id;
+        }
         if (ids_to_show) {
             args['_terp_ids_to_show'] = '['+ids_to_show.join(',')+']';
             args['_terp_offset'] = 0;
         }
         jQuery(idSelector(self.name) + ' .loading-list').show();
-        jQuery.ajax({
+        current_search = jQuery.ajax({
             url: '/openerp/listgrid/get',
             data: args,
             dataType: 'jsonp',
             type: 'POST',
             error: loadingError(),
             success: function(obj) {
+                if (self.name == '_terp_list') {
+                    jQuery('#kill_search').hide();
+                }
                 var _terp_id = openobject.dom.get(self.name + '/_terp_id') || openobject.dom.get('_terp_id');
                 var _terp_ids = openobject.dom.get(self.name + '/_terp_ids') || openobject.dom.get('_terp_ids');
                 var _terp_count = openobject.dom.get(self.name + '/_terp_count') || openobject.dom.get('_terp_count');
 
=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2018-07-27 09:07:36 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2018-10-29 09:32:00 +0000
@@ -432,3 +432,4 @@
 });
 
 var global_list_refresh;
+var unique_id ='';
 
=== modified file 'addons/openerp/static/javascript/search.js'
--- addons/openerp/static/javascript/search.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/search.js	2018-10-29 09:32:00 +0000
@@ -633,12 +633,29 @@
 	if (group_by == 'False') {
 		group_by = [];
 	}
-    
+    unique_id = new Date().getTime();
     if(jQuery('#filter_table').is(':visible') || jQuery('#_terp_filter_domain').val() != '[]') {
-        display_Customfilters(all_domains, group_by);
+        return display_Customfilters(all_domains, group_by);
     } else {
         var custom_domain = jQuery('#_terp_filter_domain').val() || '[]';
-        final_search_domain(custom_domain, all_domains, group_by);
+        return final_search_domain(custom_domain, all_domains, group_by);
+    }
+}
+
+function kill_search_filter() {
+    current_search.abort();
+    jQuery(idSelector('_terp_list') + ' .loading-list').hide();
+    jQuery('#kill_search').hide();
+    $.event.trigger("ajaxStop");
+    if (unique_id) {
+        jQuery.ajax({
+            url:'/openerp/search/kill_search_filter',
+            data: {
+                model: jQuery('#_terp_model').val(),
+                unique_id: unique_id,
+            },
+            type: 'POST',
+        });
     }
 }
 
 
=== modified file 'addons/openerp/utils/rpc.py'
--- addons/openerp/utils/rpc.py	2018-02-14 10:46:12 +0000
+++ addons/openerp/utils/rpc.py	2018-10-29 09:32:00 +0000
@@ -396,6 +396,7 @@
     def logout(self):
         try:
             self.storage.clear()
+            cherrypy.session.delete()
         except Exception:
             pass
 
 
=== modified file 'addons/openerp/widgets/_views.py'
--- addons/openerp/widgets/_views.py	2017-10-12 15:54:04 +0000
+++ addons/openerp/widgets/_views.py	2018-10-29 09:32:00 +0000
@@ -119,6 +119,7 @@
                                     default_data=screen.default_value,
                                     force_readonly=screen.force_readonly,
                                     approximation=screen.approximation,
+                                    unique_id=screen.unique_id,
                                     filter_selector=screen.filter_selector)
 
         screen.ids = widget.ids
 
=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2018-05-29 16:01:39 +0000
+++ addons/openerp/widgets/listgrid.py	2018-10-29 09:32:00 +0000
@@ -184,7 +184,11 @@
         search_text = terp_params.get('_terp_search_text', False)
         if not self.source:
             self.source = terp_params.get('_terp_source', None)
+
+
         if not default_data and not self.o2m and not self.m2m:
+            if 'unique_id' in kw:
+                context['unique_id'] = kw['unique_id']
             if self.limit > 0:
                 if self.sort_key:
                     ids = proxy.search(search_param, self.offset, self.limit, self.sort_key + ' ' +self.sort_order + ',id', context)
@@ -222,7 +226,7 @@
             ctx.update(context)
 
             try:    
-                data = proxy.read(ids, fields.keys() + ['__last_update'], ctx)
+                data = proxy.read_web(ids, fields.keys() + ['__last_update'], ctx)
             except:
                 pass
 
 
=== modified file 'addons/openerp/widgets/screen.py'
--- addons/openerp/widgets/screen.py	2018-04-04 15:01:51 +0000
+++ addons/openerp/widgets/screen.py	2018-10-29 09:32:00 +0000
@@ -85,7 +85,7 @@
         self.count         = params.count
         self.approximation = params.approximation
         self.target_action_id = params.target_action_id or False
-
+        self.unique_id = params.unique_id or False
         if (self.ids or self.id) and self.count == 0:
             if self.ids and len(self.ids) < self.limit:
                 self.count = len(self.ids)
 
=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
--- addons/openerp/widgets/templates/sidebar.mako	2017-07-27 12:07:44 +0000
+++ addons/openerp/widgets/templates/sidebar.mako	2018-10-29 09:32:00 +0000
@@ -72,6 +72,8 @@
         <form id="attachment-box" action="/openerp/attachment/save" method="post"
               enctype="multipart/form-data">
             <label for="sidebar_attachments_datas">${_("File")}:</label>
+            <input type="hidden" name="model" value="${model}" />
+            <input type="hidden" name="model_id" value="${id}" />
             <input type="file" id="sidebar_attachments_datas" class="binary"
                    name="datas" kind="binary" size="5"
                    max-size="${max_attachment_size}"/>
 
=== modified file 'addons/openerp/widgets/templates/viewform.mako'
--- addons/openerp/widgets/templates/viewform.mako	2017-06-01 13:48:36 +0000
+++ addons/openerp/widgets/templates/viewform.mako	2018-10-29 09:32:00 +0000
@@ -31,6 +31,7 @@
                                 else:
                                     clear_filters = "reload_graph(true);"
                             %>
+                             <button title="${_('Cancel query')}" onclick="kill_search_filter(''); return false;" class="oe_form_button_search" style="display: none;" id="kill_search">${_('Cancel query')}</button>
                              <button title="${_('Clear all.')}" id="clear_all_filters"
                              class="oe_form_button_clear"
                              onclick="${clear_filters} return false;"
 
=== modified file 'doc/openerp-web-win.cfg'
--- doc/openerp-web-win.cfg	2018-04-25 11:58:27 +0000
+++ doc/openerp-web-win.cfg	2018-10-29 09:32:00 +0000
@@ -13,6 +13,7 @@
 
 tools.sessions.on = True
 tools.sessions.persistent = False
+tools.sessions.locking = 'explicit'
 
 # Simple code profiling
 server.profile_on = False
 
=== modified file 'doc/openerp-web.cfg'
--- doc/openerp-web.cfg	2018-04-25 09:45:33 +0000
+++ doc/openerp-web.cfg	2018-10-29 09:32:00 +0000
@@ -13,6 +13,7 @@
 
 tools.sessions.on = True
 tools.sessions.persistent = False
+tools.sessions.locking = 'explicit'
 
 # Simple code profiling
 server.profile_on = False