Merge lp:~unifield-team/unifield-web/us-1026 into lp:unifield-web

[Mallory MARCOT]

Unmerged revisions

4813. By Quentin THEURET @Amaris on 2016-09-09

US-1026 [IMP] Make pager works well even if the list is ordered

4812. By Quentin THEURET @Amaris on 2016-09-09

US-1026 [IMP] Display the good number of lines in pager and go the whole lines

4811. By Quentin THEURET @Amaris on 2016-09-08

US-1026 [FIX] Disallow change limit of pager in o2m edition

4810. By Quentin THEURET @Amaris on 2016-09-08

US-1026 [FIX] Don't display 'Save & Next' button if we are in a new record

4809. By Quentin THEURET @Amaris on 2016-09-08

US-1026 [FIX] Compute prefix

4808. By Quentin THEURET @Amaris on 2016-09-08

US-1026 [IMP] Add a pager on O2M form view

4807. By Quentin THEURET @Amaris on 2016-09-08

US-1026 [IMP] Add a button 'Save & Next' on the O2many form view

=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2017-02-06 11:21:15 +0000
+++ addons/openerp/controllers/form.py	2017-03-24 16:09:47 +0000
@@ -5,7 +5,7 @@
 #  $Id$
 #
 #  Developed by OpenERP (http://openerp.com) and Axelor (http://axelor.com).
-#
+#ViewForm
 #  The OpenERP web client is distributed under the "OpenERP Public License".
 #  It's based on Mozilla Public License Version (MPL) 1.1 with following 
 #  restrictions:

=== modified file 'addons/openerp/controllers/openo2m.py'
--- addons/openerp/controllers/openo2m.py	2017-01-02 14:59:00 +0000
+++ addons/openerp/controllers/openo2m.py	2017-03-24 16:09:47 +0000
@@ -37,6 +37,7 @@
     def create_form(self, params, tg_errors=None):
 
         params.id = params.o2m_id
+        params.o2m_ids = params.o2m_ids
         params.model = params.o2m_model
         params.view_mode = ['form', 'tree']
         params.view_type = 'form'
@@ -85,6 +86,7 @@
                                 tw.form.Hidden(name='_terp_parent_context', default=ustr(params.parent_context)),
                                 tw.form.Hidden(name='_terp_o2m', default=params.o2m),
                                 tw.form.Hidden(name='_terp_o2m_id', default=params.id or None),
+                                tw.form.Hidden(name='_terp_o2m_ids', default=params.o2m_ids or []),
                                 tw.form.Hidden(name='_terp_o2m_model', default=params.o2m_model),
                                 tw.form.Hidden(name='_terp_o2m_context', default=ustr(params.o2m_context or {})),
                                 tw.form.Hidden(name=params.prefix + '/__id', default=params.id or None)] + hiddens
@@ -96,13 +98,17 @@
 
     @expose(template="/openerp/controllers/templates/openo2m.mako")
     def create(self, params, tg_errors=None):
-
+        pager = {}
         if tg_errors:
             form = cherrypy.request.terp_form
         else:
             form = self.create_form(params, tg_errors)
+            params.o2m_ids = self.get_o2m_ids(params.parent_model, params.parent_id, params.o2m, params.o2m_model, order=params.view_params[params.o2m].    sort_order)
+            pager = tw.pager.Pager(id=params.o2m_id, ids=params.o2m_ids, offset=0,
+                                   limit=-1, count=len(params.o2m_ids), view_type='form',
+                                   pager_options=[])
 
-        return dict(form=form, params=params)
+        return dict(form=form, params=params, pager=pager)
 
     @expose()
     @validate(form=get_validation_schema)
@@ -139,8 +145,11 @@
         if new_ids and params.source:
             current.id = new_ids[-1]
             params.o2m_id = current.id
-        elif not params.button:
+            params.o2m_ids = all_ids
+        elif not params.button and not params.next_id:
             params.o2m_id = False
