forked from Techsystech/web
Fix sidebar & reenable multiple fields
parent
239dde91b6
commit
669e4dfab3
|
@ -8,26 +8,29 @@ class BaseModel(models.BaseModel):
|
|||
_inherit = 'base'
|
||||
|
||||
@api.multi
|
||||
def get_field_translations(self, field_name):
|
||||
def get_field_translations(self, field_names):
|
||||
"""Get only the existing translations for specified field
|
||||
|
||||
:param field_name: Name of the field
|
||||
:return: dict of
|
||||
{self.id: {'lang_code': (ir.translation,id, ir.translation,value)}}
|
||||
{self.id: {'lang_code': {'field_name':ir.translation,value}}
|
||||
"""
|
||||
read_res = self.with_context(lang='en_US').read(fields=[field_name])
|
||||
res = {
|
||||
rec.get('id'): {'en_US': (0, rec.get(field_name))}
|
||||
for rec in read_res
|
||||
}
|
||||
read_res = self.with_context(lang='en_US').read(fields=field_names)
|
||||
res = {}
|
||||
for rec in read_res:
|
||||
rec_id = rec.get('id')
|
||||
del rec['id']
|
||||
res[rec_id] = {'en_US': rec}
|
||||
for rec_id, values in res.items():
|
||||
tr_read_res = self.env['ir.translation'].search_read([
|
||||
('name', '=', '%s,%s' % (self._name, field_name)),
|
||||
('res_id', '=', rec_id),
|
||||
('lang', '!=', 'en_US')
|
||||
])
|
||||
for tr_res in tr_read_res:
|
||||
values[tr_res.get('lang')] = (
|
||||
tr_res.get('id'), tr_res.get('value')
|
||||
)
|
||||
for name in field_names:
|
||||
|
||||
tr_read_res = self.env['ir.translation'].search_read([
|
||||
('name', 'like', '%s,%s' % (self._name, field_names)),
|
||||
('res_id', '=', rec_id),
|
||||
('lang', '!=', 'en_US')
|
||||
])
|
||||
for tr_res in tr_read_res:
|
||||
if not tr_res.get('lang') in values:
|
||||
values[tr_res.get('lang')] = {}
|
||||
values[tr_res.get('lang')][name] = tr_res.get('value')
|
||||
return res
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Go to an object that has translatable fields (*Products* for example) and
|
||||
select *More > Translate* (or click on *Edit* and then click on the flag at
|
||||
select *Actions > Translate* (or click on *Edit* and then click on the flag at
|
||||
the top-right of one of the translatable fields): the translation view will
|
||||
pop-up on your screen. This translation view contains all the translatable
|
||||
fields of the object.
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
.oe_translation_field {
|
||||
width: 95%;
|
||||
margin-top: 5px;
|
||||
}
|
||||
.oe_translation_field.touched {
|
||||
border: 1px solid green !important;
|
||||
|
@ -10,3 +11,8 @@
|
|||
.modal-xl {
|
||||
max-width: 90%;
|
||||
}
|
||||
|
||||
.oe_form_frame_cell.field_name {
|
||||
padding-top: 5px;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ var FormView = require('web.FormView');
|
|||
var View = require('web.AbstractView');
|
||||
var session = require('web.session');
|
||||
var rpc = require('web.rpc');
|
||||
|
||||
var FormController = require('web.FormController');
|
||||
var _t = core._t;
|
||||
var QWeb = core.qweb;
|
||||
var Mutex = concurrency.Mutex;
|
||||
|
@ -23,14 +23,25 @@ var Mutex = concurrency.Mutex;
|
|||
var TranslateDialog = Dialog.extend({
|
||||
template: "TranslateDialog",
|
||||
init: function(parent, options) {
|
||||
var title_string = _t("Translate field: /")
|
||||
var title_string = _t("Translate fields: /");
|
||||
var field_names;
|
||||
var single_field = false;
|
||||
if (options.field){
|
||||
field_names = [options.field.fieldName];
|
||||
single_field = true;
|
||||
title_string = title_string.replace('/', field_names);
|
||||
}
|
||||
else {
|
||||
field_names = this.get_translatable_fields(parent);
|
||||
}
|
||||
this._super(parent,
|
||||
{title: title_string.replace('/', options.field.fieldName) , size: 'x-large'});
|
||||
{title: title_string , size: 'x-large'});
|
||||
this.view_language = session.user_context.lang;
|
||||
this.view = parent;
|
||||
this.view_type = parent.viewType || '';
|
||||
this.translatable_field = options.field.fieldName;
|
||||
this.translatable_fields = field_names;
|
||||
this.res_id = options.res_id;
|
||||
this.single_field = single_field;
|
||||
this.languages = null;
|
||||
this.languages_loaded = $.Deferred();
|
||||
this.lang_data = new data.DataSetSearch(
|
||||
|
@ -48,6 +59,15 @@ var TranslateDialog = Dialog.extend({
|
|||
}
|
||||
});
|
||||
},
|
||||
get_translatable_fields: function(parent) {
|
||||
var field_list = [];
|
||||
_.each(parent.renderer.state.fields, function(field, name){
|
||||
if (field.translate == true){
|
||||
field_list.push(name);
|
||||
}
|
||||
});
|
||||
return field_list;
|
||||
},
|
||||
on_languages_loaded: function(langs) {
|
||||
this.languages = langs;
|
||||
this.languages_loaded.resolve();
|
||||
|
@ -74,13 +94,13 @@ var TranslateDialog = Dialog.extend({
|
|||
},
|
||||
resize_textareas: function(){
|
||||
var textareas = this.$('textarea.oe_translation_field');
|
||||
var max_height = 100
|
||||
var max_height = 100;
|
||||
// Resize textarea either to the max height of its content if it stays
|
||||
// in the modal or to the max height available in the modal
|
||||
if (textareas.length) {
|
||||
_.each(textareas, function(textarea) {
|
||||
if (textarea.scrollHeight > max_height) {
|
||||
max_height = textarea.scrollHeight
|
||||
max_height = textarea.scrollHeight;
|
||||
}
|
||||
});
|
||||
var max_client_height = $(window).height() - $('.modal-content').height()
|
||||
|
@ -90,14 +110,16 @@ var TranslateDialog = Dialog.extend({
|
|||
},
|
||||
set_maxlength: function(){
|
||||
// set maxlength if initial field has size attr
|
||||
var size = $('[name='+this.translatable_field+']')[0].maxLength;
|
||||
if (size > 0){
|
||||
this.$('input.oe_translation_field, textarea.oe_translation_field').attr('maxlength', size);
|
||||
}
|
||||
_.each(this.translatable_fields, function(field_name){
|
||||
var size = $('[name='+field_name+']')[0].maxLength;
|
||||
if (size > 0){
|
||||
this.$('input.oe_translation_field[name$="'+field_name+'"], textarea.oe_translation_field[name$="'+field_name+'"]').attr('maxlength', size);
|
||||
}
|
||||
}, this);
|
||||
},
|
||||
initialize_html_fields: function(lang) {
|
||||
// Initialize summernote if HTML field
|
||||
this.$('.oe_form_field_html .oe_translation_field[name="' + lang + '-' + this.translatable_field + '"]').each(function() {
|
||||
this.$('.oe_form_field_html .oe_translation_field[name^="' + lang + '-"]').each(function() {
|
||||
var $parent = $(this).summernote({
|
||||
'focus': false,
|
||||
'toolbar': [
|
||||
|
@ -129,10 +151,11 @@ var TranslateDialog = Dialog.extend({
|
|||
|
||||
},
|
||||
set_fields_values: function(lang, tr_value) {
|
||||
this.$('.oe_translation_field[name="' + lang +
|
||||
'-' + this.translatable_field + '"]').val(tr_value || '').attr(
|
||||
'data-value', tr_value || '');
|
||||
|
||||
_.each(tr_value, function(translation, field){
|
||||
this.$('.oe_translation_field[name="' + lang +
|
||||
'-' + field + '"]').val(translation || '').attr(
|
||||
'data-value', translation || '');
|
||||
}, this);
|
||||
this.initialize_html_fields(lang);
|
||||
},
|
||||
do_load_fields_values: function() {
|
||||
|
@ -150,13 +173,13 @@ var TranslateDialog = Dialog.extend({
|
|||
[this.res_id],
|
||||
],
|
||||
kwargs: {
|
||||
field_name: this.translatable_field,
|
||||
field_names: this.translatable_fields,
|
||||
},
|
||||
}).done(
|
||||
function (res) {
|
||||
if (res[self.res_id]){
|
||||
_.each(res[self.res_id], function(translation, lang) {
|
||||
self.set_fields_values(lang, translation[1]);
|
||||
self.set_fields_values(lang, translation);
|
||||
});
|
||||
self.resize_textareas();
|
||||
self.set_maxlength();
|
||||
|
@ -207,30 +230,30 @@ var TranslateDialog = Dialog.extend({
|
|||
|
||||
});
|
||||
|
||||
FormView.include({
|
||||
render_sidebar: function($node) {
|
||||
|
||||
FormController.include({
|
||||
renderSidebar: function($node) {
|
||||
this._super($node);
|
||||
if (this.sidebar) {
|
||||
this.sidebar.add_items('other', _.compact([
|
||||
this.is_action_enabled('edit') &&
|
||||
this.translatable_field && {
|
||||
var item = this.is_action_enabled('edit') && {
|
||||
label: _t('Translate'),
|
||||
callback: this.on_button_translate
|
||||
},
|
||||
]));
|
||||
};
|
||||
if (item){
|
||||
this.sidebar.items.other.push(item);
|
||||
}
|
||||
}
|
||||
},
|
||||
on_button_translate: function() {
|
||||
var self = this;
|
||||
$.when(this.has_been_loaded).then(function() {
|
||||
self.open_translate_dialog();
|
||||
self.open_translate_dialog(null, self.initialState.res_id);
|
||||
});
|
||||
},
|
||||
|
||||
});
|
||||
|
||||
|
||||
BasicController.include({
|
||||
|
||||
open_translate_dialog: function(field, res_id) {
|
||||
new TranslateDialog(this, {'field': field, 'res_id': res_id}).open();
|
||||
},
|
||||
|
|
|
@ -6,30 +6,37 @@
|
|||
|
||||
<t t-name="TranslateDialog">
|
||||
<div class="modal-body">
|
||||
<table t-if="widget.translatable_field"
|
||||
<table t-if="widget.translatable_fields"
|
||||
class="oe_frame oe_forms oe_translation_form"
|
||||
border="0" cellpadding="0" cellspacing="0" width="100%">
|
||||
<tr>
|
||||
<th t-if="!widget.single_field" class="oe_form_separator" width="1%" nowrap="nowrap">
|
||||
<div class="separator horizontal">Field</div>
|
||||
</th>
|
||||
<th t-foreach="widget.languages" align="left">
|
||||
<div class="separator horizontal"><t t-esc="name"/></div>
|
||||
</th>
|
||||
</tr>
|
||||
<t t-value="widget.translatable_field" t-set="field_name" />
|
||||
<t t-set="field" t-value="widget.view.searchView.fields[field_name]" />
|
||||
<tr t-att-data-field="field_name">
|
||||
<td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell">
|
||||
<input t-if="['char','url'].indexOf(field.type) !== -1"
|
||||
type="text" t-attf-name="#{lg.code}-#{field_name}"
|
||||
value="" data-value="" class="oe_translation_field"/>
|
||||
<textarea t-elif="field.type == 'text'"
|
||||
t-attf-name="#{lg.code}-#{field_name}" data-value=""
|
||||
class="oe_translation_field" />
|
||||
<div t-elif="field.type == 'html'" class="oe_form_field_html">
|
||||
<textarea class="oe_translation_field oe_form_field"
|
||||
t-attf-name="#{lg.code}-#{field_name}" data-value=""/>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<t t-foreach="widget.translatable_fields" t-as="field_name">
|
||||
<t t-set="field" t-value="widget.view.searchView.fields[field_name]" />
|
||||
<tr t-att-data-field="field_name">
|
||||
<td t-if="!widget.single_field" class="oe_form_frame_cell field_name" width="1%" nowrap="nowrap">
|
||||
<label class="oe_label"><t t-esc="field.string"/>:</label>
|
||||
</td>
|
||||
<td t-foreach="widget.languages" t-as="lg" class="oe_form_frame_cell">
|
||||
<input t-if="['char','url'].indexOf(field.type) !== -1"
|
||||
type="text" t-attf-name="#{lg.code}-#{field_name}"
|
||||
value="" data-value="" class="oe_translation_field"/>
|
||||
<textarea t-elif="field.type == 'text'"
|
||||
t-attf-name="#{lg.code}-#{field_name}" data-value=""
|
||||
class="oe_translation_field" />
|
||||
<div t-elif="field.type == 'html'" class="oe_form_field_html">
|
||||
<textarea class="oe_translation_field oe_form_field"
|
||||
t-attf-name="#{lg.code}-#{field_name}" data-value=""/>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</t>
|
||||
</table>
|
||||
</div>
|
||||
</t>
|
||||
|
|
Loading…
Reference in New Issue