Merge lp:~jfb-tempo-consulting/unifield-web/US-3935 into lp:unifield-web/uf7

[jftempo]

Unmerged revisions

4895. By jftempo on 2018-02-09

Icon

4894. By jftempo on 2018-02-08

Form view: humane_size

4893. By jftempo on 2018-02-07

Icon

4892. By jftempo on 2018-02-02

US-4124: Sync monitor auto-refresh: do not refresh all the page but only the list

=== modified file 'addons/openerp/controllers/templates/form.mako'
--- addons/openerp/controllers/templates/form.mako	2017-10-27 12:14:43 +0000
+++ addons/openerp/controllers/templates/form.mako	2018-02-13 14:39:48 +0000
@@ -25,15 +25,6 @@
             /*
             % endif
             */
-            /*
-            % if auto_refresh :
-            */
-            setTimeout(function() {
-                location.reload();
-            }, ${auto_refresh}*1000);
-            /*
-            % endif
-            */
             setTimeout(function() {
                 jQuery('[autofocus="autofocus"]').focus();
             }, 10);

=== added file 'addons/openerp/static/images/cloud.png'
Binary files addons/openerp/static/images/cloud.png	1970-01-01 00:00:00 +0000 and addons/openerp/static/images/cloud.png	2018-02-13 14:39:48 +0000 differ
=== added file 'addons/openerp/static/images/db_dump.png'
Binary files addons/openerp/static/images/db_dump.png	1970-01-01 00:00:00 +0000 and addons/openerp/static/images/db_dump.png	2018-02-13 14:39:48 +0000 differ
=== added file 'addons/openerp/static/images/monitor.png'
Binary files addons/openerp/static/images/monitor.png	1970-01-01 00:00:00 +0000 and addons/openerp/static/images/monitor.png	2018-02-13 14:39:48 +0000 differ
=== modified file 'addons/openerp/static/javascript/openerp/openerp.base.js'
--- addons/openerp/static/javascript/openerp/openerp.base.js	2017-11-28 15:35:57 +0000
+++ addons/openerp/static/javascript/openerp/openerp.base.js	2018-02-13 14:39:48 +0000
@@ -431,3 +431,5 @@
 
     }
 });
+
+var global_list_refresh;

=== modified file 'addons/openerp/widgets/form/_form.py'
--- addons/openerp/widgets/form/_form.py	2017-10-20 09:24:34 +0000
+++ addons/openerp/widgets/form/_form.py	2018-02-13 14:39:48 +0000
@@ -30,7 +30,7 @@
 import cherrypy
 import simplejson
 from openerp import validators
-from openerp.utils import rpc, icons, common, TinyDict, node_attributes, get_node_xpath, expr_eval
+from openerp.utils import rpc, icons, common, TinyDict, node_attributes, get_node_xpath, expr_eval, get_size
 from openerp.widgets import TinyWidget, TinyInputWidget, InputWidgetLabel, ConcurrencyInfo, get_widget, register_widget
 
 from _binary import Image
@@ -367,6 +367,13 @@
 register_widget(Char, ["char"])
 
 
+class HumanSize(Char):
+
+    def set_value(self, value):
+        self.default = get_size(value or 0.0) 
+register_widget(HumanSize, ["human_size"])
+
+
 class Email(TinyInputWidget):
     template = "/openerp/widgets/form/templates/email.mako"
 

=== modified file 'addons/openerp/widgets/screen.py'
--- addons/openerp/widgets/screen.py	2017-10-12 09:36:10 +0000
+++ addons/openerp/widgets/screen.py	2018-02-13 14:39:48 +0000
@@ -33,7 +33,7 @@
 
     params = ['model', 'state', 'id', 'ids', 'view_id', 'view_ids', 'view_mode', 'view_type', 'domain',
               'context', 'limit', 'offset', 'count', 'approximation',
-              'group_by_ctx', 'action_id', 'target_action_id']
+              'group_by_ctx', 'action_id', 'target_action_id', 'auto_refresh']
 
     member_widgets = ['widget']
 
@@ -43,7 +43,7 @@
         params = params or cherrypy.request.terp_params
         prefix = prefix or (params.prefix or '')
         super(Screen, self).__init__(prefix=prefix, name=name)
-
+        self.auto_refresh  = params.auto_refresh or ''
         self.model         = params.model
         self.state         = params.state or None
         self.id            = params.id or False

=== modified file 'addons/openerp/widgets/templates/listgrid/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid/listgrid.mako	2017-12-01 14:40:07 +0000
+++ addons/openerp/widgets/templates/listgrid/listgrid.mako	2018-02-13 14:39:48 +0000
@@ -7,6 +7,20 @@
     if o2m:
         object = "new One2Many('%s')" % name
 %>
+<script type="text/javascript">
+var auto_field = $('#_terp_auto_refresh');
+var model = $('#_terp_model').val();
+if (auto_field && auto_field.val()){
+    if (global_list_refresh) {
+        clearTimeout(global_list_refresh);
+    }
+    global_list_refresh = setTimeout(function(model) {
+       if (model == $('#_terp_model').val()) {
+           new ListView('_terp_list').reload();
+       }
+    }, 1000*auto_field.val(), model);
+}
+</script>
 <%def name="make_editors(data=None)">
     % if editable and editors:
         <tr class="grid-row editors" record="${(data and data['id']) or -1}">

=== modified file 'addons/openerp/widgets/templates/screen.mako'
--- addons/openerp/widgets/templates/screen.mako	2017-04-19 14:36:32 +0000
+++ addons/openerp/widgets/templates/screen.mako	2018-02-13 14:39:48 +0000
@@ -1,3 +1,4 @@
+<input type="hidden" id="${name}_terp_auto_refresh" name="${name}_terp_auto_refresh" value="${auto_refresh}"/>
 <input type="hidden" id="${name}_terp_string" name="${name}_terp_string" value="${string}"/>
 <input type="hidden" id="${name}_terp_model" name="${name}_terp_model" value="${model}"/>
 <input type="hidden" id="${name}_terp_state" name="${name}_terp_state" value="${state}"/>