summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/data_import.js
diff options
context:
space:
mode:
authorKunal Chavda (OpenERP) <kch@tinyerp.com>2011-09-12 18:29:00 +0530
committerKunal Chavda (OpenERP) <kch@tinyerp.com>2011-09-12 18:29:00 +0530
commit55e3e348726287e59decf47077965b1eb5b5cb42 (patch)
tree9fa790b79b3649c54afe24410c53083dc506df7a /addons/web/static/src/js/data_import.js
parent555610e41bdbb4904a2a042d916bedf122be2abc (diff)
[FIX]Fixed code for problems in previous commit.
bzr revid: kch@tinyerp.com-20110912125900-flvro2f4qsllik14
Diffstat (limited to 'addons/web/static/src/js/data_import.js')
-rw-r--r--addons/web/static/src/js/data_import.js17
1 files changed, 7 insertions, 10 deletions
diff --git a/addons/web/static/src/js/data_import.js b/addons/web/static/src/js/data_import.js
index f31c694312c..6d8ed93aafe 100644
--- a/addons/web/static/src/js/data_import.js
+++ b/addons/web/static/src/js/data_import.js
@@ -28,7 +28,6 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
dialog_title: "Import Data",
init: function(parent, dataset){
this._super(parent);
- this.dataset = dataset;
},
start: function() {
var self = this;
@@ -88,7 +87,7 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
result_node.append(QWeb.render('ImportView-result',{'error': results['error']}));
}else if(results['success']){
self.stop();
- if (((this.widget_parent['fields_view']['type']) == "tree") || ((this.widget_parent['fields_view']['type']) == "list")){
+ if (this.widget_parent.widget_parent.active_view == "list"){
this.widget_parent.reload_content();
}
}
@@ -116,17 +115,15 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
});
},
do_check_req_field: function(req_fld){
+ var self = this;
if (req_fld.length){
- var required_fields = "";
var sel_fields = _.map(this.$element.find("td #sel_field option:selected"), function(fld){
- return fld['text']
- });
+ return fld['text']
+ });
- required_fields = required_fields + _.filter(req_fld, function (fld){
- if (!_.contains(sel_fields,fld)){
- return fld + "," ;
- }
- });
+ var required_fields = _.filter(req_fld, function(fld){
+ return !_.contains(sel_fields, fld)
+ });
if (required_fields.length){
$("#message").append("*Required Fields are not selected which is "+required_fields+". ");