From 8cd3602a9f30b5943161b67a8a8731583ee01111 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 4 Mar 2013 15:12:40 +0100
Subject: [PATCH] [IMP] issue: dynamic_help

bzr revid: chm@openerp.com-20130304141240-mpbtizm2y8r01456
---
 addons/crm/crm_salesteams.xml               |  8 +++++---
 addons/mail/mail_thread.py                  | 11 +++--------
 addons/mail/static/src/css/mail.css         |  4 ----
 addons/project/project.py                   |  1 -
 addons/project/project_view.xml             | 15 +++++++++------
 addons/project_issue/project_issue.py       |  6 ++++++
 addons/project_issue/project_issue_view.xml |  7 ++++---
 7 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/addons/crm/crm_salesteams.xml b/addons/crm/crm_salesteams.xml
index 9609d43ff4b..5d54c7c44d0 100644
--- a/addons/crm/crm_salesteams.xml
+++ b/addons/crm/crm_salesteams.xml
@@ -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>
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 9b38384b194..e4da87182ea 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -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):
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 1ffcb014b54..2f73217eb21 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -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;
diff --git a/addons/project/project.py b/addons/project/project.py
index a35ecfe4ece..b3f56967815 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -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)
 
     # ----------------------------------------
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index da05f4ba259..6698a7739ed 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -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">
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 8eb7281cd24..d190a8d0f47 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -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
     # -------------------------------------------------------
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 2cdf8f0c943..ca45c88a587 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -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>