[IMP] removing contextial access rights (setting as default values for searches)

bzr revid: fp@tinyerp.com-20100201082118-fql37t0rbk3sbhtu
This commit is contained in:
Fabien Pinckaers 2010-02-01 09:21:18 +01:00
parent da5c8f9584
commit a31a105e33
7 changed files with 86 additions and 210 deletions

View File

@ -908,8 +908,7 @@ class users(osv.osv):
_description = "Users"
_columns = {
'context_section_id': fields.selection(_section_get, 'Sales Section'),
}
}
users()

View File

@ -48,41 +48,41 @@
<field name="view_id" ref="crm_case_section_view_tree"/>
</record>
# ------------------------------------------------------
# Stage
# ------------------------------------------------------
<record model="ir.ui.view" id="crm_case_stage_tree">
<field name="name">crm.case.stage.tree</field>
<field name="model">crm.case.stage</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Stages">
<field name="sequence"/>
<field name="name"/>
<field name="section_id"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="crm_case_stage_form">
<field name="name">crm.case.stage.form</field>
<field name="model">crm.case.stage</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Stage">
<field name="name" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="object_id" invisible="1" />
<field name="sequence"/>
</form>
</field>
</record>
<record id="crm_case_stage_act" model="ir.actions.act_window">
<field name="name">Stages</field>
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm_case_stage_tree"/>
</record>
<menuitem id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
# ------------------------------------------------------
# Stage
# ------------------------------------------------------
<record model="ir.ui.view" id="crm_case_stage_tree">
<field name="name">crm.case.stage.tree</field>
<field name="model">crm.case.stage</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Stages">
<field name="sequence"/>
<field name="name"/>
<field name="section_id"/>
</tree>
</field>
</record>
<record model="ir.ui.view" id="crm_case_stage_form">
<field name="name">crm.case.stage.form</field>
<field name="model">crm.case.stage</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Stage">
<field name="name" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="object_id" invisible="1" />
<field name="sequence"/>
</form>
</field>
</record>
<record id="crm_case_stage_act" model="ir.actions.act_window">
<field name="name">Stages</field>
<field name="res_model">crm.case.stage</field>
<field name="view_type">form</field>
<field name="view_id" ref="crm_case_stage_tree"/>
</record>
<menuitem id="menu_crm_case_stage" name="Stages" parent="crm.menu_crm_configuration"/>
<!-- Case Categories -->
<record id="crm_case_categ-view" model="ir.ui.view">
<field name="name">crm.case.categ.form</field>
@ -92,7 +92,7 @@
<form string="Case Category">
<field name="name" select="1"/>
<field name="section_id" select="1" widget="selection"/>
<field name="object_id" invisible="1" />
<field name="object_id" invisible="1" />
<field name="probability"/>
</form>
</field>
@ -116,7 +116,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="crm_case_categ_tree-view"/>
</record>
<menuitem id="menu_crm_case_categ" name="Categories" parent="crm.menu_crm_configuration"/>
<menuitem id="menu_crm_case_categ" name="Categories" parent="crm.menu_crm_configuration"/>
<menuitem action="crm_case_section_act" id="menu_crm_case_section_act" parent="crm.menu_crm_configuration"/>
@ -185,8 +185,8 @@
<separator colspan="4" string="Server Action to be Triggered"/>
<field name="server_action_id"/>
<!--
<field name="act_method" colspan="4" readonly="1"/>
-->
<field name="act_method" colspan="4" readonly="1"/>
-->
</page>
<page string="E-Mail Actions">
<separator colspan="4" string="Template of Email to Send"/>
@ -243,11 +243,11 @@
<separator string="" colspan="4"/>
<newline/>
<field name="user_id"
attrs="{ 'required' : [('name','=','user')]}"
on_change="change_email(user_id, partner_id)"/>
attrs="{ 'required' : [('name','=','user')]}"
on_change="change_email(user_id, partner_id)"/>
<field name="partner_id"
attrs="{'required' : [('name','=','partner')]}"
on_change="change_email(user_id, partner_id)"/>
attrs="{'required' : [('name','=','partner')]}"
on_change="change_email(user_id, partner_id)"/>
<field name="email"/>
<button name="add_cc" string="Ok" type="object" icon="gtk-go-forward"/>
</form>
@ -350,15 +350,15 @@
<newline />
<notebook colspan="4">
<page string="General">
<group col="8" colspan="4">
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
<field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
<newline/>
<field colspan="3" name="email_from" select="2"/>
<button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
<field name="user_id" select="1"/>
<button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
</group>
<group col="8" colspan="4">
<field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/>
<field colspan="3" name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/>
<newline/>
<field colspan="3" name="email_from" select="2"/>
<button name="remind_partner" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
<field name="user_id" select="1"/>
<button name="remind_user" states="open,pending" string="Send Reminder" type="object" icon="gtk-go-forward"/>
</group>
<separator colspan="4" string="Description"/>
<field name="description" colspan="4" nolabel="1"/>
<separator colspan="4"/>
@ -402,8 +402,8 @@
<field name="canal_id"/>
<button
string="Add a CC"
name="%(crm.action_view_crm_email_add_cc_wizard)d"
icon="gtk-add" type="action"/>
name="%(crm.action_view_crm_email_add_cc_wizard)d"
icon="gtk-add" type="action"/>
</group>
<newline/>
<field name="description" colspan="4" nolabel="1"/>
@ -430,8 +430,8 @@
<search string="Search Case">
<group col='6' colspan='4'>
<filter icon="terp-partner" string="My Cases"
domain="[('user_id','=',uid)]" separator="1"
default="1" help="Cases Related to Current User"
domain="[('user_id','=',uid)]" separator="1"
default="1" help="Cases Related to Current User"
/>
<field name="state" select="1">
<filter icon="gtk-new" domain="[('state','=','draft')]" help="Draft Cases"/>
@ -442,11 +442,11 @@
<field name="name" select='1'/>
<field name="user_id" select="1" widget="selection"/>
</group>
<field name="section_id" select="1" widget="selection" string="Section"/>
<field name="section_id" select="1" widget="selection" string="Section"/>
</search>
</field>
</record>
<record id="crm_case_categ0-act" model="ir.actions.act_window">
<field name="name">Cases</field>
<field name="res_model">crm.case</field>
@ -502,17 +502,17 @@
<field name="model">crm.case.history</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Histories">
<filter icon="terp-crm" string="My Histories" domain="[('user_id','=',uid)]" help="My Histories"/>
<separator orientation="vertical"/>
<search string="Search Histories">
<filter icon="terp-crm" string="My Histories" domain="[('user_id','=',uid)]" help="My Histories"/>
<separator orientation="vertical"/>
<group col="6" colspan="2">
<field name="date" select="1"/>
<field name="date" select="1"/>
<field name="user_id" select="1" widget="selection"/>
<field name="section_id" select="1" widget="selection" string="Section"/>
</group>
<field name="section_id" select="1" widget="selection" string="Section"/>
</group>
</search>
</field>
</record>
</field>
</record>
<record id="crm_case_history-act" model="ir.actions.act_window">
<field name="name">Histories</field>
@ -634,30 +634,30 @@
<!-- <act_window domain="[('user_id', '=', active_id),('state','&lt;&gt;','done'),('state','&lt;&gt;','cancel'),('state','&lt;&gt;','pending')]" id="act_res_users_2_crm_case_opened" name="Open cases" res_model="crm.case" src_model="res.users" view_mode="tree,form,calendar" view_type="form"/>-->
<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
<record model="ir.ui.view" id="view_users_form_simple_modif_inherited1">
<field name="name">view.users.form.crm.modif.inherited1</field>
<field name="model">res.users</field>
<field name="inherit_id" ref="base.view_users_form_simple_modif" />
<field name="type">form</field>
<field name="arch" type="xml">
<page string="Current Activity" position="inside">
<page string="Current Activity" position="inside">
<field name="context_section_id" completion="1"/>
</page>
</field>
</record>
<record id="view_users_form_simple_modif_inherited2" model="ir.ui.view">
<field name="name">view.users.form.crm.modif.inherited2</field>
<field name="model">res.users</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_users_form"/>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="password" position="after">
<field name="context_section_id" completion="1"/>
</field>
</field>
</record>
<record id="view_users_form_simple_modif_inherited2" model="ir.ui.view">
<field name="name">view.users.form.crm.modif.inherited2</field>
<field name="model">res.users</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_users_form"/>
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="password" position="after">
<field name="context_section_id" completion="1"/>
</field>
</field>
</record>
</data>
</openerp>

