[FIX] fix the portal user menu; remove a bunch of useless views and actions

bzr revid: abo@openerp.com-20120525170553-1gofhlgrex3sr2wn
This commit is contained in:
Antonin Bourguignon 2012-05-25 19:05:53 +02:00
parent 9703c62b7f
commit 530a3086eb
5 changed files with 46 additions and 86 deletions

View File

@ -39,7 +39,6 @@ module 'share'.
'data': [
'security/portal_security.xml',
'security/ir.model.access.csv',
'board_portal_view.xml',
'portal_view.xml',
'portal_data.xml',
'res_user_view.xml',

View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<record id="action_mail_my_feeds" model="ir.actions.client">
<field name="name">My Feeds</field>
<field name="tag">mail.all_feeds</field>
</record>
<record id="board_portal_form" model="ir.ui.view">
<field name="name">board.portal.form</field>
<field name="model">board.board</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="DashBoard">
<board style="2-1">
<column>
<action name="%(mail.action_mail_my_feeds)d" string="My Wall"/>
</column>
<column>
</column>
</board>
</form>
</field>
</record>
<record id="open_portal" model="ir.actions.act_window">
<field name="name">Portal Dashboard</field>
<field name="res_model">board.board</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="usage">menu</field>
<field name="view_id" ref="board_portal_form"/>
</record>
</data>
</openerp>

View File

@ -66,39 +66,9 @@ the portal's users.
</field>
</record>
<record id="product.product_kanban_view" model="ir.ui.view">
<field name="name">Product Kanban</field>
<field name="model">product.product</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban>
<field name="color"/>
<field name="type"/>
<field name="product_image"/>
<field name="list_price"/>
<templates>
<t t-name="kanban-box">
<div class="oe_product_vignette">
<div class="oe_product_img">
<a type="edit"><img t-att-src="kanban_image('product.product', 'product_image', record.id.value)" class="oe_product_photo"/></a>
</div>
<div class="oe_product_desc">
<h4><a type="edit"><field name="name"></field></a></h4>
<ul>
<li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
<li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
<li>Price: <field name="lst_price"></field></li>
</ul>
</div>
</div>
<script>
$('.oe_product_photo').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_product_photo_wide') } });
</script>
<div></div>
</t>
</templates>
</kanban>
</field>
<record id="action_news" model="ir.actions.client">
<field name="name">News</field>
<field name="tag">mail.all_feeds</field>
</record>
<record id="action_about" model="ir.actions.act_window">
@ -112,7 +82,6 @@ the portal's users.
</record>
<!-- module's menu -->
<!-- menu Administration/Portals -->
<menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration"
@ -122,17 +91,24 @@ the portal's users.
<!-- root menu for portal members (chrooted in this menu) -->
<menuitem name="Portal Members Root Menu" id="portal_members_root_menu" parent="portal_menu_settings"/>
<menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu" action="open_portal"/>
<menuitem name="Track Orders" id="portal_track_orders" parent="menu_portal"/>
<menuitem name="Invoice and Payments" id="portal_invoice_payements" parent="menu_portal"/>
<menuitem name="Services" id="portal_services" parent="menu_portal"/>
<menuitem name="After Sale Services" id="portal_after_sales" parent="menu_portal"/>
<menuitem name="Our company" id="portal_company" parent="menu_portal"/>
<menuitem name="News" id="portal_company_news" parent="portal_company"/>
<menuitem name="Jobs" id="portal_company_jobs" parent="portal_company"/>
<menuitem name="Address Book" id="portal_company_address_book" parent="portal_company" action="base.action_partner_form"/>
<menuitem name="About" id="portal_company_about" parent="portal_company" action="action_about"/>
<menuitem name="Portal Member's Menu" id="menu_portal" parent="portal_members_root_menu"/>
<menuitem name="Our company" id="portal_company" parent="menu_portal"/>
<!--
right now it's not possible to directly call a client action
from a menuitem, so we can't use this shortcut element and
use an explicit record element instead
-->
<record id="portal_company_news" model="ir.ui.menu">
<field name="name">News</field>
<field name="action" ref="action_news"/>
<field name="parent_id" ref="portal_company"/>
</record>
<menuitem name="Jobs" id="portal_company_jobs" parent="portal_company"/>
<menuitem name="About" id="portal_company_about" parent="portal_company" action="action_about"/>
<menuitem name="Orders" id="portal_track_orders" parent="menu_portal"/>
<menuitem name="Invoice and Payments" id="portal_invoice_payements" parent="menu_portal"/>
<menuitem name="Services" id="portal_services" parent="menu_portal"/>
<menuitem name="After Sale Services" id="portal_after_sales" parent="menu_portal"/>
</data>
</openerp>

View File

@ -1 +1,22 @@
import contact
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2011 OpenERP S.A (<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/>.
#
##############################################################################
import contact

View File

@ -21,6 +21,7 @@
</form>
</field>
</record>
<!-- wizard thanks message (shows after submitting the form) -->
<record id="wizard_contact_form_view_thanks" model="ir.ui.view">
<field name="name">Wizard thanks message</field>
@ -40,16 +41,17 @@
</form>
</field>
</record>
<!-- wizard action -->
<record id="action_wizard_contact_us" model="ir.actions.act_window">
<field name="name">Contact Us</field>
<field name="res_model">portal_crm.crm_contact_us</field>
<field name="view_mode">form</field>
</record>
<!-- attach it to the portal menu -->
<menuitem name="Contact Us" id="portal_company_contact"
parent="portal.portal_company" action="action_wizard_contact_us"/>
</data>
</openerp>