From de52e90cfa15286c0e360ec782fe9d42f98ac23a Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Fri, 20 Sep 2013 18:34:49 +0530
Subject: [ADD]: add an option in chatter 'display_log_button', that is true
 for employee action, and False for portal action

bzr revid: aja@tinyerp.com-20130920130449-8c5z33tgegftdxu3
---
 addons/mail/static/src/xml/mail.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index e6c84eaa5df..182346cc832 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -51,8 +51,10 @@
                 <div class="field_text oe_compact oe_compact_record">
                     <a class="oe_compose_post" t-if="widget.options.compose_placeholder"><t t-raw="widget.options.compose_placeholder"/></a>
                     <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a>
-                    <span class="oe_grey oe_sep_word">or</span>
-                    <a class="oe_compose_log">Log a note</a>
+                    <t t-if="widget.options.display_log_button">
+                       <span class="oe_grey oe_sep_word">or</span>
+                       <a class="oe_compose_log">Log a note</a>
+                    </t>
                 </div>
             </t>
         </div>
-- 
cgit v1.2.3


From 6b4a1a3d55dfcc671d5741e7774bf07e4573bb57 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 26 Sep 2013 18:53:22 +0530
Subject: [IMP]: Rename log a note to Log an internal note

bzr revid: aja@tinyerp.com-20130926132322-pvu18fr5w24lc18m
---
 addons/mail/static/src/xml/mail.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 182346cc832..c3a118db50f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -34,7 +34,7 @@
                     <div class="oe_msg_attachment_list"></div>
                     <button class="oe_post">
                         <t t-if="!widget.is_log">Send</t>
-                        <t t-if="widget.is_log">Log a note</t>
+                        <t t-if="widget.is_log">Log an internal note</t>
                     </button>
                     <t t-call="mail.compose_message.add_attachment"/>
                 </div>
@@ -53,7 +53,7 @@
                     <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a>
                     <t t-if="widget.options.display_log_button">
                        <span class="oe_grey oe_sep_word">or</span>
-                       <a class="oe_compose_log">Log a note</a>
+                       <a class="oe_compose_log">Log an internal note</a>
                     </t>
                 </div>
             </t>
@@ -157,7 +157,7 @@
             </t>
         </div>
         <div t-if="widget.is_log">
-            <span>Attach a note that will not be sent to the followers</span>
+            <span>Add an internal note that will not be sent to the followers</span>
         </div>
     </t>
 
-- 
cgit v1.2.3


From 217fdcba70b68f0ac1dc2d324ceed2eaaec8773c Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Wed, 9 Oct 2013 16:30:31 +0530
Subject: [IMP][REM]: Remove nobody if user have no rights on partner that will
 display 'portal to nobody 5 minutes ago' that will confuse to end user, now
 it display 'portal 5 minutes ago' if no rights.

bzr revid: aja@tinyerp.com-20131009110031-7jdsi3ic3eo3sb2m
---
 addons/mail/static/src/xml/mail.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'addons/mail/static/src/xml/mail.xml')

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index c3a118db50f..31539e24ab3 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -295,9 +295,9 @@
                         logged a note
                     </t>
                     <t t-if="(widget.type == 'comment' or widget.type == 'email') and (widget.subtype or widget.partner_ids.length > 0)">
-                        to
-                        <t t-if="widget.partner_ids.length == 0">
-                            nobody
+                        <!-- Remove nobody if user have no rights on partner that will display 'portal to nobody 5 minutes ago' that will confuse to end user, now it display 'portal 5 minutes ago' if no rights.-->
+                        <t t-if="widget.partner_ids.length > 0">
+                            to
                         </t>
                     </t>
                     <t t-if="widget.type == 'notification' or ( (widget.type == 'email' or widget.type == 'comment') and (widget.subtype or widget.partner_ids.length > 0))"
-- 
cgit v1.2.3