[Erp5-report] r42611 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jan 24 09:38:25 CET 2011
Author: ivan
Date: Mon Jan 24 09:38:25 2011
New Revision: 42611
URL: http://svn.erp5.org?rev=42611&view=rev
Log:
All kind of gadget column renders use global gadget definitions now (rather than copy / paste code approach).
Allow more flexible renderer configuration from outside caller.
Modified:
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/WebSection_viewKnowledgePadColumn.xml
erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml?rev=42611&r1=42610&r2=42611&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] Mon Jan 24 09:38:25 2011
@@ -48,11 +48,15 @@
global columns python: options.get(\'columns\', 3);\n
global hasUserActivity python: here.ERP5Site_hasUserActivity(active_knowledge_pad, **kw);\n
global isAnon python: here.portal_membership.isAnonymousUser();\n
- global createDefaultPadForUser python: len(knowledge_pads)==0 and not hasUserActivity;\n
global waitForActivitiesOnServer python: active_knowledge_pad is None and hasUserActivity;\n
global isUserAllowedToCreateKnowledgePads context/Base_isUserAllowedToUseKnowledgePad;\n
global isKnowledgePadTemplateUsed python: request.get(\'is_knowledge_pad_template_used\', 0);\n
global isAnonymousKnowledgePadUsed python: request.get(\'use_anonymous_knowledge_pad\', False);\n
+ dummy python: request.set(\'is_anonymous_knowledge_pad_used\', isAnonymousKnowledgePadUsed); \n
+ global createDefaultPadForUser python: options.get(\'create_default_pad\', False) and \n
+ len(knowledge_pads)==0 and not hasUserActivity;\n
+ global make_security_check python: options.get(\'make_security_check\', False);\n
+ global pad_column python: options.get(\'pad_column\', 0);\n
global cancel_url here/absolute_url;"></tal:block>\n
</tal:block>\n
\n
@@ -72,7 +76,7 @@
\n
<tal:block metal:define-macro="knowledge_pad_security_check">\n
\n
- <div tal:condition="python: not ( isUserAllowedToCreateKnowledgePads or isAnon or isAnonymousKnowledgePadUsed)">\n
+ <div tal:condition="python: not (isUserAllowedToCreateKnowledgePads or isAnon or isAnonymousKnowledgePadUsed)">\n
<div class="wait_block">\n
<p i18n:translate="" i18n:domain="ui"> \n
You are not allowed to use knowledge pad system due to security restrictions.\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/WebSection_viewKnowledgePadColumn.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/WebSection_viewKnowledgePadColumn.xml?rev=42611&r1=42610&r2=42611&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/WebSection_viewKnowledgePadColumn.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/WebSection_viewKnowledgePadColumn.xml [utf8] Mon Jan 24 09:38:25 2011
@@ -36,35 +36,13 @@
<key> <string>_text</string> </key>
<value> <unicode encoding="cdata"><![CDATA[
+<span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/global_definitions"/>\n
+\n
<tal:block \n
- tal:define="mode python: options.get(\'mode\', \'web_section\');\n
- default_pad_group python: options.get(\'default_pad_group\', None);\n
- kw python: dict(mode=mode, default_pad_group=default_pad_group);\n
- isAnonymousKnowledgePadUsed python: options.get(\'use_anonymous_knowledge_pad\', False);\n
- pad_column python: options.get(\'pad_column\', 0);\n
- create_default_pad python: options.get(\'create_default_pad\', False);\n
- make_security_check python: options.get(\'make_security_check\', False);\n
- dummy python: request.set(\'is_anonymous_knowledge_pad_used\', isAnonymousKnowledgePadUsed);\n
- knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(**kw);\n
- struct python: here.ERP5Site_getActiveKnowledgePadForUser(knowledge_pads, **kw);\n
- active_knowledge_pad python: struct[0];\n
- knowledge_pads python: struct[1];\n
- hasUserActivity python: here.ERP5Site_hasUserActivity(active_knowledge_pad, **kw);\n
- isAnon python: context.portal_membership.isAnonymousUser();\n
- createDefaultPadForUser python: len(knowledge_pads)==0 and\n
- not hasUserActivity and create_default_pad;\n
- waitForActivitiesOnServer python: active_knowledge_pad is None and\n
- hasUserActivity;\n
- current_web_section python:\n
- context.REQUEST.get(\'current_web_section\', here);\n
+ tal:define="current_web_section python: context.REQUEST.get(\'current_web_section\', here);\n
current_web_section python:\n
- test(current_web_section.getPortalType()==\'Web Site\',\n
- here, current_web_section);\n
+ test(current_web_section.getPortalType()==\'Web Site\', here, current_web_section);\n
current_web_section_url python: current_web_section.absolute_url();\n
- isUserAllowedToCreateKnowledgePads\n
- context/Base_isUserAllowedToUseKnowledgePad;\n
- isKnowledgePadTemplateUsed python:\n
- request.get(\'is_knowledge_pad_template_used\', 0);\n
cancel_url string:${current_web_section_url}/view">\n
\n
<tal:block tal:condition="python: not createDefaultPadForUser and \n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=42611&r1=42610&r2=42611&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Mon Jan 24 09:38:25 2011
@@ -1 +1 @@
-683
\ No newline at end of file
+685
\ No newline at end of file
More information about the Erp5-report
mailing list