odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] issue: dynamic_help 

bzr revid: chm@openerp.com-20130304141240-mpbtizm2y8r01456
This commit is contained in:
Christophe Matthieu 2013-03-04 15:12:40 +01:00
parent ddbb442bcf
commit 8cd3602a9f
7 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/crm/crm_salesteams.xml
View File

@ -161,10 +161,12 @@
<field name="active"/>
</group>
<group colspan="4">
<field name="alias_id" invisible="1" required="0"/>
<label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<label for="alias_id"/>
<div class="oe_inline" attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
<span class="oe_edit_only" name="edit_alias">
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
</span>
</div>
</group>
</group>

11
addons/mail/mail_thread.py
View File

@ -93,25 +93,20 @@ class mail_thread(osv.AbstractModel):
if not context.get('dynamic_help_model', None):
return help
alias_txt = ""
if context.get('dynamic_help_id', None):
object_id = self.pool.get(context.get('dynamic_help_model')).browse(cr, uid, context.get('dynamic_help_id'), context=context)
alias = object_id.alias_id and object_id.alias_id.name_get() or False
if alias and alias[0] and alias[0][1]:
alias_txt = alias[0][1]
email = alias[0][1]
return "%s %s" % (help, _("<div class='oe_view_nocontent_create_alias'>You can also create %s by sending an email to: <b>%s</b></div>" % (context.get('dynamic_help_documents', _("documents")), email)))
else:
model_id = self.pool.get('ir.model').search(cr, uid, [("model", "=", self._name)], context=context)[0]
alias_obj = self.pool.get('mail.alias')
alias_nb = 0
alias_ids = alias_obj.search(cr, uid, [("alias_model_id", "=", model_id)], context=context, limit=5)
if alias_ids:
for alias in alias_obj.browse(cr, uid, alias_ids, context=context):
email = "%s@%s" % (alias.alias_name, alias.alias_domain)
alias_txt = "%s%s%s" % (alias_txt, (alias_nb and ", " or " "), email)
alias_nb += 1
if alias_txt:
help = "%s %s" % (help, _("<div class='oe_view_nocontent_create_alias'>You can also create %s by sending an email to: <b>%s</b></div>" % (context.get('dynamic_help_documents', _("documents")), alias_txt)))
return "%s %s" % (help, _("<div class='oe_view_nocontent_create_alias'>You can also create %s by sending an email. <br/>For example send an email to: <b>%s</b></div>" % (context.get('dynamic_help_documents', _("documents")), email)))
return help
def _get_message_data(self, cr, uid, ids, name, args, context=None):

4
addons/mail/static/src/css/mail.css
View File

@ -4,10 +4,6 @@
* 'button' element wich comes with a lot of inappropriate
* styling. Entypo is also a headache to center properly
* */
.openerp .oe_form_editable .oe_read_only {
display: none;
}
.openerp .oe_topbar_item.oe_topbar_compose_full_email{
padding: 0px;
width: 32px;

1
addons/project/project.py
View File

@ -894,7 +894,6 @@ class task(base_stage, osv.osv):
context['dynamic_help_model'] = 'project.project'
context['dynamic_help_id'] = context.get('default_project_id', None)
context['dynamic_help_documents'] = _("tasks")
print context
return super(task, self).dynamic_help(cr, uid, help, context=context)
# ----------------------------------------

15
addons/project/project_view.xml
View File

@ -104,12 +104,6 @@
<group>
<field name="privacy_visibility"/>
<field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
<field name="alias_id" invisible="1" required="0"/>
<label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
</div>
</group>
<group>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
@ -118,6 +112,15 @@
</p>
</group>
</group>
<group colspan="4">
<label for="alias_id"/>
<div class="oe_inline" attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
<span class="oe_edit_only" name="edit_alias">
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
</span>
</div>
</group>
<notebook>
<page string="Team" name="team">
<field colspan="4" name="members" widget="many2many_kanban">

6
addons/project_issue/project_issue.py
View File

@ -414,6 +414,12 @@ class project_issue(base_stage, osv.osv):
self.write(cr, uid, ids, {'date_open': False, 'date_closed': False})
return res
def dynamic_help(self, cr, uid, help, context=None):
context['dynamic_help_model'] = 'project.project'
context['dynamic_help_id'] = context.get('default_project_id', None)
context['dynamic_help_documents'] = _("issues")
return super(project_issue, self).dynamic_help(cr, uid, help, context=context)
# -------------------------------------------------------
# Stage management
# -------------------------------------------------------

7
addons/project_issue/project_issue_view.xml
View File

@ -332,9 +332,10 @@
<field name="priority" position="before">
<field name="project_escalation_id"/>
</field>
<field name="alias_domain" position="after">
<label for="alias_model" class="oe_edit_only" string="creates"/><field name="alias_model" class="oe_edit_only oe_inline"/>
</field>
<xpath expr='//span[@name="edit_alias"]' position='after'>
<label for="alias_model" string="creates" class="oe_inline"/>
<field name="alias_model" class="oe_inline" widget="radio"/>
</xpath>
</field>
</record>