From dc40385d41fa70944ef00cdd5b63cfe88f763ed8 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 31 Jul 2012 19:37:39 +0530 Subject: [PATCH] validate link only if value is non empty --- public/js/all-app.js | 6 +++--- public/js/fields.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/all-app.js b/public/js/all-app.js index 68dca2f921..6e2fa3e36f 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -746,7 +746,7 @@ LinkField.prototype.set_input_value=function(val){var me=this;me.set_input_value if(cur_frm){if(val==locals[me.doctype][me.docname][me.df.fieldname]){me.run_trigger();return;}} me.set(val);if(_f.cur_grid_cell) _f.cur_grid_cell.grid.cell_deselect();if(locals[me.doctype][me.docname][me.df.fieldname]&&!val){me.run_trigger();return;} -me.validate_link(val,from_selector);} +if(val){me.validate_link(val,from_selector);}} LinkField.prototype.validate_link=function(val,from_selector){var me=this;var fetch='';if(cur_frm.fetch_dict[me.df.fieldname]) fetch=cur_frm.fetch_dict[me.df.fieldname].columns.join(', ');$c('webnotes.widgets.form.utils.validate_link',{'value':val,'options':me.df.options,'fetch':fetch},function(r,rt){if(r.message=='Ok'){if($(me.txt).val()!=val){if((me.grid&&!from_selector)||(!me.grid)){$(me.txt).val(val);}} if(r.fetch_values) @@ -1572,7 +1572,7 @@ LinkField.prototype.set_input_value=function(val){var me=this;me.set_input_value if(cur_frm){if(val==locals[me.doctype][me.docname][me.df.fieldname]){me.run_trigger();return;}} me.set(val);if(_f.cur_grid_cell) _f.cur_grid_cell.grid.cell_deselect();if(locals[me.doctype][me.docname][me.df.fieldname]&&!val){me.run_trigger();return;} -me.validate_link(val,from_selector);} +if(val){me.validate_link(val,from_selector);}} LinkField.prototype.validate_link=function(val,from_selector){var me=this;var fetch='';if(cur_frm.fetch_dict[me.df.fieldname]) fetch=cur_frm.fetch_dict[me.df.fieldname].columns.join(', ');$c('webnotes.widgets.form.utils.validate_link',{'value':val,'options':me.df.options,'fetch':fetch},function(r,rt){if(r.message=='Ok'){if($(me.txt).val()!=val){if((me.grid&&!from_selector)||(!me.grid)){$(me.txt).val(val);}} if(r.fetch_values) @@ -2288,7 +2288,7 @@ wn.provide('erpnext.toolbar');erpnext.toolbar.setup=function(){erpnext.toolbar.a onclick="return false;">Help\ ') -$('#toolbar-help').append('
  • \ +$('#toolbar-help').append('
  • \ Documentation
  • ') $('#toolbar-help').append('
  • \ Forum
  • ') diff --git a/public/js/fields.js b/public/js/fields.js index b9dca9027e..32aa00c934 100644 --- a/public/js/fields.js +++ b/public/js/fields.js @@ -110,7 +110,7 @@ LinkField.prototype.set_input_value=function(val){var me=this;me.set_input_value if(cur_frm){if(val==locals[me.doctype][me.docname][me.df.fieldname]){me.run_trigger();return;}} me.set(val);if(_f.cur_grid_cell) _f.cur_grid_cell.grid.cell_deselect();if(locals[me.doctype][me.docname][me.df.fieldname]&&!val){me.run_trigger();return;} -me.validate_link(val,from_selector);} +if(val){me.validate_link(val,from_selector);}} LinkField.prototype.validate_link=function(val,from_selector){var me=this;var fetch='';if(cur_frm.fetch_dict[me.df.fieldname]) fetch=cur_frm.fetch_dict[me.df.fieldname].columns.join(', ');$c('webnotes.widgets.form.utils.validate_link',{'value':val,'options':me.df.options,'fetch':fetch},function(r,rt){if(r.message=='Ok'){if($(me.txt).val()!=val){if((me.grid&&!from_selector)||(!me.grid)){$(me.txt).val(val);}} if(r.fetch_values)