+        elif params.next_id:
+            params.o2m_id = params.next_id
 
         # perform button action
         if params.button:
@@ -164,6 +173,11 @@
     @expose()
     def edit(self, **kw):
         params, data = TinyDict.split(kw)
+
+        if params.next_id:
+            params.o2m_id = params.next_id
+            params.next_id = None
+
         return self.create(params)
     
     @expose('json', methods=('POST',))
@@ -179,4 +193,26 @@
             
         return dict(error=error)
 
+    def get_o2m_ids(self, parent_model, parent_id, fld_name, fld_model, domain=[], order=False):
+        fld_ids = rpc.RPCProxy('ir.model.fields').search([
+            ('model', '=', parent_model),
+            ('name', '=', fld_name),
+            ('ttype', '=', 'one2many'),
+        ])
+        if not fld_ids:
+            return []
+
+        rel_fld = rpc.RPCProxy('ir.model.fields').read(fld_ids, ['relation_field'])[0]['relation_field']
+
+        domain.append((rel_fld, '=', int(parent_id)))
+        if order:
+            order = '%s,id' % order
+        
+        return rpc.RPCProxy(fld_model).search(domain, order=order)
+
+    @expose('json', methods=('POST',))
+    def get_ids(self, parent_model, parent_id, fld_name, fld_model, domain=[], order=False):
+        return  dict(o2m_ids=self.get_o2m_ids(parent_model, parent_id, fld_name, fld_model, domain=domain, order=order))
+
+
 # vim: ts=4 sts=4 sw=4 si et

=== modified file 'addons/openerp/controllers/templates/openo2m.mako'
--- addons/openerp/controllers/templates/openo2m.mako	2017-01-02 14:59:00 +0000
+++ addons/openerp/controllers/templates/openo2m.mako	2017-03-24 16:09:47 +0000
@@ -8,6 +8,10 @@
         function do_select(id, src) {
             viewRecord(id, src);
         }
+
+        jQuery(document).ready(function() {
+            validateForm();
+        });
     </script>
 </%def>
 
@@ -33,6 +37,11 @@
                                 <td class="save_close">
                                     <button onclick="submit_form('save_and_close'); return false;" style="height: 20px;" class="button-a">${_("Save & Close")}</button>
                                 </td>
+                                % if params.o2m_id in params.o2m_ids and params.o2m_id != params.o2m_ids[-1]:
+                                <td class="save_close">
+                                    <button onclick="submit_form('save_and_next'); return false;" style="height: 20px;" class="button-a">${_("Save & Next")}</button>
+                                </td>
+                                % endif
                                 % if not params.hide_new_button:
                                 <td class="save_close">
                                     <button onclick="submit_form('save'); return false;" style="height: 20px;" class="button-a">${_("Save & New")}</button>
@@ -43,6 +52,9 @@
                             	<button class="button-a" style="height: 20px;" onclick="jQuery.o2m('close'); return false;">${_("Cancel")}</button>
                             </td>
                             <td width="100%">
+                                % if pager:
+                                    ${pager.display()}
+                                % endif
                             </td>
                         </tr>
                     </table>

=== modified file 'addons/openerp/static/javascript/form.js'
--- addons/openerp/static/javascript/form.js	2017-02-10 08:28:16 +0000
+++ addons/openerp/static/javascript/form.js	2017-03-24 16:09:47 +0000
@@ -318,6 +318,46 @@
         action = 'save';
         args['_terp_close'] = 1;
     }
