Remove unnecessary preference keys from RPC context
The locale key is only used by the client to properly format in the locale. And the '.rec_name' keys are used by preferences dialog. Closes #13068
This commit is contained in:
1 parent
cd345c2399
commit
6bae798031
2 files changed
+9
-2
No files matched your search
@@ -112,6 +112,8 @@
|
||||
this.reset_context();
|
||||
var prm = Sao.rpc(args, this);
|
||||
return prm.then(context => {
|
||||
context = Object.fromEntries(Object.entries(context).filter(
|
||||
([k, v]) => (k != 'locale') && !k.endsWith('.rec_name')));
|
||||
jQuery.extend(this.context, context);
|
||||
this.store_context();
|
||||
});
|
||||
|
||||
@@ -1293,10 +1293,15 @@ def RPCExecute(*args, **kwargs):
|
||||
|
||||
|
||||
def RPCContextReload(callback=None):
|
||||
def clean(context):
|
||||
return {
|
||||
k: v for k, v in context.items()
|
||||
if k != 'locale' and not k.endswith('.rec_name')}
|
||||
|
||||
def update(context):
|
||||
rpc.context_reset()
|
||||
try:
|
||||
rpc.CONTEXT.update(context())
|
||||
rpc.CONTEXT.update(clean(context()))
|
||||
except RPCException:
|
||||
pass
|
||||
if callback:
|
||||
@@ -1306,7 +1311,7 @@ def RPCContextReload(callback=None):
|
||||
callback=update if callback else None)
|
||||
if not callback:
|
||||
rpc.context_reset()
|
||||
rpc.CONTEXT.update(context)
|
||||
rpc.CONTEXT.update(clean(context))
|
||||
|
||||
|
||||
class Tooltips(object):
|
||||
|
||||
Reference in new issue
Block a user