Merge lp:~openerp-dev/openobject-client-web/listgrid-validation into lp:openobject-client-web/trunk

[Vaibhav Darji]

implemented validation for inline editable list and o2m.

[lp:~openerp-dev/openobject-client-web/listgrid-validation]

3216. By Vaibhav Darji on 2010-09-07

[FIX] Clean up.

3217. By Xavier (Open ERP) on 2010-09-11

[FIX] discovery of @record-bearing row

[Xavier (Open ERP) (xmo-deactivatedaccount)]

* Should validate all fields at once, currently only validates one field at a time

* If validation failed, should set focus on first failed field so user doesn't have to re-select it by mouse in order to fix

* Fields fixed don't get back to "blue" color after next validation:
    - Create new analytic journal item
    - Put gibberish in Analytic Account field
    - Try to save, "General Account" field becomes red
    - Pick value for general account
    - Try to save again, Analytic Journal is now red but General Account still is.
    - You can fill all incorrect fields one after the other, they never get back to normal (blue)

* In listgridValidation, there are many paths which result in exactly the same behavior. Probably this could be improved by fixing some code (for instance I think `record_id == 'undefined' || typeof record_id == 'undefined'` could be replaced buy `record_id == undefined` no?) merging tests and things like that to reduce the total number of tests (and the complexity of the code).

* I am not sure about storing all those informations (list changed status and current id) as global variables. Probably we could add it a an attribute on the list itself for storing the current id.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

review: Needs Fixing

[lp:~openerp-dev/openobject-client-web/listgrid-validation]

3218. By Vaibhav Darji on 2010-09-11

[FIX] Fixed validation criteria.

3219. By Vaibhav Darji on 2010-09-13

[IMP] Imporved validation.

3220. By Vaibhav Darji on 2010-09-13

[FIX] Fix Validation for require fields.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Looks good to me, if noz is ok with the branch you can merge it.

review: Approve

[lp:~openerp-dev/openobject-client-web/listgrid-validation]

3221. By Xavier (Open ERP) on 2010-09-13

[FIX] small style fixes (missing semicolons, undefined test, ...)

[Navrang Oza (noz-tiny)]

review: Approve

=== modified file 'addons/openerp/static/javascript/listgrid.js'
--- addons/openerp/static/javascript/listgrid.js	2010-09-11 08:05:20 +0000
+++ addons/openerp/static/javascript/listgrid.js	2010-09-13 07:22:46 +0000
@@ -28,7 +28,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 var ListView = function(name) {
-    var elem = jQuery('#'+name).get();
+    var elem = jQuery('[id="'+name+'"]').get(0);
 
     if (elem.__listview) {
         return elem.__listview;
@@ -62,7 +62,7 @@
         this.m2m = jQuery('[id*="'+ name + '_set' + '"]');
 		this.default_get_ctx = jQuery('[id*="' + prefix + '_terp_default_get_ctx' + '"]').get() ? jQuery('[id*="' + prefix + '_terp_default_get_ctx' + '"]').val() : null;
         // save the reference
-        jQuery('[id*="'+name+'"]:first').__listview = this;
+        jQuery('[id="'+name+'"]').get(0).__listview = this;
 
         this.sort_order = null;
         this.sort_key = null;
@@ -535,7 +535,7 @@
         this.reload(edit_inline, null, default_get_ctx);
     },
 
-    save: function(id) {
+    save: function(id, prev_id) {
 
         if (openobject.http.AJAX_COUNT > 0) {
             return callLater(1, bind(this.save, this), id);
@@ -568,34 +568,48 @@
         args['_terp_parent/model'] = openobject.dom.get(parent_field + '_terp_model').value;
         args['_terp_parent/context'] = openobject.dom.get(parent_field + '_terp_context').value;
         args['_terp_source'] = this.name;
-
+        
+        
         var self = this;
         var req = openobject.http.postJSON('/openerp/listgrid/save', args);
-
+        
+        var $current_record = jQuery('table[id="'+this.name+'_grid'+'"]').find('tr.grid-row[record="'+id+'"]');
         req.addCallback(function(obj) {
             if (obj.error) {
-                if (obj.error_field) {
-                    var fld = openobject.dom.get('_terp_listfields/' + obj.error_field);
-                    if (fld && getNodeAttribute(fld, 'kind') == 'many2one') {
-                        fld = openobject.dom.get(fld.id + '_text');
-                    }
-                    if (!obj.error_field.value){
-						jQuery(fld).addClass('errorfield');
-            			result = false;
-        			} else if(jQuery(fld).hasClass('errorfield')) {
-            			jQuery(fld).removeClass('errorfield');
-        			}
-					if (!result){
-						alert(obj.error);
-						fld.focus();
-                        fld.select();
-					}
+                var $focus_field;
+                for (var k in data) {
+                    
+                    var $req_field = $current_record.find('td [id="'+'_terp_listfields/'+k+'"].requiredfield');
+                    if(!$req_field.length)
+                        continue;
+                    if($req_field.attr('kind') == 'many2one') {
+                        $req_field = $current_record.find('td [id="'+'_terp_listfields/'+k+'_text'+'"]');
+                    }
+                    
+                    var req_value = $req_field.val();
+                    if(req_value == '') {
+                        $req_field.addClass('errorfield');
+                        if(!$focus_field) {
+                            $focus_field = $req_field;
+                        }
+                    } else if($req_field.hasClass('errorfield')) {
+                        $req_field.removeClass('errorfield');
+                    }
+                    
+                }
+                if($focus_field) {
+                    $focus_field.focus();
                 }
             } else {
                 openobject.dom.get(prefix + '_terp_id').value = obj.id;
                 openobject.dom.get(prefix + '_terp_ids').value = obj.ids;
-
-                self.reload(id > 0 ? null : -1, prefix ? 1 : 0);
+                
+                if(prev_id !== undefined) {
+                    self.reload(prev_id , prefix ? 1 : 0);
+                } else {
+                    self.reload(id > 0 ? null : -1, prefix ? 1 : 0);
+                }
+                    
             }
         });
     },
@@ -834,3 +848,37 @@
             _terp_view_mode : this.view_mode}),{width: 700, height: 500});
     }
 });
