[MERGE]upstream

bzr revid: dle@openerp.com-20130625162046-snd83ltaha9o5fl8

5 files changed, 19 insertions, 75 deletions

diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
index 60fb460545a..71376240d03 100644
--- a/addons/portal_event/__init__.py
+++ b/addons/portal_event/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-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
@@ -18,5 +18,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import event
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
index f97ad81efd9..05d84875647 100644
--- a/addons/portal_event/__openerp__.py
+++ b/addons/portal_event/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-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
@@ -30,11 +30,13 @@ This module adds event menu and features to your portal if event and portal are
 ==========================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['event','portal'],
+    'depends': [
+        'event',
+        'portal',
+    ],
     'data': [
-        'event_view.xml',
-        'security/portal_security.xml',
         'portal_event_view.xml',
+        'security/portal_security.xml',
         'security/ir.model.access.csv',
     ],
     'installable': True,
diff --git a/addons/portal_event/event.py b/addons/portal_event/event.py
deleted file mode 100644
index 45026da4eba..00000000000
--- a/addons/portal_event/event.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 event_event(osv.osv):
-    _description = 'Portal event'
-    _inherit = 'event.event'
-
-    """
-    ``visibility``: defines if the event appears on the portal's event page
-                    - 'public' means the event will appear for everyone (anonymous)
-                    - 'private' means the event won't appear
-    """
-    _columns = {
-        'visibility': fields.selection([('public', 'Public'),('private', 'Private')],
-            string='Visibility', help='Event\'s visibility in the portal\'s contact page'),
-    }
-    _defaults = {
-        'visibility': 'private',
-    }
diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml
deleted file mode 100644
index 3dec56fa526..00000000000
--- a/addons/portal_event/event_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <!-- add visibility field to the event form view -->
-        <record id="view_event_form_portal" model="ir.ui.view">
-            <field name="name">portal.event.form</field>
-            <field name="model">event.event</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[last()]" position="after">
-                    <page string="Portal Settings" groups="base.group_user">
-                        <group>
-                            <field name="visibility"/>
-                        </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 926e4fdd0f2..6177ae5944e 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -2,17 +2,21 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Portal Visible Events</field>
-            <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">['|', ('visibility', '=', 'public'), ('message_follower_ids','in', [user.partner_id.id])]</field>
+        <record model="ir.rule" id="event_event_portal_anonymous_rule">
+            <field name="name">Event: portal and anonymous users: public only</field>
+            <field name="model_id" ref="event.model_event_event"/>
+            <field name="domain_force">['|',
+                                            ('visibility', '=', 'public'),
+                                            ('message_follower_ids', 'in', [user.partner_id.id])
+                                        ]
+            </field>
             <field name="groups" eval="[(4, ref('portal.group_portal')), (4, ref('portal.group_anonymous'))]"/>
         </record>
 
-        <record id="portal_registration_rule" model="ir.rule">
-            <field name="name">Portal Personal Registrations</field>
-            <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('user_id','=',user.id)]</field>
+        <record model="ir.rule" id="event_registration_portal_anonymous_rule">
+            <field name="name">Event/Registration: portal and anonymous users: personal only</field>
+            <field name="model_id" ref="event.model_event_registration"/>
+            <field name="domain_force">[('user_id', '=', user.id)]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal')), (4, ref('portal.group_anonymous'))]"/>
         </record>