odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch '8.0' of github.com:odoo/odoo into 8.0

This commit is contained in:
Fabien Pinckaers 2014-08-20 12:21:58 +02:00
parent a6de99990d 53a5c6d241
commit 3ab268cf63
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/project/project.py
View File

@ -791,8 +791,8 @@ class task(osv.osv):
'company_id': lambda self, cr, uid, ctx=None: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=ctx),
'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx),
}
_order = "priority, sequence, date_start, name, id"
_order = "priority desc, sequence, date_start, name, id"
def _check_recursion(self, cr, uid, ids, context=None):
for id in ids:
visited_branch = set()

2
addons/project_issue/project_issue.py
View File

@ -44,7 +44,7 @@ class project_issue_version(osv.Model):
class project_issue(osv.Model):
_name = "project.issue"
_description = "Project Issue"
_order = "priority, create_date desc"
_order = "priority desc, create_date desc"
_inherit = ['mail.thread', 'ir.needaction_mixin']
_mail_post_access = 'read'

6
addons/web/static/src/js/search.js
View File

@ -1623,7 +1623,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
facet: {
category: this.attrs.string,
field: this,
values: [{label: value, value: value}]
values: [{label: value, value: value, operator: 'ilike'}]
},
expand: this.expand.bind(this),
}]);
@ -1671,9 +1671,13 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
return facetValue.get('label');
},
make_domain: function (name, operator, facetValue) {
operator = facetValue.get('operator') || operator;
switch(operator){
case this.default_operator:
return [[name, '=', facetValue.get('value')]];
case 'ilike':
return [[name, 'ilike', facetValue.get('value')]];
case 'child_of':
return [[name, 'child_of', facetValue.get('value')]];
}