diff options
| author | Jérome Maes <jem@openerp.com> | 2017-08-10 10:50:17 +0200 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2017-08-16 14:56:43 +0200 |
| commit | f9827cb5b44a02749075f8185f36f143aad6bcce (patch) | |
| tree | 9d4d7193dfd2f4c9d94581ac503d831b6408dcd5 /addons/project/controllers | |
| parent | f9d09411ab7cbe95b4c68f94e43b2b01f4546e83 (diff) | |
[IMP] project: use portal mixin for project/task
Diffstat (limited to 'addons/project/controllers')
| -rw-r--r-- | addons/project/controllers/portal.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py index f3f16554b73..76079d9bdff 100644 --- a/addons/project/controllers/portal.py +++ b/addons/project/controllers/portal.py @@ -5,7 +5,7 @@ from collections import OrderedDict from odoo import http, _ from odoo.http import request -from odoo.addons.portal.controllers.portal import get_records_pager, CustomerPortal +from odoo.addons.portal.controllers.portal import get_records_pager, CustomerPortal, pager as portal_pager from odoo.osv.expression import OR from odoo.tools import pycompat @@ -42,7 +42,7 @@ class CustomerPortal(CustomerPortal): # projects count project_count = Project.search_count(domain) # pager - pager = request.website.pager( + pager = portal_pager( url="/my/projects", url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby}, total=project_count, @@ -67,9 +67,10 @@ class CustomerPortal(CustomerPortal): }) return request.render("project.portal_my_projects", values) - @http.route(['/my/project/<model("project.project"):project>'], type='http', auth="user", website=True) - def portal_my_project(self, project=None, **kw): - vals = {'project': project, } + @http.route(['/my/project/<int:project_id>'], type='http', auth="user", website=True) + def portal_my_project(self, project_id=None, **kw): + project = request.env['project.project'].browse(project_id) + vals = {'project': project} history = request.session.get('my_projects_history', []) vals.update(get_records_pager(history, project)) return request.render("project.portal_my_project", vals) @@ -132,7 +133,7 @@ class CustomerPortal(CustomerPortal): # task count task_count = request.env['project.task'].search_count(domain) # pager - pager = request.website.pager( + pager = portal_pager( url="/my/tasks", url_args={'date_begin': date_begin, 'date_end': date_end, 'sortby': sortby, 'filterby': filterby}, total=task_count, @@ -161,9 +162,13 @@ class CustomerPortal(CustomerPortal): }) return request.render("project.portal_my_tasks", values) - @http.route(['/my/task/<model("project.task"):task>'], type='http', auth="user", website=True) - def portal_my_task(self, task=None, **kw): - vals = {'task': task, 'user': request.env.user} + @http.route(['/my/task/<int:task_id>'], type='http', auth="user", website=True) + def portal_my_task(self, task_id=None, **kw): + task = request.env['project.task'].browse(task_id) + vals = { + 'task': task, + 'user': request.env.user + } history = request.session.get('my_tasks_history', []) vals.update(get_records_pager(history, task)) return request.render("project.portal_my_task", vals) |