openerp-community-reviewer team mailing list archive

["Guewen Baconnier @ Camptocamp" <guewen.baconnier@xxxxxxxxxxxxxx>]

Guewen Baconnier @ Camptocamp has proposed merging lp:~camptocamp/web-addons/7.0-web_translate_dialog-no-readonly-gbr into lp:web-addons.

Commit message:
Do not display readonly translatable fields in the translate dialog

Requested reviews:
  Web-Addons Core Editors (webaddons-core-editors)
Related bugs:
  Bug #1335045 in Web addons for OpenERP: "web_translate_dialog: readonly fields are displayed and can be edited in the dialog"
  https://bugs.launchpad.net/web-addons/+bug/1335045

For more details, see:
https://code.launchpad.net/~camptocamp/web-addons/7.0-web_translate_dialog-no-readonly-gbr/+merge/224780

Fix lp:1335045
-- 
https://code.launchpad.net/~camptocamp/web-addons/7.0-web_translate_dialog-no-readonly-gbr/+merge/224780
Your team Web-Addons Core Editors is requested to review the proposed merge of lp:~camptocamp/web-addons/7.0-web_translate_dialog-no-readonly-gbr into lp:web-addons.

=== modified file 'web_translate_dialog/static/src/js/web_translate_dialog.js'
--- web_translate_dialog/static/src/js/web_translate_dialog.js	2014-04-02 08:56:31 +0000
+++ web_translate_dialog/static/src/js/web_translate_dialog.js	2014-06-27 10:00:18 +0000
@@ -43,7 +43,10 @@
             this.view_type = parent.fields_view.type || '';
             this.$view_form = null;
             this.$sidebar_form = null;
-            this.translatable_fields_keys = _.map(this.view.translatable_fields || [], function(i) { return i.name;});
+            this.translatable_fields = _.filter(this.view.translatable_fields || [],
+                                                this.filter_translatable_fields);
+            this.translatable_fields_keys = _.map(this.translatable_fields,
+                                                  function(i) { return i.name;});
             this.languages = null;
             this.languages_loaded = $.Deferred();
             (new instance.web.DataSetSearch(this,
@@ -53,6 +56,9 @@
                 .read_slice(['code', 'name'], { sort: 'id' })
                 .then(this.on_languages_loaded);
         },
+        filter_translatable_fields: function(field) {
+            return !field.field.readonly;
+        },
         on_languages_loaded: function(langs) {
             this.languages = langs;
             this.languages_loaded.resolve();

=== modified file 'web_translate_dialog/static/src/xml/base.xml'
--- web_translate_dialog/static/src/xml/base.xml	2014-02-25 14:29:42 +0000
+++ web_translate_dialog/static/src/xml/base.xml	2014-06-27 10:00:18 +0000
@@ -10,7 +10,7 @@
                 <div class="separator horizontal"><t t-esc="name"/></div>
             </th>
         </tr>
-        <tr t-foreach="widget.view.translatable_fields" t-as="field" t-att-data-field="field.name">
+        <tr t-foreach="widget.translatable_fields" t-as="field" t-att-data-field="field.name">
             <td class="oe_form_frame_cell" width="1%" nowrap="nowrap">
                 <label class="oe_label"><t t-esc="field.string"/>:</label>
             </td>