pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]Fixed code for javascript problems as par review.

Browse Source 
bzr revid: kch@tinyerp.com-20110909114933-4f0zgiedo9dp865h
This commit is contained in:
Kunal Chavda (OpenERP)
2011-09-09 17:19:33 +05:30
parent ea82b31286
commit 555610e41b
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/controllers/main.py
+1 -1
View File
@@ -1571,7 +1571,7 @@ class Import(View):
if res[0]>=0:
success={'message':'Imported %d objects' % (res[0],)}
return '<script>window.top.%s(%s);</script>' % (
jsonp, simplejson.dumps({'error':success}))
jsonp, simplejson.dumps({'success':success}))
d = ''
for key,val in res[1].items():
addons/web/static/src/js/data_import.js
+25 -19
View File
@@ -24,8 +24,9 @@ function jsonp(form, attributes, callback) {
}, attributes));
}
openerp.web.DataImport = openerp.web.Dialog.extend({
template: 'ImportDataView',
dialog_title: "Import Data",
init: function(parent, dataset){
this.parent = parent;
this._super(parent);
this.dataset = dataset;
},
@@ -87,23 +88,25 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
result_node.append(QWeb.render('ImportView-result',{'error': results['error']}));
}else if(results['success']){
self.stop();
this.parent.reload_content();
if (((this.widget_parent['fields_view']['type']) == "tree") || ((this.widget_parent['fields_view']['type']) == "list")){
this.widget_parent.reload_content();
}
}
this.do_check_req_field(results['req_field']);
var selected_fields = [];
$("td #sel_field").click(function(){
this.$element.find("td #sel_field").click(function(){
selected_fields = [];
$("td #sel_field option:selected").each(function(){
self.$element.find("td #sel_field option:selected").each(function(){
selected_fields.push($(this).index());
});
});
$("td #sel_field").change(function(){
$("#message").empty();
$("td #sel_field").css('background-color','');
$(".ui-button-text:contains('Import File')").parent().attr("disabled",false);
this.$element.find("td #sel_field").change(function(){
self.$element.find("#message").empty();
self.$element.find("td #sel_field").css('background-color','');
self.$element.find(".ui-button-text:contains('Import File')").parent().attr("disabled",false);
self.do_check_req_field(results['req_field']);
var curr_selected = this.selectedIndex;
if ($.inArray(curr_selected,selected_fields) > -1){
if ((curr_selected != 0) && _.contains(selected_fields, curr_selected)){
$(this).css('background-color','#FF6666');
$("#message").append("*Selected column should not be same.");
$(".ui-button-text:contains('Import File')").parent().attr("disabled",true);
@@ -114,19 +117,22 @@ openerp.web.DataImport = openerp.web.Dialog.extend({
},
do_check_req_field: function(req_fld){
if (req_fld.length){
var sel_fields =[];
var required_fields = [];
$("td #sel_field option:selected").each(function(){
sel_fields.push($(this).val());
});
_.each(req_fld,function(fld){
if ($.inArray(fld,sel_fields) <= -1){
required_fields.push(fld);
}
});
var required_fields = "";
var sel_fields = _.map(this.$element.find("td #sel_field option:selected"), function(fld){
return fld['text']
});
required_fields = required_fields + _.filter(req_fld, function (fld){
if (!_.contains(sel_fields,fld)){
return fld + "," ;
}
});
if (required_fields.length){
$("#message").append("*Required Fields are not selected which is "+required_fields+". ");
$(".ui-button-text:contains('Import File')").parent().attr("disabled",true);
}else{
$(".ui-button-text:contains('Import File')").parent().attr("disabled",false);
}
}
},
addons/web/static/src/xml/base.xml
+1 -1
View File
@@ -1468,7 +1468,7 @@
<tr>
<t t-foreach="records.header" t-as="header">
<td>
<select name="sel_field" id="sel_field">
<select id="sel_field">
<option selected="selected" value=""></option>
<t t-foreach="records.sel" t-as="selection">
<option t-att="{'selected': header[0] === selection ? 'selected' : null}"