changeset 2f4283ee25cf in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=2f4283ee25cf
description:
Backed out changeset 1748347abb2f
diffstat:
CHANGELOG | 2 --
tryton/common/common.py | 8 +++++---
tryton/gui/window/preference.py | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
diffs (38 lines):
diff -r 1748347abb2f -r 2f4283ee25cf CHANGELOG
--- a/CHANGELOG Tue May 19 18:57:53 2020 +0200
+++ b/CHANGELOG Tue May 19 19:32:33 2020 +0200
@@ -1,5 +1,3 @@
-* Use existing context for get_preferences
-
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Support link button on form
diff -r 1748347abb2f -r 2f4283ee25cf tryton/common/common.py
--- a/tryton/common/common.py Tue May 19 18:57:53 2020 +0200
+++ b/tryton/common/common.py Tue May 19 19:32:33 2020 +0200
@@ -1081,9 +1081,11 @@
pass
if callback:
callback()
- context = RPCExecute(
- 'model', 'res.user', 'get_preferences', True,
- callback=update if callback else None)
+ # Use RPCProgress to not send rpc.CONTEXT
+ context = RPCProgress(
+ 'execute',
+ ('model', 'res.user', 'get_preferences', True, {})).run(
+ True, update if callback else None)
if not callback:
rpc.context_reset()
rpc.CONTEXT.update(context)
diff -r 1748347abb2f -r 2f4283ee25cf tryton/gui/window/preference.py
--- a/tryton/gui/window/preference.py Tue May 19 18:57:53 2020 +0200
+++ b/tryton/gui/window/preference.py Tue May 19 19:32:33 2020 +0200
@@ -101,7 +101,6 @@
RPCExecute('model', 'res.user', 'set_preferences', vals)
except RPCException:
return
- rpc.context_reset()
self.parent.present()
self.destroy()
self.callback()
