[IMP] website: remove website.config.settings
bzr revid: chm@openerp.com-20131003150048-elm5kiwabrh1j6gt
This commit is contained in:
Christophe Matthieu
@@ -14,7 +14,6 @@ OpenERP Website CMS
|
||||
'data': [
|
||||
'views/views.xml',
|
||||
'views/themes.xml',
|
||||
'views/res_config.xml',
|
||||
'website_data.xml',
|
||||
'website_view.xml',
|
||||
'security/ir.model.access.csv',
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import ir_fields
|
||||
import res_config
|
||||
import view
|
||||
import website
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
|
||||
class website_config_settings(osv.osv_memory):
|
||||
_name = 'website.config.settings'
|
||||
_inherit = 'res.config.settings'
|
||||
_columns = {
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="view_website_config_settings" model="ir.ui.view">
|
||||
<field name="name">website settings</field>
|
||||
<field name="model">website.config.settings</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Website" version="7.0" class="oe_form_configuration">
|
||||
<header>
|
||||
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
|
||||
or
|
||||
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
|
||||
</header>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="action_website_config" model="ir.actions.act_window">
|
||||
<field name="name">Configure Website</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">website.config.settings</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="target">inline</field>
|
||||
</record>
|
||||
|
||||
<menuitem id="menu_website_config" name="Website" parent="base.menu_config"
|
||||
sequence="15" action="action_website_config"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
@@ -21,5 +21,4 @@
|
||||
|
||||
import controllers
|
||||
import website_blog
|
||||
import res_config
|
||||
import wizard
|
||||
|
||||
@@ -35,7 +35,6 @@ OpenERP Blog
|
||||
'website_blog_data.xml',
|
||||
'views/website_blog_classic.xml',
|
||||
'views/website_blog_templates.xml',
|
||||
'views/res_config.xml',
|
||||
# 'wizard/document_page_create_menu_view.xml',
|
||||
'wizard/document_page_show_diff_view.xml',
|
||||
'security/ir.model.access.csv',
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
# OpenERP, Open Source Management Solution
|
||||
# Copyright (C) 2013-Today OpenERP SA (<http://www.openerp.com>).
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
from openerp.osv import fields, osv
|
||||
|
||||
|
||||
class website_config_settings(osv.osv_memory):
|
||||
_inherit = 'website.config.settings'
|
||||
_columns = {
|
||||
'group_website_mail_reply': fields.boolean(
|
||||
'Visitors can reply on blogs',
|
||||
implied_group='website_blog.group_website_mail_reply'
|
||||
),
|
||||
}
|
||||
@@ -2,11 +2,6 @@
|
||||
<openerp>
|
||||
<data>
|
||||
|
||||
<record model="res.groups" id="group_website_mail_reply">
|
||||
<field name="name">Visitors can reply on blogs</field>
|
||||
<field name="category_id" ref="base.module_category_hidden"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule" id="website_blog_post_public">
|
||||
<field name="name">Blog Post: public: published only</field>
|
||||
<field name="model_id" ref="model_blog_post"/>
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record id="view_website_mail_config_settings" model="ir.ui.view">
|
||||
<field name="name">website_mail settings</field>
|
||||
<field name="model">website.config.settings</field>
|
||||
<field name="inherit_id" ref="website.view_website_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<form position="inside">
|
||||
<separator string="Blog"/>
|
||||
<group>
|
||||
<field name="group_website_mail_reply"/>
|
||||
</group>
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
@@ -99,6 +99,11 @@
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</template>
|
||||
|
||||
<!-- Options: Blog Post: user can reply -->
|
||||
<template id="view_blog_post_author" inherit_option_id="website_blog.view_blog_post" name="Hide Authors">
|
||||
<xpath expr="//ul[last()]" position="after">
|
||||
<section groups="group_website_blog_reply" class="mb32">
|
||||
<h4>Leave a Comment</h4>
|
||||
<form id="comment" t-attf-action="/blog/#{blog_post.category_id.id}/#{blog_post.id}/post#post"
|
||||
@@ -110,6 +115,7 @@
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
</xpath>
|
||||
</template>
|
||||
|
||||
<!-- Options: Blog Post: hide author -->
|
||||
|
||||
Reference in New Issue
Block a user