+
+function validateList(_list) {
+    var $list = jQuery('[id="' + _list + '"]').removeAttr('current_id');
+    var $check = jQuery('table.grid[id="'+_list+'_grid'+'"] tr.grid-row td:not(.selector)').find('input, select');
+    $check.change(function() {
+        $list.attr(
+            'current_id',
+            parseInt(jQuery(this).closest('tr.grid-row').attr('record'), 10) || -1);
+    });
+}
+
+function listgridValidation(_list, o2m, record_id) {
+    o2m = parseInt(o2m, 0);
+    var current_id = jQuery('[id="' + _list + '"]').attr('current_id');
+    // not(null | undefined)
+    if(current_id != null) {
+        if(confirm('This record has been modified \n Do you really want to save it?')) {
+            new ListView(_list).save(current_id, record_id);
+        }
+    } else{
+        if(o2m) {
+            var detail = jQuery('table.one2many[id$="' + _list + '"]').attr('detail');
+            if(record_id == undefined || record_id == -1) {
+                new One2Many(_list, detail).create();
+            } else {
+                new ListView(_list).edit(record_id);
+            }
+        } else if(record_id == -1) {
+            new ListView(_list).create();
+        } else {
+            new ListView(_list).edit(record_id);
+        }
+    }
+}

=== modified file 'addons/openerp/widgets/templates/listgrid.mako'
--- addons/openerp/widgets/templates/listgrid.mako	2010-09-10 05:57:57 +0000
+++ addons/openerp/widgets/templates/listgrid.mako	2010-09-13 07:22:46 +0000
@@ -122,7 +122,7 @@
                                             </button>
                                         % elif o2m:
                                             <button title="${_('Create new record.')}" id="${name}_btn_"
-                                                onclick="new One2Many('${name}', jQuery('table.one2many[id$=${name}]').attr('detail')).create(); return false;">
+                                                onclick="listgridValidation('${name}', '${o2m or 0}', -1); return false;">
                                                     ${_('new')}
                                             </button>
                                         % else:
@@ -130,23 +130,8 @@
                                                 <button id="${name}_new" title="${_('Create new record.')}">${_('new')}</button>
                                                 % if editors:
                                                     <script type="text/javascript">
-                                                        var is_list_changed = false;
-                                                        var current_id = -1;
-                                                        jQuery(document).ready(function() {
-                                                            var $check = jQuery("table.grid[id='${name}_grid'] tr.grid-row td:not(.selector)").find('input, select');
-                                                            $check.change(function() {
-                                                                is_list_changed = true;
-                                                                current_id = jQuery(this).closest('tr').attr('record') || -1;
-                                                            });
-                                                        });
                                                         jQuery('[id=${name}_new]').click(function() {
-                                                            if(is_list_changed) {
-                                                                if (confirm('This record has been modified \n Do you really want to save it?')) {
-                                                                    new ListView('${name}').save(current_id)
-                                                                }
-                                                            } else {
-                                                                new ListView('${name}').create();
-                                                            }
+                                                            listgridValidation('${name}', '${o2m or 0}', -1)
                                                             return false;
                                                         });
                                                     </script>
@@ -160,6 +145,13 @@
                                                 % endif
                                             % endif
                                         % endif
+                                        % if not m2m and not dashboard and editors:
+                                            <script type="text/javascript">
+                                                jQuery(document).ready(function() {
+                                                    validateList('${name}')
+                                                });
+                                            </script>
+                                        % endif
                                     </td>
                                 % endif
                                 <td class="pager-cell-button" style="display: none;">
@@ -326,6 +318,7 @@
                            jQuery('table[id=${name}_grid] tr.grid-row').each(function(index, row) {
                                jQuery(row).click(function(event) {
                                    if (!jQuery(event.target).is(':input, img, option, td.m2o_coplition')) {
+<<<<<<< TREE
                                        var record_id = jQuery(row).attr('record');
                                        if (record_id > 0) {
                                            new ListView('${name}').edit(record_id);
@@ -346,6 +339,10 @@
                                                new One2Many('${name}', jQuery('table.one2many[id$=${name}]').attr('detail')).create();
                                            }
                                        }
+=======
+                                       var record_id = parseInt(jQuery(row).attr('record'), 10) || -1;
+                                       listgridValidation('${name}','${o2m or 0}', record_id);
+>>>>>>> MERGE-SOURCE
                                    }
                                });
                            });