summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2011-03-30 17:04:21 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2011-03-30 17:04:21 +0200
commit0519496d0a446cf951102cce6568ece892d84cf5 (patch)
tree325c9ecc9d0a3da390164c699ce36acfceeb50fd
parent0292b18dd1e2c8e935e89465dbae0cddde86a2fa (diff)
[FIX] Corrected tabs.
bzr revid: nicolas.vanhoren@openerp.com-20110330150421-7c7zc2n4mjv44tnh
-rw-r--r--addons/base/static/src/js/search.js222
-rw-r--r--addons/base/static/src/js/views.js48
-rw-r--r--addons/base/static/src/xml/base.xml86
3 files changed, 178 insertions, 178 deletions
diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index f83347f8e3a..a607cb51ede 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -327,7 +327,7 @@ openerp.base.search.FilterGroup = openerp.base.search.Widget.extend({
}
});
openerp.base.search.add_expand_listener = function($root) {
- $root.find('a.searchview_group_string').click(function (e) {
+ $root.find('a.searchview_group_string').click(function (e) {
$root.toggleClass('folded expanded');
e.stopPropagation();
e.preventDefault();
@@ -358,15 +358,15 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
template: 'SearchView.extended_search',
identifier_prefix: 'extended-search',
init: function (parent, fields) {
- this._super(parent);
+ this._super(parent);
this.fields = fields;
- },
- add_group: function(group) {
- var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
+ },
+ add_group: function(group) {
+ var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
var render = group.render({});
this.$element.find('.searchview_extended_groups_list').append(render);
group.start();
- },
+ },
start: function () {
this._super();
var _this = this;
@@ -377,146 +377,146 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
e.stopPropagation();
e.preventDefault();
});
- },
- get_context: function() {
- return null;
- },
- get_domain: function() {
- if(this.$element.hasClass("folded")) {
- return null;
- }
- var domain = _.reduce(this.children,
- function(mem, x) { return mem.concat(x.get_domain());}, []);
- return domain;
- }
+ },
+ get_context: function() {
+ return null;
+ },
+ get_domain: function() {
+ if(this.$element.hasClass("folded")) {
+ return null;
+ }
+ var domain = _.reduce(this.children,
+ function(mem, x) { return mem.concat(x.get_domain());}, []);
+ return domain;
+ }
});
openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
template: 'SearchView.extended_search.group',
identifier_prefix: 'extended-search-group',
init: function (parent, fields) {
- this._super(parent);
- this.fields = fields;
- },
- add_prop: function() {
- var prop = new openerp.base.search.ExtendedSearchProposition(this, this.fields);
+ this._super(parent);
+ this.fields = fields;
+ },
+ add_prop: function() {
+ var prop = new openerp.base.search.ExtendedSearchProposition(this, this.fields);
var render = prop.render({});
this.$element.find('.searchview_extended_propositions_list').append(render);
prop.start();
- },
+ },
start: function () {
this._super();
var _this = this;
this.add_prop();
this.$element.find('.searchview_extended_add_proposition').click(function (e) {
- _this.add_prop();
+ _this.add_prop();
e.stopPropagation();
e.preventDefault();
});
var delete_btn = this.$element.find('.searchview_extended_delete_group');
delete_btn.click(function (e) {
- _this.stop();
+ _this.stop();
e.stopPropagation();
e.preventDefault();
});
- },
- get_domain: function() {
- var props = _(this.children).chain().map(function(x) {
- return x.get_proposition();
- }).compact().value();
- var choice = this.$element.find(".searchview_extended_group_choice").val();
- var op = choice == "all" ? "&" : "|";
- var domain = [].concat(choice == "none" ? ['!'] : [],
- _.map(_.range(_.max([0,props.length - 1])), function(x) { return op; }),
- props);
- return domain;
- }
+ },
+ get_domain: function() {
+ var props = _(this.children).chain().map(function(x) {
+ return x.get_proposition();
+ }).compact().value();
+ var choice = this.$element.find(".searchview_extended_group_choice").val();
+ var op = choice == "all" ? "&" : "|";
+ var domain = [].concat(choice == "none" ? ['!'] : [],
+ _.map(_.range(_.max([0,props.length - 1])), function(x) { return op; }),
+ props);
+ return domain;
+ }
});
openerp.base.search.extended_filters_types = {
- char: {
- operators: [
- {value: "ilike", text: "contains"},
- {value: "not like", text: "doesn't contain"},
- {value: "=", text: "is equal to"},
- {value: "!=", text: "is not equal to"},
- {value: ">", text: "greater than"},
- {value: "<", text: "less than"},
- {value: ">=", text: "greater or equal than"},
- {value: "<=", text: "less or equal than"},
- ],
- build_component: function(parent) {
- return new openerp.base.search.ExtendedSearchProposition.Char(parent);
- }
- }
+ char: {
+ operators: [
+ {value: "ilike", text: "contains"},
+ {value: "not like", text: "doesn't contain"},
+ {value: "=", text: "is equal to"},
+ {value: "!=", text: "is not equal to"},
+ {value: ">", text: "greater than"},
+ {value: "<", text: "less than"},
+ {value: ">=", text: "greater or equal than"},
+ {value: "<=", text: "less or equal than"},
+ ],
+ build_component: function(parent) {
+ return new openerp.base.search.ExtendedSearchProposition.Char(parent);
+ }
+ }
};
openerp.base.search.ExtendedSearchProposition = openerp.base.BaseWidget.extend({
template: 'SearchView.extended_search.proposition',
identifier_prefix: 'extended-search-proposition',
init: function (parent, fields) {
- this._super(parent);
- this.fields = _(fields).chain()
- .map(function(val,key) {return {name:key, obj:val};})
- .sortBy(function(x) {return x.obj.string;}).value();
- this.attrs = {_: _, fields: this.fields, selected: null};
- this.value_component = null;
- },
+ this._super(parent);
+ this.fields = _(fields).chain()
+ .map(function(val,key) {return {name:key, obj:val};})
+ .sortBy(function(x) {return x.obj.string;}).value();
+ this.attrs = {_: _, fields: this.fields, selected: null};
+ this.value_component = null;
+ },
start: function () {
this._super();
- this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
- var _this = this;
- this.$element.find(".searchview_extended_prop_field").change(function(e) {
- _this.changed();
+ this.set_selected(this.fields.length > 0 ? this.fields[0] : null);
+ var _this = this;
+ this.$element.find(".searchview_extended_prop_field").change(function(e) {
+ _this.changed();
e.stopPropagation();
e.preventDefault();
- });
- var delete_btn = this.$element.find('.searchview_extended_delete_prop');
- delete_btn.click(function (e) {
- _this.stop();
+ });
+ var delete_btn = this.$element.find('.searchview_extended_delete_prop');
+ delete_btn.click(function (e) {
+ _this.stop();
e.stopPropagation();
e.preventDefault();
});
- },
- changed: function() {
- var nval = this.$element.find(".searchview_extended_prop_field").val();
- if(this.attrs.selected == null || nval != this.attrs.selected.name) {
- this.set_selected(_.detect(this.fields, function(x) {return x.name == nval;}));
- }
- },
- set_selected: function(selected) {
- var _this = this;
- if(this.attrs.selected != null) {
- this.value_component.stop();
- this.value_component = null;
- this.$element.find('.searchview_extended_prop_op').html('');
- }
- this.attrs.selected = selected;
- if(selected == null) {
- return;
- }
- var type = selected.obj.type;
- var extended_filters_types = openerp.base.search.extended_filters_types;
- type = type in extended_filters_types ? type : "char";
- _.each(extended_filters_types[type].operators, function(operator) {
- option = jQuery('<option/>');
- option.attr('value', operator.value);
- option.text(operator.text);
- option.appendTo(_this.$element.find('.searchview_extended_prop_op'));
- });
- this.value_component = extended_filters_types[type].build_component(this);
- var render = this.value_component.render({});
- this.$element.find('.searchview_extended_prop_value').html(render);
- this.value_component.start();
- },
- get_proposition: function() {
- if ( this.attrs.selected == null)
- return null;
- var field = this.attrs.selected.name;
- var op = this.$element.find('.searchview_extended_prop_op').val();
- var value = this.value_component.get_value();
- return [field, op, value];
- }
+ },
+ changed: function() {
+ var nval = this.$element.find(".searchview_extended_prop_field").val();
+ if(this.attrs.selected == null || nval != this.attrs.selected.name) {
+ this.set_selected(_.detect(this.fields, function(x) {return x.name == nval;}));
+ }
+ },
+ set_selected: function(selected) {
+ var _this = this;
+ if(this.attrs.selected != null) {
+ this.value_component.stop();
+ this.value_component = null;
+ this.$element.find('.searchview_extended_prop_op').html('');
+ }
+ this.attrs.selected = selected;
+ if(selected == null) {
+ return;
+ }
+ var type = selected.obj.type;
+ var extended_filters_types = openerp.base.search.extended_filters_types;
+ type = type in extended_filters_types ? type : "char";
+ _.each(extended_filters_types[type].operators, function(operator) {
+ option = jQuery('<option/>');
+ option.attr('value', operator.value);
+ option.text(operator.text);
+ option.appendTo(_this.$element.find('.searchview_extended_prop_op'));
+ });
+ this.value_component = extended_filters_types[type].build_component(this);
+ var render = this.value_component.render({});
+ this.$element.find('.searchview_extended_prop_value').html(render);
+ this.value_component.start();
+ },
+ get_proposition: function() {
+ if ( this.attrs.selected == null)
+ return null;
+ var field = this.attrs.selected.name;
+ var op = this.$element.find('.searchview_extended_prop_op').val();
+ var value = this.value_component.get_value();
+ return [field, op, value];
+ }
});
openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.extend({
@@ -524,9 +524,9 @@ openerp.base.search.ExtendedSearchProposition.Char = openerp.base.BaseWidget.ext
identifier_prefix: 'extended-search-proposition-char',
get_value: function() {
- var val = this.$element.val();
- return val;
- }
+ var val = this.$element.val();
+ return val;
+ }
});
openerp.base.search.Input = openerp.base.search.Widget.extend({
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 04ef930079f..a34fa2254d7 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -144,12 +144,12 @@ openerp.base.ViewManagerUsedAsAMany2One = openerp.base.Controller.extend({
* generation, parenting and destruction of the widget.
*/
openerp.base.BaseWidget = openerp.base.Controller.extend({
- /**
- * The name of the QWeb template that will be used for rendering. Must be redifined
- * in subclasses or the render() method can not be used.
- *
- * @type string
- */
+ /**
+ * The name of the QWeb template that will be used for rendering. Must be redifined
+ * in subclasses or the render() method can not be used.
+ *
+ * @type string
+ */
template: null,
/**
* The prefix used to generate an id automatically. Should be redifined in subclasses.
@@ -164,7 +164,7 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
* @params {openerp.base.search.BaseWidget} parent The parent widget.
*/
init: function (parent) {
- this.children = [];
+ this.children = [];
this.parent = null;
this.set_parent(parent);
this.make_id(this.identifier_prefix);
@@ -194,15 +194,15 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
* lets the widgets clean up after themselves.
*/
stop: function () {
- var tmp_children = this.children;
- this.children = [];
- _.each(tmp_children, function(x) {
- x.stop();
- });
- if(this.$element != null) {
- this.$element.remove();
- }
- this.set_parent(null);
+ var tmp_children = this.children;
+ this.children = [];
+ _.each(tmp_children, function(x) {
+ x.stop();
+ });
+ if(this.$element != null) {
+ this.$element.remove();
+ }
+ this.set_parent(null);
this._super();
},
/**
@@ -212,13 +212,13 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
* @param {openerp.base.BaseWidget} parent The new parent.
*/
set_parent: function(parent) {
- if(this.parent) {
- this.parent.children = _.without(this.parent.children, this);
- }
- this.parent = parent;
- if(this.parent) {
- parent.children.push(this);
- }
+ if(this.parent) {
+ this.parent.children = _.without(this.parent.children, this);
+ }
+ this.parent = parent;
+ if(this.parent) {
+ parent.children.push(this);
+ }
},
/**
* Render the widget. This.template must be defined.
@@ -228,7 +228,7 @@ openerp.base.BaseWidget = openerp.base.Controller.extend({
*/
render: function (additional) {
return QWeb.render(this.template, _.extend({}, this,
- additional != null ? additional : {}));
+ additional != null ? additional : {}));
}
});
openerp.base.CalendarView = openerp.base.Controller.extend({
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 1fa14b7fa56..3124f5a5686 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -344,7 +344,7 @@
</div>
</t>
<t t-name="SearchView.util.expand">
- <div t-att-class="'searchview_group ' + (expand == '0' ? 'folded' : 'expanded')"
+ <div t-att-class="'searchview_group ' + (expand == '0' ? 'folded' : 'expanded')"
t-att-id="element_id">
<a t-if="label" class="searchview_group_string" href="#">
<t t-esc="label"/>
@@ -355,55 +355,55 @@
</div>
</t>
<t t-name="SearchView.group">
- <t t-call="SearchView.util.expand">
- <t t-set="expand" t-value="attrs.expand"/>
- <t t-set="label" t-value="attrs.string"/>
- <t t-set="content">
- <t t-call="SearchView.render_lines"/>
- </t>
- </t>
+ <t t-call="SearchView.util.expand">
+ <t t-set="expand" t-value="attrs.expand"/>
+ <t t-set="label" t-value="attrs.string"/>
+ <t t-set="content">
+ <t t-call="SearchView.render_lines"/>
+ </t>
+ </t>
</t>
<t t-name="SearchView.extended_search">
- <t t-call="SearchView.util.expand">
- <t t-set="expand" t-value="false"/>
- <t t-set="label" t-value="'Extended Filters'"/>
- <t t-set="content">
- <div class="searchview_extended_groups_list"></div>
- <button class="searchview_extended_add_group">Add group of conditions</button>
- </t>
- </t>
+ <t t-call="SearchView.util.expand">
+ <t t-set="expand" t-value="false"/>
+ <t t-set="label" t-value="'Extended Filters'"/>
+ <t t-set="content">
+ <div class="searchview_extended_groups_list"></div>
+ <button class="searchview_extended_add_group">Add group of conditions</button>
+ </t>
+ </t>
</t>
<t t-name="SearchView.extended_search.group">
- <div t-att-id="element_id">
- <select class="searchview_extended_group_choice">
- <option value="all">All</option>
- <option value="any">Any</option>
- <option value="none">None</option>
- </select>
- <div class="searchview_extended_propositions_list">
- </div>
- <button class="searchview_extended_add_proposition">Add condition</button>
- <button class="searchview_extended_delete_group">Delete this group</button>
- </div>
+ <div t-att-id="element_id">
+ <select class="searchview_extended_group_choice">
+ <option value="all">All</option>
+ <option value="any">Any</option>
+ <option value="none">None</option>
+ </select>
+ <div class="searchview_extended_propositions_list">
+ </div>
+ <button class="searchview_extended_add_proposition">Add condition</button>
+ <button class="searchview_extended_delete_group">Delete this group</button>
+ </div>
</t>
<t t-name="SearchView.extended_search.proposition">
- <div t-att-id="element_id">
- <select class="searchview_extended_prop_field">
- <t t-foreach="attrs.fields" t-as="field">
- <option t-att="{'selected': field === attrs.selected ? 'selected' : null}"
- t-att-value="field.name">
- <t t-esc="field.obj.string"/>
- </option>
- </t>
- </select>
- <select class="searchview_extended_prop_op">
- </select>
- <span class="searchview_extended_prop_value">
- </span>
- <button class="searchview_extended_delete_prop">Delete this condition</button>
- </div>
+ <div t-att-id="element_id">
+ <select class="searchview_extended_prop_field">
+ <t t-foreach="attrs.fields" t-as="field">
+ <option t-att="{'selected': field === attrs.selected ? 'selected' : null}"
+ t-att-value="field.name">
+ <t t-esc="field.obj.string"/>
+ </option>
+ </t>
+ </select>
+ <select class="searchview_extended_prop_op">
+ </select>
+ <span class="searchview_extended_prop_value">
+ </span>
+ <button class="searchview_extended_delete_prop">Delete this condition</button>
+ </div>
</t>
<t t-name="SearchView.extended_search.proposition.char">
- <input t-att-id="element_id"></input>
+ <input t-att-id="element_id"></input>
</t>
</templates>