Mohammed Shekha(Open ERP) has proposed merging lp:~openerp-dev/openobject-client-web/6.0-bug-16824-msh1 into lp:openobject-client-web/6.0.
Requested reviews: OpenERP Core Team (openerp) For more details, see: https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-16824-msh1/+merge/78256 Hello, Fixed the issue of attrs on an element, Here attrs were like make an element readonly when one2many have some record, so attrs are depended on one2many field's value but it was not working. So changed the code accordingly. Thanks. -- https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-16824-msh1/+merge/78256 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-bug-16824-msh1.
=== modified file 'addons/openerp/controllers/form.py' === modified file 'addons/openerp/po/javascript/fr.po' --- addons/openerp/po/javascript/fr.po 2011-09-21 05:25:26 +0000 +++ addons/openerp/po/javascript/fr.po 2011-10-05 13:37:25 +0000 @@ -8,14 +8,24 @@ "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "POT-Creation-Date: 2011-03-18 11:53+0100\n" +<<<<<<< TREE "PO-Revision-Date: 2011-09-20 09:43+0000\n" "Last-Translator: Quentin THEURET <Unknown>\n" +======= +"PO-Revision-Date: 2011-08-24 19:57+0000\n" +"Last-Translator: lholivier <[email protected]>\n" +>>>>>>> MERGE-SOURCE "Language-Team: fr <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +<<<<<<< TREE "X-Launchpad-Export-Date: 2011-09-21 05:25+0000\n" "X-Generator: Launchpad (build 13996)\n" +======= +"X-Launchpad-Export-Date: 2011-08-25 05:14+0000\n" +"X-Generator: Launchpad (build 13727)\n" +>>>>>>> MERGE-SOURCE "Generated-By: Babel None\n" #: static/javascript/form.js:92 === modified file 'addons/openerp/static/javascript/form_state.js' --- addons/openerp/static/javascript/form_state.js 2011-08-19 05:44:37 +0000 +++ addons/openerp/static/javascript/form_state.js 2011-10-05 13:37:25 +0000 @@ -174,6 +174,19 @@ } } +function matchArray(val,eval_value){ + if (val.length != eval_value.length) { return false; } + var val = val.sort(), + eval_value = eval_value.sort(); + for (var i = 0; val[i]; i++) { + if (val[i] !== eval_value[i]) { + return false; + } + } + return true; + +} + function form_evalExpr(prefix, expr, ref_elem) { var stack = []; @@ -203,8 +216,21 @@ var elem_value; if(elem.is(':input')) { elem_value = elem.val(); +<<<<<<< TREE } else if(elem[0].nodeName == "TABLE"){ elem_value = $.trim($(elem).find("tr tbody:nth-child(2)").text()) +======= + } else if(elem[0].nodeName == "TABLE"){ + prefix = $(elem).attr('id') + elem_value = eval($(idSelector(prefix+"/_terp_ids")).val()) + res = matchArray(eval(val), elem_value) + if(res){ + val = elem_value = true + }else{ + val = true + elem_value = false + } +>>>>>>> MERGE-SOURCE } else { elem_value = elem.attr('value') || elem.text(); }
_______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