View File

@ -18,94 +18,5 @@
<!-- <field name="groups_id" eval="[(6,0,[ref('group_crm_manager')])]"/>-->
<!-- </record>-->
<!--rule for meeting-->
<record model="ir.rule.group" id="crm_meeting_rule_group">
<field name="name">crm.meeting.rule</field>
<field name="model_id" search="[('model','=','crm.meeting')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_meeting_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_meeting_rule_group"/>
</record>
<!--rule for Claims-->
<record model="ir.rule.group" id="crm_claim_rule_group">
<field name="name">crm.claim.rule</field>
<field name="model_id" search="[('model','=','crm.claim')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_claim_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_claim_rule_group"/>
</record>
<!--rule for Fund Raising-->
<record model="ir.rule.group" id="crm_fundraising_rule_group">
<field name="name">crm.fundraising.rule</field>
<field name="model_id" search="[('model','=','crm.fundraising')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_fundraising_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_fundraising_rule_group"/>
</record>
<!--rule for HelpDesk-->
<record model="ir.rule.group" id="crm_helpdesk_rule_group">
<field name="name">crm.helpdesk.rule</field>
<field name="model_id" search="[('model','=','crm.helpdesk')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_helpdesk_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_helpdesk_rule_group"/>
</record>
<!--rule for leads-->
<record model="ir.rule.group" id="crm_leads_rule_group">
<field name="name">crm.leads.rule</field>
<field name="model_id" search="[('model','=','crm.lead')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_leads_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_leads_rule_group"/>
</record>
<!--rule for business opportunities-->
<record model="ir.rule.group" id="crm_opportunities_rule_group">
<field name="name">crm.opportunities.rule</field>
<field name="model_id" search="[('model','=','crm.opportunity')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_opportunities_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_opportunities_rule_group"/>
</record>
<!--rule for phone calls-->
<record model="ir.rule.group" id="crm_phone_calls_rule_group">
<field name="name">crm.phone.calls.rule</field>
<field name="model_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_phone_calls_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_phone_calls_rule_group"/>
</record>
<!--rule for cases-->
<record model="ir.rule.group" id="crm_case_rule_group">
<field name="name">crm.case.rule</field>
<field name="model_id" search="[('model','=','crm.case')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_case_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
<field name="rule_group" ref="crm_case_rule_group"/>
</record>
</data>
</openerp>

