Merge lp:~openerp-dev/openobject-addons/7.0-opw-596732DashboardActionDomainEvaluation-msh into lp:openobject-addons/7.0

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of add to dashboard and evaluated domain, while adding dashboard we should add row domain as it is and should evaluate it when dashboard action is loaded otherwise dynamic domain value like context.today etc will not work, instead evaluated date is applied and dashboard will not give proper result.

Demo:- Open any tree view which has Filter based on date/relative_delta/today, filter your data using that date, say for example I have filter like ('date_action','<=', (context_today() + relativedelta(days=7)).strftime('%Y-%m-%d’)) so when I filter data with this filter and then add this view into dashboard then next day that view will give wrong result.
To test this issue I added a filter in search view of Opportuity something like,
<filter icon="terp-personal+" string="Last 7 Days' Opportunity" name="opportunity" domain="[('type','=','opportunity'), ('date_action','&lt;=', (context_today() + relativedelta(days=-7)).strftime('%%Y-%%m-%%d')) ]" help="Show only opportunity"/>

Reason: While Adding view into dashbaord, evaluated domain and context stored in the dashboard action, domain and context should be stored as it is and when action is loaded at that time action domain and context should be evaluated.

Solution: Added a domain as it is without evaluating it while Adding view into dashboard and evaluated that domain while dashboard actions are loading, added a toJSON method in instance.web.CompoundDomain which return JSON stringify domain(include method in dashboard.js itself instead of putting it into web module).

Thanks.

[Mohammed Shekha(Open ERP) (msh-openerp)]

review: Disapprove

Unmerged revisions

9974. By Mohammed Shekha(Open ERP) on 2014-04-11

[FIX]Re-fixed the issue of add to dashboard and evaluated domain, while adding dashboard we should add row domain as it is and should evaluate it when dashboard action is loaded otherwise dynamic domain value like context.today etc will not work, instead evaluated date is applied and dashboard will not give proper result.

=== modified file 'board/static/src/js/dashboard.js'
--- board/static/src/js/dashboard.js	2013-08-08 15:00:40 +0000
+++ board/static/src/js/dashboard.js	2014-04-11 07:10:21 +0000
@@ -176,13 +176,20 @@
             action = result,
             view_mode = action_attrs.view_mode;
 
-        // evaluate action_attrs context and domain
         action_attrs.context_string = action_attrs.context;
         action_attrs.context = instance.web.pyeval.eval(
             'context', action_attrs.context || {});
         action_attrs.domain_string = action_attrs.domain;
-        action_attrs.domain = instance.web.pyeval.eval(
+
+        // evaluate action_attrs context and domain
+        if(_.isString(action_attrs.domain)) {
+            action_attrs.domain = instance.web.pyeval.eval(
             'domain', action_attrs.domain || [], action_attrs.context);
+        } else {
+            var comp_domain = new instance.web.CompoundDomain().set_eval_context(action_attrs.context);
+            _.each(action_attrs.domain, comp_domain.add, comp_domain);
+            action_attrs.domain = comp_domain.eval();
+        }
         if (action_attrs.context['dashboard_merge_domains_contexts'] === false) {
             // TODO: replace this 6.1 workaround by attribute on <action/>
             action.context = action_attrs.context || {};
@@ -377,7 +384,9 @@
         }
         var data = getParent.build_search_data();
         var context = new instance.web.CompoundContext(getParent.dataset.get_context() || []);
-        var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
+        //used dataset.domain instead of dataset.get_domain, because model domain will be evaluated domain
+        //We need unevaluated domain of action as well as search build
+        var domain = new instance.web.CompoundDomain(getParent.dataset.domain || []);
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
 
@@ -393,13 +402,12 @@
         }
         // TODO: replace this 6.1 workaround by attribute on <action/>
         c.dashboard_merge_domains_contexts = false;
-        var d = instance.web.pyeval.eval('domain', domain);
 
         this.rpc('/board/add_to_dashboard', {
             menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
             context_to_save: c,
-            domain: d,
+            domain: domain.toJSON(),
             view_mode: view_parent.active_view,
             name: this.$el.find("input").val()
         }).done(function(r) {
@@ -430,4 +438,20 @@
     }
 });
 
+instance.web.CompoundDomain.include({
+    toJSON: function() {
+        var self = this;
+        var dd = [];
+        _.each(this.__domains, function(dom) {
+            if (dom instanceof instance.web.CompoundDomain) {
+                //No need to do recusrive call, if dom again have compoundDomain, pyeval.eval will manage it
+                dd.push(instance.web.pyeval.eval('domain', dom));
+            } else if (dom.length) {
+                dd.push(dom);
+            }
+        });
+        return JSON.stringify(dd);
+    },
+});
+
 };