+
+    if (document.getElementById('_terp_o2m_id') && (action == 'save_and_next' || action == 'next' || action == 'last' || action == 'previous' || action == 'first')) {
+        args['_terp_return_edit'] = 1;
+
+        var prefix = '';
+        if (this.name.split('/').length > 0) {
+            prefix = this.name.split('/')[0] + '/';
+        } else if (this.name != '_terp_list') {
+            prefix = this.name + '/';
+        }
+
+        terp_id = document.getElementById(prefix + '_terp_id').value;
+        terp_ids = document.getElementById('_terp_o2m_ids').value.replace("[", "").replace("]", "").replace(/\s+/g, '').split(",");
+
+        if (terp_ids.length != 0) {
+            switch(action) {
+                case 'save_and_next':
+                case 'next':
+                    args['_terp_next_id'] = terp_ids[terp_ids.indexOf(terp_id) + 1];
+                    break;
+                case 'last':
+                    args['_terp_next_id'] = terp_ids[terp_ids.length - 1];
+                    break;
+                case 'previous':
+                    args['_terp_next_id'] = terp_ids[terp_ids.indexOf(terp_id) - 1];
+                    break;
+                case 'first':
+                    args['_terp_next_id'] = terp_ids[0];
+                    break;
+            }
+        }
+
+        if (action == 'save_and_next') {
+            action = 'save';
+        } else {
+            action = 'edit';
+            validate_action();
+        }
+    }
+
     get_sidebar_status(args);
     action = get_form_action(action, args);
 
@@ -336,6 +376,7 @@
     $form[0].setAttribute('action', action);
     previous_target = $form.attr("target");
     $form.attr("target", target);
+
     $form.submit();
     $form.attr("target", previous_target);
 }
@@ -893,7 +934,7 @@
         '_terp_prefix': prefix.join('/'),
         '_terp_active_id': openobject.dom.get(prefix.concat('_terp_id').join('/')).value,
         '_terp_active_ids': openobject.dom.get(prefix.concat('_terp_ids').join('/')).value,
