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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Saurabh 2019-02-21 16:18:16 +05:30
commit cbbc4251c9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -24,7 +24,7 @@ if sys.version[0] == '2':
reload(sys)
sys.setdefaultencoding("utf-8")
__version__ = '11.1.8'
__version__ = '11.1.9'
__title__ = "Frappe Framework"
local = Local()

4
frappe/public/js/frappe/form/controls/multiselect.js
View file

@ -35,7 +35,7 @@ frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
get_value() {
let data = this._super();
// find value of label from option list and return actual value string
if (this.df.options && this.df.options[0].label) {
if (this.df.options && this.df.options.length && this.df.options[0].label) {
data = data.split(',').map(op => op.trim());
data = data.map(val => {
let option = this.df.options.find(op => op.label === val);
@ -48,7 +48,7 @@ frappe.ui.form.ControlMultiSelect = frappe.ui.form.ControlAutocomplete.extend({
set_formatted_input(value) {
if (!value) return;
// find label of value from option list and set from it as input
if (this.df.options && this.df.options[0].label) {
if (this.df.options && this.df.options.length && this.df.options[0].label) {
value = value.split(',').map(d => d.trim()).map(val => {
let option = this.df.options.find(op => op.value === val);
return option ? option.label : val;