diff options
| author | sri-odoo <sri@odoo.com> | 2019-08-29 13:48:12 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2019-10-01 16:52:20 +0000 |
| commit | c8c8eb3d5652e9834d0ecd5aad907ee359edb657 (patch) | |
| tree | 854984a5b6010953d8087337bc02e4e786dc4269 /addons/website_forum/models | |
| parent | 83284a962cdbce53a30a42e2282953d777949fa1 (diff) | |
[IMP] website_forum, *: revamp design
* web_editor, website_profile
Part of https://github.com/odoo/odoo/pull/35749
task-2024197
Co-authored-by: Jérémy Kersten <jke@odoo.com>
Co-authored-by: qsm-odoo <qsm@odoo.com>
Co-authored-by: fja-odoo <fja@odoo.com>
Diffstat (limited to 'addons/website_forum/models')
| -rw-r--r-- | addons/website_forum/models/__init__.py | 3 | ||||
| -rw-r--r-- | addons/website_forum/models/forum.py | 11 | ||||
| -rw-r--r-- | addons/website_forum/models/website.py | 15 |
3 files changed, 20 insertions, 9 deletions
diff --git a/addons/website_forum/models/__init__.py b/addons/website_forum/models/__init__.py index 6a8174ad9e0..6400bd0bdb4 100644 --- a/addons/website_forum/models/__init__.py +++ b/addons/website_forum/models/__init__.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- +from . import forum from . import gamification from . import res_users -from . import forum +from . import website diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 62d21ea9b6d..12dc7fc5739 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -36,16 +36,11 @@ class Forum(models.Model): help='Questions mode: only one answer allowed\n Discussions mode: multiple answers allowed') active = fields.Boolean(default=True) faq = fields.Html('Guidelines', default=_get_default_faq, translate=html_translate, sanitize=False) - description = fields.Text( - 'Description', - translate=True, - default=lambda s: _('This community is for professionals and enthusiasts of our products and services. ' - 'Share and discuss the best content and new marketing ideas, ' - 'build your professional profile and become a better marketer together.')) + description = fields.Text('Description', translate=True) welcome_message = fields.Html( 'Welcome Message', translate=True, - default="""<section class="bg-info shadow"> + default="""<section> <div class="container py-5"> <div class="row"> <div class="col-lg-12"> @@ -56,7 +51,7 @@ class Forum(models.Model): </p> </div> <div class="col text-center mt-3"> - <a href="#" class="js_close_intro btn btn-outline-light">Hide Intro</a> + <a href="#" class="js_close_intro btn btn-outline-light mr-2">Hide Intro</a> <a class="btn btn-light forum_register_url" href="/web/login">Register</a> </div> </div> diff --git a/addons/website_forum/models/website.py b/addons/website_forum/models/website.py new file mode 100644 index 00000000000..29a42fd8850 --- /dev/null +++ b/addons/website_forum/models/website.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import models, fields + + +class Website(models.Model): + _inherit = 'website' + + def _compute_field_forums_count(self): + Forum = self.env['forum.forum'] + for website in self: + website.forums_count = Forum.search_count(website.website_domain()) + + forums_count = fields.Integer(compute=_compute_field_forums_count) |