[Erp5-report] r40948 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Dec 1 08:51:32 CET 2010
Author: ivan
Date: Wed Dec 1 08:51:32 2010
New Revision: 40948
URL: http://svn.erp5.org?rev=40948&view=rev
Log:
Use preference API.
Do not show tab navigation when user is not actually allowed to switch between tabds (i.e. pads).
Modified:
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_getActiveGlobalKnowledgePadPreference.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getKnowledgePadListForUser.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_viewHomeAreaRenderer.xml
erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_getActiveGlobalKnowledgePadPreference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_getActiveGlobalKnowledgePadPreference.xml?rev=40948&r1=40947&r2=40948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_getActiveGlobalKnowledgePadPreference.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_getActiveGlobalKnowledgePadPreference.xml [utf8] Wed Dec 1 08:51:32 2010
@@ -50,12 +50,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>user_pref = None\n
-global_preference_list = context.portal_preferences.searchFolder(portal_type=\'Preference\',\n
- preference_state=\'global\')\n
-if len(global_preference_list):\n
- user_pref = global_preference_list[0].getObject()\n
-return user_pref\n
+ <value> <string>return context.portal_preferences.getActivePreference()\n
</string> </value>
</item>
<item>
@@ -88,13 +83,8 @@ return user_pref\n
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>None</string>
- <string>user_pref</string>
<string>_getattr_</string>
<string>context</string>
- <string>global_preference_list</string>
- <string>len</string>
- <string>_getitem_</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml?rev=40948&r1=40947&r2=40948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getActiveKnowledgePadForUser.xml [utf8] Wed Dec 1 08:51:32 2010
@@ -87,7 +87,6 @@ for knowledge_pad in knowledge_pads:\n
return knowledge_pad, knowledge_pads\n
elif publication_section == None and default_pad_group in MARKER and pad_state in visible_state_list:\n
# ERP5 Site front gadget \n
- \n
return knowledge_pad, knowledge_pads \n
\n
\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getKnowledgePadListForUser.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getKnowledgePadListForUser.xml?rev=40948&r1=40947&r2=40948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getKnowledgePadListForUser.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_getKnowledgePadListForUser.xml [utf8] Wed Dec 1 08:51:32 2010
@@ -50,7 +50,11 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>def filterKnowledgePadListForContext(results, mode, \n
+ <value> <string>request = context.REQUEST\n
+isAnon = context.portal_membership.isAnonymousUser()\n
+isAnonymousKnowledgePadUsed = request.get(\'is_anonymous_knowledge_pad_used\', 0);\n
+\n
+def filterKnowledgePadListForContext(results, mode, \n
default_pad_group):\n
# when we use URL as a way to determine site\'s language do not\n
# use (especially for Web Site\'s root) current context which is the language\n
@@ -74,9 +78,7 @@
x.getGroup() == default_pad_group, results)\n
return results\n
\n
-request = context.REQUEST\n
-isAnon = context.portal_membership.isAnonymousUser()\n
-isAnonymousKnowledgePadUsed = request.get(\'is_anonymous_knowledge_pad_used\', 0);\n
+\n
kw = {\'portal_type\': \'Knowledge Pad\',\n
\'sort_on\': ((\'creation_date\', \'ascending\',),),\n
\'limit\': 50,}\n
@@ -109,6 +111,7 @@ if active_pad is not None and active_pad
results = filterKnowledgePadListForContext(results, mode, \n
default_pad_group)\n
\n
+\n
if not len(results) and not isAnon:\n
# try getting default knowledge pads for user from global site preference\n
user_pref = context.Base_getActiveGlobalKnowledgePadPreference()\n
@@ -163,12 +166,12 @@ return results\n
<tuple>
<string>mode</string>
<string>default_pad_group</string>
- <string>filterKnowledgePadListForContext</string>
<string>_getattr_</string>
<string>context</string>
<string>request</string>
<string>isAnon</string>
<string>isAnonymousKnowledgePadUsed</string>
+ <string>filterKnowledgePadListForContext</string>
<string>kw</string>
<string>_apply_</string>
<string>results</string>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_viewHomeAreaRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_viewHomeAreaRenderer.xml?rev=40948&r1=40947&r2=40948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_viewHomeAreaRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/ERP5Site_viewHomeAreaRenderer.xml [utf8] Wed Dec 1 08:51:32 2010
@@ -60,10 +60,8 @@
not waitForActivitiesOnServer and\n
active_knowledge_pad is not None">\n
\n
- <!-- Pad navigation -->\n
- <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/navigation"/>\n
-\n
<tal:block tal:condition="not: isAnon"> \n
+ <span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/navigation"/>\n
<span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/knowledge_pad_security_check"/> \n
<span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/disable_server_integration"/>\n
<span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/disable_server_integration"/> \n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=40948&r1=40947&r2=40948&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Wed Dec 1 08:51:32 2010
@@ -1 +1 @@
-633
\ No newline at end of file
+634
\ No newline at end of file
More information about the Erp5-report
mailing list