[FIX]Fixed code for problems in previous commit.

bzr revid: kch@tinyerp.com-20110912125900-flvro2f4qsllik14

addons/web/controllers/main.py

@@ -1444,6 +1444,7 @@ class Import(View):
                                        prefix_node+field, None, st_name+'/', level-1)
         fields.update({'id':{'string':'ID'},'.id':{'string':'Database ID'}})
         model_populate(fields)
+
         all_fields = fields.keys()
         all_fields.sort()
 
@@ -1569,9 +1570,8 @@ class Import(View):
                 jsonp, simplejson.dumps({'error':error}))
 
         if res[0]>=0:
-            success={'message':'Imported %d objects' % (res[0],)}
             return '<script>window.top.%s(%s);</script>' % (
-                jsonp, simplejson.dumps({'success':success}))
+                jsonp, simplejson.dumps({'success':True}))
 
         d = ''
         for key,val in res[1].items():

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+". ");

addons/web/static/src/xml/base.xml

@@ -1364,7 +1364,7 @@
 <t t-name="ImportDataView">
 <form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data">
     <input type="hidden" name="session_id" t-att-value="session.session_id"/>
-    <input type="hidden" name="model" t-att-value="dataset.model"/>
+    <input type="hidden" name="model" t-att-value="widget_parent.model"/>
      <table cellspacing="5" border="0" width="100%">
         <tr>
             <td>
@@ -1492,18 +1492,6 @@
             </t>
         </table>
     </t>
-    <t t-if="success">
-        <table width="100%">
-            <tr>
-                <td width="100%" valign="middle" colspan="4">
-                    <h2 class="separator horizontal">3. File imported</h2>
-                </td>
-            </tr>
-            <tr>
-                <t t-esc="success.message"/>
-            </tr>
-        </table>
-    </t>
 </t>
 
 <t t-name="About-Page">