View File

@ -3,17 +3,6 @@
<data noupdate="1">
<!--rule for Jobs-->
<record model="ir.rule.group" id="crm_job_rule_group">
<field name="name">crm.job.rule</field>
<field name="model_id" search="[('model','=','crm.job')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record id="crm_job_rule" model="ir.rule">
<field name="domain_force">['|',('section_id','=',False),('section_id','=',user.context_section_id)]</field>
<field name="rule_group" ref="crm_job_rule_group"/>
</record>
</data>
</openerp>

View File

@ -146,8 +146,6 @@ class res_users(osv.osv):
'parent_id': fields.function(_parent_compute, relation='res.users',fnct_search=_parent_search, method=True, string="Managers", type='many2many'),
'child_ids': fields.function(_child_compute, relation='res.users', fnct_search=_child_search,method=True, string="Subordinates", type='many2many'),
}
res_users()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -29,13 +29,12 @@ class sale_order(osv.osv):
}
def _get_section(self, cr, uid, context):
user = self.pool.get('res.users').browse(cr,uid,uid,context=context)
return int(user.context_section_id)
return context.get('context_section_id',False)
_defaults = {
'section_id':_get_section
}
'section_id': _get_section
}
sale_order()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -2,26 +2,6 @@
<openerp>
<data noupdate="0">
<record model="ir.rule.group" id="sale_order_crm_rule_group">
<field name="name">Sale Order sale_crm</field>
<field name="model_id" search="[('model','=','sale.order')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="sale_order_comp_rule">
<field name="rule_group" ref="sale_order_crm_rule_group"/>
<field name="domain_force">['|',('section_id','=',False),('section_id','in',[user.context_section_id])]</field>
</record>
<record model="ir.rule.group" id="sale_order_line_crm_rule_group">
<field name="name">Sale Order Line sale_crm</field>
<field name="model_id" search="[('model','=','sale.order.line')]" model="ir.model"/>
<field name="global" eval="True"/>
</record>
<record model="ir.rule" id="sale_order_line_comp_rule">
<field name="rule_group" ref="sale_order_line_crm_rule_group"/>
<field name="domain_force">['|',('order_id.section_id','=',False),('order_id.section_id','in',[user.context_section_id])]</field>
</record>
</data>
</openerp>