-        '_terp_search_domain': '[]'
+        '_terp_search_domain': '[]',
     });
     if (options.from_search_mode) {
         params['_terp_search_mode'] = 'true';

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2017-02-08 15:03:00 +0000
+++ addons/openerp/static/javascript/listgrid.js	2017-03-24 16:09:47 +0000
@@ -284,6 +284,8 @@
 
     sort_by_order: function(column, field) {
         var $img = jQuery(field).find('img');
+        var terp_sort_order = openobject.dom.get(this.name + '/_terp_sort_order');
+
         if($img.length) {
             if ($img.attr('id') == 'asc') this.sort_order = 'desc';
             else this.sort_order = 'asc';
@@ -291,6 +293,8 @@
         else this.sort_order = 'asc';
 
         this.sort_key = column;
+        terp_sort_order.value = this.sort_key + ' ' + this.sort_order;
+
         if(this.ids.length) {
             this.reload();
         }

=== modified file 'addons/openerp/static/javascript/o2m.js'
--- addons/openerp/static/javascript/o2m.js	2017-01-02 14:59:00 +0000
+++ addons/openerp/static/javascript/o2m.js	2017-03-24 16:09:47 +0000
@@ -29,6 +29,7 @@
 
     this.model = openobject.dom.get(name + '/_terp_model').value;
     this.mode = openobject.dom.get(name + '/_terp_view_type').value;
+    this.sort_order = openobject.dom.get(name + '/_terp_sort_order').value;
 
     if (openobject.dom.get(name + '/_terp_default_get_ctx'))
         this.default_get_ctx = openobject.dom.get(name + '/_terp_default_get_ctx').value;
@@ -153,6 +154,21 @@
             params['_terp_view_params/' + prefix + '/_terp_view_mode'] = openobject.dom.get(prefix + '/_terp_view_mode').value;
             params['_terp_view_params/' + prefix + '/_terp_context'] = openobject.dom.get(prefix + '/_terp_context').value || {};
             params['_terp_view_params/' + prefix + '/_terp_view_type'] = 'form';
+            params['_terp_view_params/' + prefix + '/_terp_sort_order'] = this.sort_order;
+
+            var req = openobject.http.postJSON('/openerp/openo2m/get_ids', {
+                'parent_model': this.parent_model,
+                'parent_id': this.parent_id,
+                'fld_name': prefix,
+                'fld_model': openobject.dom.get(prefix + '/_terp_model').value,
+                'order': this.sort_order,
+             });
+
+	        req.addCallback(function(obj) {
+                if (obj.o2m_ids) {
+                    params['_terp_view_params/' + prefix + '/_terp_ids'] = obj.o2m_ids;
+                }
+    	    });
         }
 
         jQuery.extend(params, {
@@ -166,6 +182,20 @@
 
         if(id != null) {
             params['_terp_o2m_id'] = id;
+            params['_terp_o2m_ids'] = openobject.dom.get(prefix + '/_terp_ids').value;
+            var req = openobject.http.postJSON('/openerp/openo2m/get_ids', {
+                'parent_model': this.parent_model,
+                'parent_id': this.parent_id,
+                'fld_name': prefix,
+                'fld_model': openobject.dom.get(prefix + '/_terp_model').value,
+                'order': this.sort_order,
+             });
+
+	        req.addCallback(function(obj) {
+                if (obj.o2m_ids) {
+                    params['_terp_o2m_ids'] = obj.o2m_ids;
+                }
+    	    });
         }
         if (id && id != 'False' && !this.default_get_ctx) {
             jQuery.o2m(params);

=== modified file 'addons/openerp/widgets/pager.py'
--- addons/openerp/widgets/pager.py	2016-04-15 07:26:53 +0000
+++ addons/openerp/widgets/pager.py	2017-03-24 16:09:47 +0000
@@ -32,7 +32,7 @@
     UNLIMITED = -1
 
     def __init__(self, id=False, ids=[], offset=0, limit=50, count=0,
-            view_type='tree', approximation=False):
+            view_type='tree', approximation=False, pager_options=[20, 50, 100, 500]):
         super(Pager, self).__init__()
 
         self.id = id
@@ -43,7 +43,7 @@
         self.limit = limit or 50
         self.approximation = approximation
         self.count = count or 0
-        self.pager_options = [20, 50, 100, 500]
+        self.pager_options = pager_options
 
         if self.limit != Pager.UNLIMITED and len(self.ids) > self.limit:
             # if self.ids isn't clamped, it is entirely un-paginated.

=== modified file 'addons/openerp/widgets/templates/pager.mako'
--- addons/openerp/widgets/templates/pager.mako	2016-06-08 12:32:32 +0000
+++ addons/openerp/widgets/templates/pager.mako	2017-03-24 16:09:47 +0000
@@ -15,9 +15,15 @@
         % if prev:
         </a>
         % endif
+        % if pager_options:
         <span class="pager_info" onclick="jQuery('[id=_${name+str(pager_id)}_link_span]').hide(); jQuery('[id=_${name+str(pager_id)}_limit_span]').show();">
             ${page_info} ${_('of')} ${approximation and '~' or ''}${count}
         </span>
+        % else:
+        <span class="pager_info" style="cursor: not-allowed">
+            ${page_info} ${_('of')} ${approximation and '~' or ''}${count}
+        </span>
+        % endif
         % if next:
         <a href="#next" action="next" relation="${name}" onclick="validate_action(this, pager_action); return false;">
         % endif

=== modified file 'addons/openerp/widgets/templates/screen.mako'
--- addons/openerp/widgets/templates/screen.mako	2016-09-08 12:22:46 +0000
+++ addons/openerp/widgets/templates/screen.mako	2017-03-24 16:09:47 +0000
@@ -18,6 +18,7 @@
 <input type="hidden" id="${name}_terp_approximation" name="${name}_terp_approximation" value="${approximation}"/>
 <input type="hidden" id="${name}_terp_group_by_ctx" name="${name}_terp_group_by_ctx" value="${group_by_ctx}"/>
 <input type="hidden" id="${name}_terp_filters_context" name="${name}_terp_filters_context" value=""/>
+<input type="hidden" id="${name}_terp_sort_order" name="${name}_terp_sort_order" value="" />
 % if action_id:
 <input type="hidden" id="${name}_terp_action_id" name="${name}_terp_action_id" value="${action_id}">
 % endif