diff --git a/addons/website_project/__openerp__.py b/addons/website_project/__openerp__.py index 366ad1a4219..81d64cd8d3f 100644 --- a/addons/website_project/__openerp__.py +++ b/addons/website_project/__openerp__.py @@ -15,5 +15,5 @@ OpenERP Projects 'views/website_project.xml', ], 'qweb': ['static/src/xml/*.xml'], - 'installable': False, + 'installable': True, } diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py index 64f2fd0762e..17a91bed21b 100644 --- a/addons/website_project/controllers/main.py +++ b/addons/website_project/controllers/main.py @@ -38,28 +38,11 @@ class Website(osv.Model): class website_project(http.Controller): - @http.route(['/project//'], type='http', auth="public", website=True, multilang=True) - def project(self, project_id=None, **post): + @http.route(['/project//'], type='http', auth="public", website=True, multilang=True) + def project(self, project=None, **post): cr, uid, context = request.cr, request.uid, request.context - project_obj = request.registry['project.project'] - - project = project_obj.browse(request.cr, request.uid, project_id, request.context) - render_values = { 'project': project, 'main_object': project, } return request.website.render("website_project.index", render_values) - - @http.route(['/project/task/'], type='http', auth="public", website=True, multilang=True) - def task(self, task_id=None, **post): - cr, uid, context = request.cr, request.uid, request.context - task_obj = request.registry['project.task'] - - task = task_obj.browse(cr, uid, task_id, context=context) - - render_values = { - 'task': task, - 'main_object': task, - } - return request.website.render("website_project.task", render_values) diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml index 0b7b8d9e95c..9c23a3d3f02 100644 --- a/addons/website_project/views/website_project.xml +++ b/addons/website_project/views/website_project.xml @@ -26,7 +26,7 @@