[Erp5-report] r36441 ivan - in /erp5/trunk/bt5/erp5_discussion: SkinTemplateItem/portal_ski...

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Jun 18 08:04:40 2010
New Revision: 36441

URL: http://svn.erp5.org?rev=36441&view=rev
Log:
Return consistent result no matter if user has or not enabled preference.

Modified:
    erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml
    erp5/trunk/bt5/erp5_discussion/bt/revision

Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml?rev=36441&r1=36440&r2=36441&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ERP5Site_getUserPreferredForumSettingsDict.xml [utf8] Fri Jun 18 08:04:40 2010
@@ -60,17 +60,17 @@ from Products.ERP5Type.Cache import Cach
 \n
 portal = context.getPortalObject()\n
 def getPreferredForumSignature(username):\n
+  result = {\'preferred_forum_signature\': None,\n
+            \'preferred_forum_quote_original_message\': False}\n
   preference = portal.portal_catalog.getResultValue(\n
                                        portal_type=\'Preference\',\n
                                        owner = username,\n
                                        preference_state=\'enabled\')\n
   if preference is not None:\n
-    return {\'preferred_forum_signature\': preference.getProperty(\'preferred_forum_signature\', None),\n
-             \'preferred_forum_quote_original_message\': preference.getProperty(\'preferred_forum_quote_original_message\', False),\n
-            }\n
-  else:\n
-    return {}\n
-\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
+  return result\n
+  \n
 getPreferredForumSignature = CachingMethod(getPreferredForumSignature,\n
                                ("ERP5Site_getUserPreferredForumSettingsDict", username),\n
                                 cache_factory=\'erp5_ui_short\')\n

Modified: erp5/trunk/bt5/erp5_discussion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/revision?rev=36441&r1=36440&r2=36441&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/revision [utf8] Fri Jun 18 08:04:40 2010
@@ -1 +1 @@
-66
\ No newline at end of file
+67
\ No newline at end of file