Merge remote branch 'origin/master'

bt5/erp5_discussion/PortalTypeTemplateItem/portal_types/Discussion%20Post.xml

@@ -2,7 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <global name="ERP5TypeInformation" module="Products.ERP5Type.ERP5Type"/>
+      <global name="Base Type" module="erp5.portal_type"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -61,7 +61,9 @@
         </item>
         <item>
             <key> <string>init_script</string> </key>
-            <value> <string>DiscussionPost_init</string> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>permission</string> </key>
@@ -77,6 +79,12 @@
             <key> <string>type_class</string> </key>
             <value> <string>TextDocument</string> </value>
         </item>
+        <item>
+            <key> <string>type_interface</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>type_mixin</string> </key>
             <value>
@@ -94,7 +102,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>
@@ -111,7 +121,9 @@
       <dictionary>
         <item>
             <key> <string>domain_name</string> </key>
-            <value> <none/> </value>
+            <value>
+              <none/>
+            </value>
         </item>
         <item>
             <key> <string>property_name</string> </key>

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_getAuthorDict.xml

@@ -56,7 +56,7 @@
 portal = context.getPortalObject()\n
 \n
 author = context.getSourceValue()\n
-result = {\'author_url\': \'#\',\n
+result = {\'author_url\': None,\n
           \'author_signature\': None,\n
           \'author_title\': context.Base_translateString(\'Unknown User\')}\n
 \n
@@ -68,6 +68,10 @@ if author is not None:\n
 return result\n
 </string> </value>
         </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
             <value>

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionPost_init.xml

-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_container</string> </key>
-                                <value> <string>container</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_context</string> </key>
-                                <value> <string>context</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_m_self</string> </key>
-                                <value> <string>script</string> </value>
-                            </item>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_body</string> </key>
-            <value> <string>context.setTextFormat(\'text/html\')\n
-</string> </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>**kw</string> </value>
-        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>DiscussionPost_init</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml

@@ -66,7 +66,8 @@ discussion_post = context.newContent(\n
                     source_value = person,\n
                     predecessor_value = predecessor,\n
                     version = version,\n
-                    language = language)\n
+                    language = language,\n
+                    text_format = \'text/html\')\n
 \n
 # depending on security model Post can be submited for review\n
 portal_status_message = "New post created in background."\n

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewAuthorWidget.xml

@@ -36,12 +36,18 @@
             <key> <string>_text</string> </key>
             <value> <unicode encoding="cdata"><![CDATA[
 
-<tal:block tal:define="author_dict python: here.DiscussionPost_getAuthorDict()">\n
+<tal:block tal:define="author_dict python: here.DiscussionPost_getAuthorDict();\n
+                       is_author_link_available python:author_dict[\'author_url\'] is not None;">\n
+\n
   <a class="listbox-row-discussion-thread-author-link"\n
      tal:attributes="href author_dict/author_url"\n
-     tal:content="author_dict/author_title"/>\n
-</tal:block>\n
-
+     tal:content="author_dict/author_title"\n
+     tal:condition="is_author_link_available"/>\n
+\n
+  <span tal:content="author_dict/author_title"\n
+        tal:condition="not:is_author_link_available"/>\n
+\n
+</tal:block>
 
 ]]></unicode> </value>
         </item>

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_viewLastPostWidget.xml

@@ -38,17 +38,22 @@
 
 <tal:block tal:define="last_post here/DiscussionThread_getLastPost;\n
                        author_dict last_post/DiscussionPost_getAuthorDict;\n
-                       ">\n
+                       is_author_link_available python:author_dict[\'author_url\'] is not None;">\n
+\n
   <a class="listbox-row-discussion-thread-last-post-by-author-link"\n
      tal:attributes="href author_dict/author_url"\n
-     tal:content="author_dict/author_title"/> \n
+     tal:content="author_dict/author_title"\n
+     tal:condition="is_author_link_available"/>\n
+\n
+  <span tal:content="author_dict/author_title"\n
+        tal:condition="not:is_author_link_available"/>\n
+ \n
   <a class="listbox-row-discussion-thread-last-post-link"\n
      tal:attributes="href python: \'%s/view?list_start=%s&reset=1#%s\' %(here.absolute_url(), last_post.getId(), last_post.getUid())"> \n
     <img src="document_icon.gif" alt="Link To Post"/>\n
   </a>\n
  \n
-</tal:block>\n
-
+</tal:block>
 
 ]]></unicode> </value>
         </item>

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml

@@ -65,7 +65,7 @@ def getPreferredForumSignature(username):\n
                                        preference_state=\'enabled\')\n
   if preference is not None:\n
     result[\'preferred_forum_signature\'] = preference.getProperty(\'preferred_forum_signature\', None)\n
-    result[\'preferred_forum_quote_original_message\'] = preference.getProperty(\'preferred_forum_quote_original_message\', False)\n
+    result[\'preferred_forum_quote_original_message\'] = preference.getProperty(\'preferred_forum_quote_original_message\', True)\n
   return result\n
   \n
 getPreferredForumSignature = CachingMethod(getPreferredForumSignature,\n

bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_viewDiscussionThreadForm/listbox.xml

@@ -279,6 +279,14 @@
                           <string>response_count</string>
                           <string></string>
                         </tuple>
+                        <tuple>
+                          <string>author</string>
+                          <string></string>
+                        </tuple>
+                        <tuple>
+                          <string>last_post</string>
+                          <string></string>
+                        </tuple>
                         <tuple>
                           <string>title</string>
                           <string>ListBox_getDiscussionThreadUrl</string>

bt5/erp5_discussion/bt/revision

-92
+94
\ No newline at end of file