mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-01 12:38:27 +00:00
fix in report builder saving
This commit is contained in:
@@ -87,6 +87,7 @@ def boot_session(bootinfo):
|
||||
|
||||
import webnotes.model.doctype
|
||||
bootinfo['docs'] += webnotes.model.doctype.get('Event')
|
||||
bootinfo['docs'] += webnotes.model.doctype.get('Search Criteria')
|
||||
|
||||
bootinfo['modules_list'] = webnotes.conn.get_global('modules_list')
|
||||
|
||||
|
||||
@@ -686,7 +686,7 @@ var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.opt
|
||||
this.set_attach_options();me.options_list=me.df.options?me.df.options.split('\n'):[];empty_select(this.input);if(me.in_filter&&me.options_list[0]!=''){me.options_list=add_lists([''],me.options_list);}
|
||||
add_sel_options(this.input,me.options_list);}
|
||||
this.onrefresh=function(){this.refresh_options();if(this.not_in_form){this.input.value='';return;}
|
||||
if(_f.get_value)
|
||||
if(_f.get_value)
|
||||
var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.options_list&&this.options_list.length)
|
||||
var v=this.options_list[0];else
|
||||
var v=null;}
|
||||
@@ -1565,7 +1565,7 @@ var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.opt
|
||||
this.set_attach_options();me.options_list=me.df.options?me.df.options.split('\n'):[];empty_select(this.input);if(me.in_filter&&me.options_list[0]!=''){me.options_list=add_lists([''],me.options_list);}
|
||||
add_sel_options(this.input,me.options_list);}
|
||||
this.onrefresh=function(){this.refresh_options();if(this.not_in_form){this.input.value='';return;}
|
||||
if(_f.get_value)
|
||||
if(_f.get_value)
|
||||
var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.options_list&&this.options_list.length)
|
||||
var v=this.options_list[0];else
|
||||
var v=null;}
|
||||
|
||||
@@ -595,7 +595,7 @@ var v=_f.get_value(this.doctype,this.docname,this.df.fieldname);else{if(this.opt
|
||||
var v=this.options_list[0];else
|
||||
var v=null;}
|
||||
this.input.set_input(v);}
|
||||
this.input.set_input=function(v){if(!v){if(!me.input.multiple){if(me.docname){if(me.options_list&&me.options_list.length){me.set(me.options_list[0]);me.input.value=me.options_list[0];}else{me.input.value='';}}}}else{if(me.options_list){if(me.input.multiple){for(var i=0;i<me.input.options.length;i++){me.input.options[i].selected=0;if(me.input.options[i].value&&inList(v.split(","),me.input.options[i].value))
|
||||
this.input.set_input=function(v){if(!v){if(!me.input.multiple){if(me.docname){if(me.options_list&&me.options_list.length){me.set(me.options_list[0]);me.input.value=me.options_list[0];}else{me.input.value='';}}}}else{if(me.options_list){if(me.input.multiple){for(var i=0;i<me.input.options.length;i++){me.input.options[i].selected=0;if(me.input.options[i].value&&inList(typeof(v)=='string'?v.split(","):v,me.input.options[i].value))
|
||||
me.input.options[i].selected=1;}}else if(in_list(me.options_list,v)){me.input.value=v;}}}}
|
||||
this.get_value=function(){if(me.input.multiple){var l=[];for(var i=0;i<me.input.options.length;i++){if(me.input.options[i].selected)l[l.length]=me.input.options[i].value;}
|
||||
return l;}else{if(me.input.options){var val=sel_val(me.input);if(!val&&!me.input.selectedIndex)
|
||||
|
||||
@@ -1 +1 @@
|
||||
830
|
||||
838
|
||||
Reference in New Issue
Block a user