NaNtic/sao-base
1
0
Fork 0
mirror of https://github.com/NaN-tic/sao-base.git synced 2023-12-14 03:13:01 +01:00
Code Issues Projects Releases Wiki Activity

Don't override action context by current context

Browse source 
issue4303
review22931002
This commit is contained in:
C?dric Krier 2016-04-02 15:36:35 +02:00
parent 2894e185c3
commit e55e33c9b1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/action.js
View file

@ -52,11 +52,11 @@
ctx = jQuery.extend(ctx, session.context);
var eval_ctx = jQuery.extend({}, ctx);
eval_ctx._user = session.user_id;
params.context = new Sao.PYSON.Decoder(eval_ctx).decode(
action.pyson_context || '{}');
params.context = jQuery.extend(
{}, context, new Sao.PYSON.Decoder(eval_ctx).decode(
action.pyson_context || '{}'));
ctx = jQuery.extend(ctx, params.context);
ctx = jQuery.extend(ctx, context);
params.context = jQuery.extend(params.context, context);
var domain_context = jQuery.extend({}, ctx);
domain_context.context = ctx;