From 943ba009842a3acef85b417f9dfc8ab77663ae0e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 16 Nov 2013 10:53:01 +0100 Subject: [PATCH] [iMP] Order of published/unpublished documents bzr revid: fp@openerp.com-20131116095301-3zp01vsx821odqhx --- addons/website_blog/models/website_blog.py | 3 +++ addons/website_hr/models/hr.py | 3 +++ addons/website_hr_recruitment/controllers/main.py | 2 +- addons/website_hr_recruitment/models/hr_job.py | 5 ++++- addons/website_partner/models/res_company.py | 1 - addons/website_partner/models/res_partner.py | 3 +++ 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/addons/website_blog/models/website_blog.py b/addons/website_blog/models/website_blog.py index a8e81552ee2..ed64ea26b1c 100644 --- a/addons/website_blog/models/website_blog.py +++ b/addons/website_blog/models/website_blog.py @@ -146,6 +146,9 @@ class BlogPost(osv.Model): select=True, readonly=True, ), } + _defaults = { + 'website_published': False + } def create_history(self, cr, uid, ids, vals, context=None): for i in ids: diff --git a/addons/website_hr/models/hr.py b/addons/website_hr/models/hr.py index 169d430e2f6..4cacc56dba4 100644 --- a/addons/website_hr/models/hr.py +++ b/addons/website_hr/models/hr.py @@ -9,6 +9,9 @@ class hr(osv.osv): 'website_published': fields.boolean('Available in the website'), 'public_info': fields.text('Public Info'), } + _defaults = { + 'website_published': False + } def img(self, cr, uid, ids, field='image_small', context=None): return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0]) diff --git a/addons/website_hr_recruitment/controllers/main.py b/addons/website_hr_recruitment/controllers/main.py index 0f5b9734fb7..d30130914b5 100644 --- a/addons/website_hr_recruitment/controllers/main.py +++ b/addons/website_hr_recruitment/controllers/main.py @@ -14,7 +14,7 @@ class website_hr_recruitment(http.Controller): def jobs(self, department=None, office=None, page=0): hr_job_obj = request.registry['hr.job'] domain = [] - jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published,no_of_recruitment", context=request.context) + jobpost_ids = hr_job_obj.search(request.cr, request.uid, domain, order="website_published desc,no_of_recruitment", context=request.context) jobs = hr_job_obj.browse(request.cr, request.uid, jobpost_ids, request.context) departments = set() diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py index 54d5f20c925..3b4cb7dba60 100644 --- a/addons/website_hr_recruitment/models/hr_job.py +++ b/addons/website_hr_recruitment/models/hr_job.py @@ -9,4 +9,7 @@ class hr_job(osv.osv): _columns = { 'website_published': fields.boolean('Available in the website'), 'website_description': fields.html('Description for the website'), - } \ No newline at end of file + } + _defaults = { + 'website_published': False + } diff --git a/addons/website_partner/models/res_company.py b/addons/website_partner/models/res_company.py index c514be0fe65..b03232020e9 100644 --- a/addons/website_partner/models/res_company.py +++ b/addons/website_partner/models/res_company.py @@ -5,7 +5,6 @@ from openerp.osv import osv, fields class WebsiteResCompany(osv.Model): _inherit = 'res.company' - _columns = { 'website_published': fields.related('partner_id', 'website_published', string='Publish', help="Publish on the website"), } diff --git a/addons/website_partner/models/res_partner.py b/addons/website_partner/models/res_partner.py index bdaaa986fad..c5d7539edca 100644 --- a/addons/website_partner/models/res_partner.py +++ b/addons/website_partner/models/res_partner.py @@ -16,6 +16,9 @@ class WebsiteResPartner(osv.Model): 'Website artner Short Description' ), } + _defaults = { + 'website_published': False + } def img(self, cr, uid, ids, field='image_small', context=None): return "/website/image?model=%s&field=%s&id=%s" % (self._name, field, ids[0])