Commit e541755a authored by Thibault Delavallée's avatar Thibault Delavallée
Browse files

[MOV] portal: moved portal group into base. 

Updated security rules. Basic res_partner rules are moved into base. Added rule with website_published.

bzr revid: tde@openerp.com-20131008113545-gpqydx0b199lcqpy
parent 56776516

addons/crm_partner_assign/portal_data.xml

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
        <record id="res_partner_access" model="ir.model.access">

            <field name="name">openerp.portal.res.partner</field>

            <field name="model_id" ref="base.model_res_partner"/>

            <field name="group_id" ref="portal.group_portal"/>

            <field name="group_id" ref="base.group_portal"/>

            <field name="perm_read" eval="1"/>

            <field name="perm_create" eval="0"/>

            <field name="perm_write" eval="0"/>
@@ -15,13 +15,13 @@ 
        <record id="res_partner_rule" model="ir.rule">

            <field name="name">openerp.portal.res.partner</field>

            <field name="model_id" ref="base.model_res_partner"/>

            <field name="groups" eval="[(6,0,[ref('portal.group_portal')])]"/>

            <field name="groups" eval="[(6,0,[ref('base.group_portal')])]"/>

            <field name="domain_force">[('id','child_of',user.commercial_partner_id.id)]</field>

        </record>

        <record id="res_partner_grade_access" model="ir.model.access">

            <field name="name">openerp.portal.res.partner.grade</field>

            <field name="model_id" ref="crm_partner_assign.model_res_partner_grade"/>

            <field name="group_id" ref="portal.group_portal"/>

            <field name="group_id" ref="base.group_portal"/>

            <field name="perm_read" eval="1"/>

            <field name="perm_create" eval="0"/>

            <field name="perm_write" eval="0"/>
@@ -32,13 +32,13 @@ 
        <record id="assigned_lead_portal_rule_1" model="ir.rule">

            <field name="name">openerp.portal.crm.lead</field>

            <field name="model_id" ref="crm.model_crm_lead"/>

            <field name="groups" eval="[(6,0,[ref('portal.group_portal')])]"/>

            <field name="groups" eval="[(6,0,[ref('base.group_portal')])]"/>

            <field name="domain_force">[('partner_assigned_id','child_of',user.commercial_partner_id.id)]</field>

        </record>

        <record id="lead_portal_access" model="ir.model.access">

            <field name="name">openerp.portal.crm.lead</field>

            <field name="model_id" ref="crm.model_crm_lead"/>

            <field name="group_id" ref="portal.group_portal"/>

            <field name="group_id" ref="base.group_portal"/>

            <field name="perm_read" eval="1"/>

            <field name="perm_create" eval="0"/>

            <field name="perm_write" eval="1"/>

addons/crm_partner_assign/wizard/crm_forward_to_partner.py

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ class crm_lead_forward_to_partner(osv.TransientModel): 
            raise osv.except_osv(_('Email Template Error'),

                                 _('The Forward Email Template is not in the database'))

        try:

            portal_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal', 'group_portal')[1]

            portal_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_portal')[1]

        except ValueError:

            raise osv.except_osv(_('Portal Group Error'),

                                 _('The Portal group cannot be found'))

addons/event/event_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ 
                                </i>

                              </t>

                            </p>

                            <div groups="base.group_user,portal.group_portal">

                            <div groups="base.group_user,base.group_portal">

                                <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999">

                                  <t t-if="!record.is_subscribed.raw_value">

                                    <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>

addons/portal/__openerp__.py

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ very handy when used in combination with the module 'share'. 
        'wizard/share_wizard_view.xml',

        'acquirer_view.xml',

        'security/ir.model.access.csv',

        'security/portal_security.xml',

    ],

    'demo': ['portal_demo.xml'],

    'css': ['static/src/css/portal.css'],

addons/portal/portal_data.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    <data noupdate="1">



        <!-- The portal group -->

        <record id="group_portal" model="res.groups">

        <record id="base.group_portal" model="res.groups">

            <field name="name">Portal</field>

            <field name="comment">Portal members have specific access rights (such as record rules and restricted menus).

                They usually do not belong to the usual OpenERP groups.</field>