diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-09-06 10:35:00 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-09-06 10:35:00 +0200 |
| commit | 8a3f1742e0e9c7acaae726e5c7106d2d7df7e970 (patch) | |
| tree | 78ae5d981fcd25677caea5c8b3999b1e77bf4547 /addons/website_project | |
| parent | 6f6c59ec1de1881a70e4bf728ea5d8b56bd609f9 (diff) | |
| parent | c80cf7d0646463b290137c26fbada568a6942b00 (diff) | |
[MERGE] from website-al
bzr revid: chm@openerp.com-20130906083500-4n5knaxiqt4cg2ht
Diffstat (limited to 'addons/website_project')
| -rw-r--r-- | addons/website_project/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/website_project/controllers/main.py | 23 | ||||
| -rw-r--r-- | addons/website_project/views/website_project.xml | 2 |
3 files changed, 10 insertions, 17 deletions
diff --git a/addons/website_project/__openerp__.py b/addons/website_project/__openerp__.py index 62f83023b1f..84e6b507e7b 100644 --- a/addons/website_project/__openerp__.py +++ b/addons/website_project/__openerp__.py @@ -1,5 +1,5 @@ { -'name': 'Public Project', +'name': 'Public Projects', 'category': 'Website', 'summary': 'Publish Your Public Projects', 'version': '1.0', diff --git a/addons/website_project/controllers/main.py b/addons/website_project/controllers/main.py index 1d87564bfa9..8132f2959b5 100644 --- a/addons/website_project/controllers/main.py +++ b/addons/website_project/controllers/main.py @@ -3,31 +3,24 @@ from openerp.osv import osv from openerp.addons.web import http from openerp.addons.web.http import request +from openerp.addons.website import website -class website(osv.osv): +class Website(osv.osv): _inherit = "website" - def get_rendering_context(self, additional_values=None): + def get_webcontext(self, values={}, **kw): project_obj = request.registry['project.project'] project_ids = project_obj.search(request.cr, request.uid, [('privacy_visibility', "=", "public")]) - values = { + values.update({ 'project_ids': project_obj.browse(request.cr, request.uid, project_ids), - } - if additional_values: - values.update(additional_values) - return super(website, self).get_rendering_context(values) + }) + return super(Website, self).get_webcontext(values, **kw) class website_project(http.Controller): - @http.route(['/project/<int:project_id>/'], type='http', auth="public") + @website.route(['/project/<int:project_id>/'], type='http', auth="public") def blog(self, project_id=None, **post): - website = request.registry['website'] project_obj = request.registry['project.project'] - project = project_obj.browse(request.cr, request.uid, project_id) - - values = website.get_rendering_context({ - 'project_id': project, - }) - return website.render("website_project.index", values) + return request.webcontext.render("website_project.index", {'project_id': project}) diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml index e2f72e09c02..add17848e83 100644 --- a/addons/website_project/views/website_project.xml +++ b/addons/website_project/views/website_project.xml @@ -6,7 +6,7 @@ <!-- Layout add nav and footer --> <template id="footer_custom" inherit_id="website.layout" name="Custom Footer"> - <xpath expr="//body/footer//div[@name='info']/ul" position="inside"> + <xpath expr="//body/footer//ul[@name='products']" position="inside"> <li t-foreach="project_ids" t-as="project"><a t-attf-href="/project/#{ project.id }/"><t t-esc="project.name"/></a></li> </xpath> </template> |