vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #26425 from cogk/feat-add-translation-context-to-select-options

Browse source
This commit is contained in:
Raffael Meyer 2024-06-27 19:34:32 +02:00 • committed by GitHub
commit f3816fa2ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
frappe/public/js/frappe/form/controls/select.js
View file

@ -75,7 +75,12 @@ frappe.ui.form.ControlSelect = class ControlSelect extends frappe.ui.form.Contro
if (this.$input) {
var selected = this.$input.find(":selected").val();
this.$input.empty();
frappe.ui.form.add_options(this.$input, options || [], this.df.sort_options);
frappe.ui.form.add_options(
this.$input,
options || [],
this.df.sort_options,
this.df.context || this.df.parent || this.doctype
);
if (value === undefined && selected) {
this.$input.val(selected);
@ -103,13 +108,13 @@ frappe.ui.form.ControlSelect = class ControlSelect extends frappe.ui.form.Contro
}
};
frappe.ui.form.add_options = function (input, options_list, sort) {
frappe.ui.form.add_options = function (input, options_list, sort, doctype) {
let $select = $(input);
if (!Array.isArray(options_list)) {
return $select;
}
let options = options_list.map((raw_option) => parse_option(raw_option));
let options = options_list.map((raw_option) => parse_option(raw_option, doctype));
if (sort) {
options = options.sort((a, b) => cstr(a.label).localeCompare(cstr(b.label)));
}
@ -150,7 +155,7 @@ frappe.ui.form.add_options = function (input, options_list, sort) {
};
})(jQuery);
function parse_option(v) {
function parse_option(v, doctype) {
let value = null;
let label = null;
let is_disabled = false;
@ -164,10 +169,10 @@ function parse_option(v) {
if (is_value_null && is_label_null && typeof v !== "object") {
value = v;
label = __(v);
label = __(v, null, doctype);
} else {
value = is_value_null ? "" : v.value;
label = is_label_null ? __(value) : __(v.label);
label = is_label_null ? __(value, null, doctype) : __(v.label, null, doctype);
}
}