From 40b16297754a292d4be62a959a66dffe2ff15a05 Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Thu, 1 Sep 2016 11:12:37 +0200 Subject: [PATCH] Add support for pyson_order on action window issue5844 review21251002 --- CHANGELOG | 1 + src/action.js | 18 +++++------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 395a1e5ca6..403587b5ae 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add support for pyson_order on action window * Make datetimepicker locale aware * Restore tab default order when no manual change * Add support for column sorting diff --git a/src/action.js b/src/action.js index 0900faf34d..ed4d809f64 100644 --- a/src/action.js +++ b/src/action.js @@ -61,19 +61,11 @@ var domain_context = jQuery.extend({}, ctx); domain_context.context = ctx; domain_context._user = session.user_id; - params.domain = new Sao.PYSON.Decoder(domain_context).decode( - action.pyson_domain); - - var search_context = jQuery.extend({}, ctx); - search_context.context = ctx; - search_context._user = session.user_id; - params.search_value = new Sao.PYSON.Decoder(search_context) - .decode(action.pyson_search_value || '[]'); - - var tab_domain_context = jQuery.extend({}, ctx); - tab_domain_context.context = ctx; - tab_domain_context._user = session.user_id; - var decoder = new Sao.PYSON.Decoder(tab_domain_context); + var decoder = new Sao.PYSON.Decoder(domain_context); + params.domain = decoder.decode(action.pyson_domain); + params.order = decoder.decode(action.pyson_order); + params.search_value = decoder.decode( + action.pyson_search_value || '[]'); params.tab_domain = []; action.domains.forEach(function(element, index) { params.tab_domain.push(