odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Use view 'name' as title for main_object of type ir.ui.view 

bzr revid: fme@openerp.com-20131010145525-417zbwltyqzbjolz
This commit is contained in:
Fabien Meghazi 2013-10-10 16:55:25 +02:00
parent 9b40e849d6
commit 6a37c2fb82
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/website/models/view.py
View File

@ -7,6 +7,7 @@ from openerp.osv import osv, fields
class view(osv.osv):
_inherit = "ir.ui.view"
_columns = {
'name': fields.char('View Name', required=True, translate=True),
'inherit_option_id': fields.many2one('ir.ui.view','Optional Inheritancy'),
'inherited_option_ids': fields.one2many('ir.ui.view','inherit_option_id','Optional Inheritancies'),
'page': fields.boolean("Whether this view is a web page template (complete)"),

8
addons/website/models/website.py
View File

@ -157,6 +157,14 @@ class website(osv.osv):
inherit_branding=qweb_context.setdefault('editable', False),
)
main_object = qweb_context.get('main_object')
if main_object:
if 'additional_title' not in qweb_context and 'name' in main_object:
qweb_context['additional_title'] = main_object.name
for key in ['website_description', 'website_keywords']:
if key not in qweb_context and key in main_object:
qweb_context[key] = main_object[key]
# check if xmlid of the template exists
try:
module, xmlid = template.split('.', 1)

4
addons/website/views/views.xml
View File

@ -303,7 +303,6 @@
<template id="contactus" name="Contact us" page="True">
<t t-call="website.layout">
<t t-set="additional_title">Contact us</t>
<div id="wrap">
<div class="oe_structure"/>
<div class="container">
@ -328,9 +327,8 @@
</t>
</template>
<template id="aboutus" page="True">
<template id="aboutus" name="About us" page="True">
<t t-call="website.layout">
<t t-set="additional_title">About us</t>
<div id="wrap">
<div class="oe_structure"/>
<div class="container mb32">

3
addons/website_blog/views/website_blog_templates.xml
View File

@ -133,13 +133,12 @@
</template>
<!-- Page -->
<template id="index" name="Blogs" page="True">
<template id="index" name="Blog" page="True">
<t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_blog/static/src/js/website_blog.js"></script>
<link rel='stylesheet' href='/website_blog/static/src/css/website_blog.css'/>
</t>
<t t-set="additional_title">Blog</t>
<div id="wrap">
<div class="container mt16 js_website_blog">
<div class="row">

1
addons/website_crm/views/website_crm.xml
View File

@ -57,7 +57,6 @@
<template id="contactus_thanks" name="Contact us" page="True">
<t t-call="website.layout">
<t t-set="additional_title">Contact us</t>
<div id="wrap">
<div class="oe_structure"/>
<div class="container">

1
addons/website_event/views/website_event.xml
View File

@ -15,7 +15,6 @@
<!-- Page -->
<template id="index" name="Events" page="True">
<t t-call="website.layout">
<t t-set="additional_title">Events</t>
<div id="wrap">
<div class="container">
<div class="oe_structure"/>

3
addons/website_hr_recruitment/views/website_hr_recruitment.xml
View File

@ -16,9 +16,8 @@
</xpath>
</template>
<template id="index" name="Departments" page="True">
<template id="index" name="Jobs" page="True">
<t t-call="website.layout">
<t t-set="additional_title">Jobs</t>
<div id="wrap">
<div class="oe_structure"/>
<div class="container oe_website_jobs">

3
addons/website_sale/views/website_sale.xml
View File

@ -392,14 +392,13 @@
<!-- Page Shop my cart -->
<template id="mycart" name="My cart" page="True">
<template id="mycart" name="Your Cart" page="True">
<t t-call="website.layout">
<t t-set="head">
<script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
<link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
<t t-raw="head or ''"/>
</t>
<t t-set="additional_title">Your Cart</t>
<div id="wrap">
<div class="container oe_website_sale">