From e9b6a1c0db35087ec7e2eccb72e71fb3cee9e1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Maes?= Date: Mon, 30 May 2016 17:06:28 +0200 Subject: [PATCH] [MOV-MIG] website_hr_recruitment : move some file and migrate some others ot new api --- addons/website_hr_recruitment/__openerp__.py | 4 +-- .../website_hr_recruitment/models/__init__.py | 5 +++- .../models/hr_applicant.py | 5 ++-- .../website_hr_recruitment/models/hr_job.py | 26 +++++++++---------- ...ecruitment_source.py => hr_recruitment.py} | 0 .../views/hr_job_views.xml | 6 ++--- ...ment_view.xml => hr_recruitment_views.xml} | 0 ...l => website_hr_recruitment_templates.xml} | 0 8 files changed, 24 insertions(+), 22 deletions(-) rename addons/website_hr_recruitment/models/{hr_recruitment_source.py => hr_recruitment.py} (100%) rename addons/website_hr_recruitment/views/{hr_recruitment_view.xml => hr_recruitment_views.xml} (100%) rename addons/website_hr_recruitment/views/{templates.xml => website_hr_recruitment_templates.xml} (100%) diff --git a/addons/website_hr_recruitment/__openerp__.py b/addons/website_hr_recruitment/__openerp__.py index dc3acdde129..4c0baa427cd 100644 --- a/addons/website_hr_recruitment/__openerp__.py +++ b/addons/website_hr_recruitment/__openerp__.py @@ -14,8 +14,8 @@ Odoo Contact Form 'security/website_hr_recruitment_security.xml', 'data/config_data.xml', 'views/hr_job_views.xml', - 'views/templates.xml', - 'views/hr_recruitment_view.xml', + 'views/website_hr_recruitment_templates.xml', + 'views/hr_recruitment_views.xml', ], 'demo': [ 'data/hr_job_demo.xml', diff --git a/addons/website_hr_recruitment/models/__init__.py b/addons/website_hr_recruitment/models/__init__.py index 331192a2437..51930ad5d98 100644 --- a/addons/website_hr_recruitment/models/__init__.py +++ b/addons/website_hr_recruitment/models/__init__.py @@ -1,3 +1,6 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + import hr_job -import hr_recruitment_source +import hr_recruitment import hr_applicant diff --git a/addons/website_hr_recruitment/models/hr_applicant.py b/addons/website_hr_recruitment/models/hr_applicant.py index de1070ad43f..e630d27a595 100644 --- a/addons/website_hr_recruitment/models/hr_applicant.py +++ b/addons/website_hr_recruitment/models/hr_applicant.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -from openerp.osv import osv +from odoo import models + +class Applicant(models.Model): -class hr_applicant(osv.Model): _inherit = 'hr.applicant' def website_form_input_filter(self, request, values): diff --git a/addons/website_hr_recruitment/models/hr_job.py b/addons/website_hr_recruitment/models/hr_job.py index 19ddb8e6881..244ef5721fb 100644 --- a/addons/website_hr_recruitment/models/hr_job.py +++ b/addons/website_hr_recruitment/models/hr_job.py @@ -1,22 +1,22 @@ # -*- coding: utf-8 -*- -from openerp.osv import osv, fields +from odoo import api, fields, models +class Job(models.Model): -class hr_job(osv.osv): _name = 'hr.job' _inherit = ['hr.job', 'website.seo.metadata', 'website.published.mixin'] - def _website_url(self, cr, uid, ids, field_name, arg, context=None): - res = super(hr_job, self)._website_url(cr, uid, ids, field_name, arg, context=context) - for job in self.browse(cr, uid, ids, context=context): - res[job.id] = "/jobs/detail/%s" % job.id - return res + website_description = fields.Html('Website description', translate=True) - def set_open(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'website_published': False}, context=context) - return super(hr_job, self).set_open(cr, uid, ids, context) + @api.multi + def _website_url(self, field_name, arg): + result = super(Job, self)._website_url(field_name, arg) + for job in self: + result[job.id] = "/jobs/detail/%s" % job.id + return result - _columns = { - 'website_description': fields.html('Website description', translate=True), - } + @api.multi + def set_open(self): + self.write({'website_published': False}) + return super(Job, self).set_open() diff --git a/addons/website_hr_recruitment/models/hr_recruitment_source.py b/addons/website_hr_recruitment/models/hr_recruitment.py similarity index 100% rename from addons/website_hr_recruitment/models/hr_recruitment_source.py rename to addons/website_hr_recruitment/models/hr_recruitment.py diff --git a/addons/website_hr_recruitment/views/hr_job_views.xml b/addons/website_hr_recruitment/views/hr_job_views.xml index 7b34a700900..cfa7fc675f2 100644 --- a/addons/website_hr_recruitment/views/hr_job_views.xml +++ b/addons/website_hr_recruitment/views/hr_job_views.xml @@ -1,6 +1,5 @@ - - + hr.job.form.inherit.published.button hr.job @@ -14,5 +13,4 @@ - - + diff --git a/addons/website_hr_recruitment/views/hr_recruitment_view.xml b/addons/website_hr_recruitment/views/hr_recruitment_views.xml similarity index 100% rename from addons/website_hr_recruitment/views/hr_recruitment_view.xml rename to addons/website_hr_recruitment/views/hr_recruitment_views.xml diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml similarity index 100% rename from addons/website_hr_recruitment/views/templates.xml rename to addons/website_hr_recruitment/views/website_hr_recruitment_templates.xml