diff options
| author | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-09-16 19:05:15 +0530 |
|---|---|---|
| committer | Kunal Chavda (OpenERP) <kch@tinyerp.com> | 2011-09-16 19:05:15 +0530 |
| commit | 0e2d998e48a83caa449adf4f27a87f6a7c892cfb (patch) | |
| tree | b7dd414498b61daef7ba996accc3a27e3948b2ad /addons/web/static/src/js/data_import.js | |
| parent | 8511d9986b627ae926b54fe0c3a5b492fd64472e (diff) | |
[FIX]Remove unnecessary on_click method and passing parameter.
bzr revid: kch@tinyerp.com-20110916133515-6he9cdw3cjsf24hl
Diffstat (limited to 'addons/web/static/src/js/data_import.js')
| -rw-r--r-- | addons/web/static/src/js/data_import.js | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js index a9daca20373..fd1e6301eb9 100644 --- a/addons/web/static/src/js/data_import.js +++ b/addons/web/static/src/js/data_import.js @@ -91,36 +91,27 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ } } this.do_check_req_field(results['req_field']); - var selected_fields; - this.$element.find("td #sel_field").click(function(){ - selected_fields = _.map(self.$element.find("td #sel_field"), function(field){ - return field.selectedIndex - }); - }); - this.on_change_check(selected_fields,results['req_field']); + this.on_change_check(results['req_field']); this.$element.find("td #sel_field").change(function(){ - self.on_change_check(selected_fields,results['req_field']); + self.on_change_check(results['req_field']); }); }, - on_change_check:function(selected_fields,req_field){ + on_change_check:function(req_field){ var self = this; self.$element.find("#message, #msg").remove(); - var duplicate_flds = self.$element.find("td #sel_field option:selected"); - _.each(duplicate_flds,function(fld){ + var selected_flds = self.$element.find("td #sel_field option:selected"); + _.each(selected_flds,function(fld){ if (fld.index != 0){ var res = self.$element.find("td #sel_field option:selected[value='"+ fld.value +"']"); if (res.length == 1){ - res.parent().removeClass("duplicate_fld"); - res.parent().addClass("select_fld"); + res.parent().removeClass("duplicate_fld").addClass("select_fld"); }else if(res.length > 1){ - res.parent().removeClass("select_fld"); - res.parent().addClass("duplicate_fld"); + res.parent().removeClass("select_fld").addClass("duplicate_fld"); res.parent().focus(); } }else{ var elem = self.$element.find("td #sel_field option:selected[value='"+ fld.value +"']"); - elem.parent().removeClass("duplicate_fld"); - elem.parent().addClass("select_fld"); + elem.parent().removeClass("duplicate_fld").addClass("select_fld"); } }); if(self.$element.find(".duplicate_fld").length){ @@ -144,7 +135,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({ return !_.contains(sel_fields, fld) }); if (required_fields.length){ - $("#result").before('<div id="message" style="color:red">*Required Fields are not selected which is '+required_fields+'.</div>'); + $("#result").before('<div id="message" style="color:red">*Required Fields are not selected : '+required_fields+'.</div>'); $(".ui-button-text:contains('Import File')").parent().attr("disabled",true); }else{ self.$element.find("#message").remove(); |