Mohammed Shekha(Open ERP) has proposed merging
lp:~openerp-dev/openobject-client-web/6.0-opw-17386-msh into
lp:openobject-client-web/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-17386-msh/+merge/74582
Hello,
To generate the problem goto HR -> Holidays -> Leave Summary -> Press Clear
After Clearing still you'll get result of current user because of domain
[('employee.user_id':1)].
This was occuring due to Listgroup.py file in that we have not used deepcopy,
and we are assigning domain into self.domain, now if we change self.domain then
it will change domain also.
We are extending the self.domain with custom_filter_domain so that
custom_filter_domain also assigned to domain because we have not used deepcopy.
So changed the code with deepcopy.
Thanks.
--
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-opw-17386-msh/+merge/74582
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-client-web/6.0-opw-17386-msh.
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py 2011-06-10 10:10:19 +0000
+++ addons/openerp/controllers/form.py 2011-09-08 11:46:01 +0000
@@ -654,7 +654,7 @@
@expose(content_type='application/octet-stream')
def save_binary_data(self, _fname='file.dat', **kw):
params, data = TinyDict.split(kw)
-
+
cherrypy.response.headers['Content-Disposition'] = 'attachment; filename="%s"' % _fname
if params.datas:
@@ -666,6 +666,8 @@
proxy = rpc.RPCProxy(params.model)
res = proxy.read([params.id],[params.field], rpc.session.context)
return base64.decodestring(res[0][params.field])
+ elif params.filename:
+ return base64.decodestring(data[params.filename])
else:
return base64.decodestring(data[params.field])
=== modified file 'addons/openerp/static/javascript/binary.js'
--- addons/openerp/static/javascript/binary.js 2011-01-17 11:57:11 +0000
+++ addons/openerp/static/javascript/binary.js 2011-09-08 11:46:01 +0000
@@ -22,14 +22,14 @@
function save_binary_data(src, filename) {
var name = openobject.dom.get(src) ? openobject.dom.get(src).name : src;
-
+
var prefix = name.split('/');
name = prefix.pop();
prefix = prefix.join('/');
prefix = prefix ? prefix + '/' : '';
-
+
var fname = openobject.dom.get(prefix + filename) || openobject.dom.get(prefix + 'name');
-
+
fname = fname ? fname.value || fname.innerHTML : null;
var act = get_form_action('save_binary_data', undefined);
@@ -37,6 +37,7 @@
submit_form(openobject.http.getURL(act, {
_terp_field: name,
+ _terp_filename: filename,
_terp_model: openobject.dom.get(prefix + '_terp_model').value,
_terp_id: openobject.dom.get(prefix + '_terp_id').value
}), undefined, '_blank');
=== modified file 'addons/openerp/widgets/listgroup.py'
--- addons/openerp/widgets/listgroup.py 2011-07-04 06:50:24 +0000
+++ addons/openerp/widgets/listgroup.py 2011-09-08 11:46:01 +0000
@@ -20,7 +20,7 @@
###############################################################################
import random
from operator import itemgetter
-
+import copy
import cherrypy
from openerp.utils import rpc
@@ -128,7 +128,7 @@
def __init__(self, name, model, view, ids=[], domain=[], context={}, **kw):
self.context = context or {}
- self.domain = domain or []
+ self.domain = copy.deepcopy(domain) or []
self.group_by_no_leaf = self.context.get('group_by_no_leaf', 0)
self.selectable = kw.get('selectable', 0)
self.editable = kw.get('editable', False)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
