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

[FIX] Implement is set and is not set for char,inetger,float,date,datetime widget.

Browse Source 
bzr revid: bth@tinyerp.com-20120629111236-27j1mj5krha0rkkm
This commit is contained in:
Bhumi Thakkar (Open ERP)
2012-06-29 16:42:36 +05:30
parent e2a8445c48
commit be07ba003f
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/search.js
+29 -6
View File
@@ -1228,12 +1228,21 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
this.value = null;
},
start: function () {
var self = this;
this.$element = $("#" + this.element_id);
this.select_field(this.fields.length > 0 ? this.fields[0] : null);
var _this = this;
this.$element.find(".searchview_extended_prop_field").change(function() {
_this.changed();
});
this.$element.find(".searchview_extended_prop_op").change(function() {
var text = $(".searchview_extended_prop_op option:selected").html()
if(text == "is not set" || text == "is set"){
self.$element.find('.searchview_extended_prop_value').hide();
}else{
self.$element.find('.searchview_extended_prop_value').show();
}
});
this.$element.find('.searchview_extended_delete_prop').click(function () {
_this.stop();
});
@@ -1300,6 +1309,10 @@ openerp.web.search.ExtendedSearchProposition = openerp.web.OldWidget.extend(/**
var field = this.attrs.selected.name;
var op = this.$element.find('.searchview_extended_prop_op').val();
var value = this.value.get_value();
var text = $(".searchview_extended_prop_op option:selected").html()
if(text == "is not set" || text == "is set"){
value = false;
}
return [field, op, value];
}
});
@@ -1319,10 +1332,12 @@ openerp.web.search.ExtendedSearchProposition.Char = openerp.web.search.ExtendedS
{value: ">", text: _lt("greater than")},
{value: "<", text: _lt("less than")},
{value: ">=", text: _lt("greater or equal than")},
{value: "<=", text: _lt("less or equal than")}
{value: "<=", text: _lt("less or equal than")},
{value: "!=", text: _lt("is set")},
{value: "=", text: _lt("is not set")}
],
get_value: function() {
return this.$element.val() || false;
return this.$element.val();
}
});
openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.ExtendedSearchProposition.Field.extend({
@@ -1333,7 +1348,9 @@ openerp.web.search.ExtendedSearchProposition.DateTime = openerp.web.search.Exten
{value: ">", text: _lt("greater than")},
{value: "<", text: _lt("less than")},
{value: ">=", text: _lt("greater or equal than")},
{value: "<=", text: _lt("less or equal than")}
{value: "<=", text: _lt("less or equal than")},
{value: "!=", text: _lt("is set")},
{value: "=", text: _lt("is not set")}
],
get_value: function() {
return this.datewidget.get_value();
@@ -1352,7 +1369,9 @@ openerp.web.search.ExtendedSearchProposition.Date = openerp.web.search.ExtendedS
{value: ">", text: _lt("greater than")},
{value: "<", text: _lt("less than")},
{value: ">=", text: _lt("greater or equal than")},
{value: "<=", text: _lt("less or equal than")}
{value: "<=", text: _lt("less or equal than")},
{value: "!=", text: _lt("is set")},
{value: "=", text: _lt("is not set")}
],
get_value: function() {
return this.datewidget.get_value();
@@ -1371,7 +1390,9 @@ openerp.web.search.ExtendedSearchProposition.Integer = openerp.web.search.Extend
{value: ">", text: _lt("greater than")},
{value: "<", text: _lt("less than")},
{value: ">=", text: _lt("greater or equal than")},
{value: "<=", text: _lt("less or equal than")}
{value: "<=", text: _lt("less or equal than")},
{value: "!=", text: _lt("is set")},
{value: "=", text: _lt("is not set")}
],
get_value: function() {
try {
@@ -1392,7 +1413,9 @@ openerp.web.search.ExtendedSearchProposition.Float = openerp.web.search.Extended
{value: ">", text: _lt("greater than")},
{value: "<", text: _lt("less than")},
{value: ">=", text: _lt("greater or equal than")},
{value: "<=", text: _lt("less or equal than")}
{value: "<=", text: _lt("less or equal than")},
{value: "!=", text: _lt("is set")},
{value: "=", text: _lt("is not set")}
],
get_value: function() {
try {