From c49cf8d83501bcd22253d7e8a69f5bc0e93c51ef Mon Sep 17 00:00:00 2001
From: Boxiang Sun <boxiang.sun@nexedi.com>
Date: Tue, 9 Jan 2018 17:52:46 +0100
Subject: [PATCH] erp5_officejs_support_request, erp5_post: Pass follow-up by
 value

Avoids the double-nonsense of looking the document up by path inside callee (!)
using the catalog (!!).
Also, follow naming conventions: variables containing documents should end
in _value, not in _object.

Vincent Pelletier:
- commit message
- remove unrelated change
- squash similar similar-intent commits even though they apply to
  different BTs
---
 .../PostModule_createHTMLPostForSupportRequest.py           | 6 +++---
 .../PostModule_createHTMLPostForSupportRequest.xml          | 2 +-
 .../SupportRequestModule_createSupportRequest.py            | 2 +-
 .../portal_skins/erp5_post/PostModule_createHTMLPost.py     | 6 +-----
 .../portal_skins/erp5_post/PostModule_createHTMLPost.xml    | 2 +-
 .../erp5_post/PostModule_createHTMLPostFromText.py          | 2 +-
 .../erp5_post/PostModule_createHTMLPostFromText.xml         | 2 +-
 7 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py
index 3c4ff3697e..9e71142592 100644
--- a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py
+++ b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.py
@@ -1,7 +1,7 @@
-follow_up_object, = context.getPortalObject().portal_catalog(relative_url=follow_up, limit=1)
-follow_up_object.edit()  # update modification date
+follow_up_value.edit()  # update modification date
+
 post = context.PostModule_createHTMLPostFromText(
-  follow_up=follow_up,
+  follow_up_value=follow_up_value,
   data=data,
 )
 
diff --git a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.xml b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.xml
index b89afd46e3..2e98ab9de0 100644
--- a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.xml
+++ b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/PostModule_createHTMLPostForSupportRequest.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>follow_up, predecessor, data, file</string> </value>
+            <value> <string>follow_up_value, predecessor, data, file</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>
diff --git a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_createSupportRequest.py b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_createSupportRequest.py
index 34d492e1db..d221194012 100644
--- a/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_createSupportRequest.py
+++ b/bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/SupportRequestModule_createSupportRequest.py
@@ -38,7 +38,7 @@ support_request.immediateReindexObject()
 
 if description is not None or file is not None:
   portal.post_module.PostModule_createHTMLPostForSupportRequest(
-    follow_up=support_request.getRelativeUrl(),  # XXX give support_request as follow_up_value
+    follow_up_value=support_request,
     predecessor=None,
     data="" if description is None else description,
     file=file,
diff --git a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.py b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.py
index cda834680a..91526ad67f 100644
--- a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.py
+++ b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.py
@@ -3,14 +3,10 @@ portal = context.getPortalObject()
 # create an HTML Post
 post_module = portal.post_module
 
-# get the related object
-follow_up_object, = portal.portal_catalog(relative_url=follow_up, limit=2)
-follow_up_object = follow_up_object.getObject()
-
 now = DateTime()
 post_edit_kw = {
   "start_date": now,
-  "follow_up_value": follow_up_object,
+  "follow_up_value": follow_up_value,
   "text_content": data,
 }
 if predecessor is not None:
diff --git a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.xml b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.xml
index e06b4a18dd..ea98994ee5 100644
--- a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.xml
+++ b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPost.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>follow_up, data, predecessor=None</string> </value>
+            <value> <string>follow_up_value, data, predecessor=None</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
diff --git a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.py b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.py
index 7504778448..d522430704 100644
--- a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.py
+++ b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.py
@@ -1,5 +1,5 @@
 return context.PostModule_createHTMLPost(
-  follow_up=follow_up,
+  follow_up_value=follow_up_value,
   predecessor=predecessor,
   data="<p>" + data.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("  ", " &nbsp;").replace("\n", "<br/>") + "</p>",
 )
diff --git a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.xml b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.xml
index 4168d1e754..59a56c8048 100644
--- a/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.xml
+++ b/bt5/erp5_post/SkinTemplateItem/portal_skins/erp5_post/PostModule_createHTMLPostFromText.xml
@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>follow_up, data, predecessor=None</string> </value>
+            <value> <string>follow_up_value, data, predecessor=None</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
-- 
2.30.9