Merge lp:~vauxoo/openobject-client/6.1-widget-datetime-dev-julio into lp:openobject-client/6.1

[Julio Serna-http://www.vauxoo.com]

modified function _value_get to widget datetime

Unmerged revisions

2097. By Julio Serna-http://www.vauxoo.com on 2012-10-17

[FIX] modified function _value_get to widget datetime

=== modified file 'bin/widget_search/calendar.py'
--- bin/widget_search/calendar.py	2011-02-09 09:59:22 +0000
+++ bin/widget_search/calendar.py	2012-10-17 23:10:25 +0000
@@ -234,14 +234,21 @@
                         tz_offset=timezone, ignore_unparsable_time=False)
 
     def _value_get(self):
-        res = []
-        val = self._date_get(self.entry1.get_text())
-        if val:
-            res.append((self.name, '>=', val))
-        val = self._date_get(self.entry2.get_text())
-        if val:
-            res.append((self.name, '<=', val))
-        return {'domain':res}
+        val = {'domain': [], 'context':{}}
+        val1 = self._date_get(self.entry1.get_text())
+        val2 = self._date_get(self.entry2.get_text())
+        if self.attrs.get('context', False):
+            val['context'] = eval(self.attrs['context'], {'self': val1, 'self2': val2})
+        if not self.attrs.get('domain', False):
+            res = []
+            if val1:
+                res.append((self.name, '>=', val1))
+            if val2:
+                res.append((self.name, '<=', val2))
+            val['domain'] = res
+        else:
+            val['domain'] = eval(self.attrs['domain'], {'self': val1, 'self2': val2})
+        return val
 
     def _value_set(self, value):
         self.entry1.set_text(value)