[Erp5-report] r32761 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Feb 18 12:55:15 CET 2010
Author: ivan
Date: Thu Feb 18 12:55:12 2010
New Revision: 32761
URL: http://svn.erp5.org?rev=32761&view=rev
Log:
Follow up r32741
Modified:
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnThree.xml
erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnTwo.xml
erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml?rev=32761&r1=32760&r2=32761&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml [utf8] Thu Feb 18 12:55:12 2010
@@ -47,24 +47,22 @@
tal:define="isAnon python: context.portal_membership.isAnonymousUser();\n
mode python: \'web_section\';\n
default_pad_group python: options.get(\'default_pad_group\', None);\n
- knowledge_pads python: \n
- here.ERP5Site_getKnowledgePadListForUser(mode=mode,\n
- default_pad_group=default_pad_group);\n
- struct python:\n
- here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \n
- default_pad_group);\n
+ knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(\n
+ mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ struct python: here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \n
+ default_pad_group);\n
active_knowledge_pad python: struct[0];\n
knowledge_pads python: struct[1];\n
- hasUserActivity python:\n
- here.ERP5Site_hasUserActivity(active_knowledge_pad,\n
- mode=\'web_section\');\n
- pending_activities python: active_knowledge_pad is None or \n
- hasUserActivity;\n
- createDefaultPadForUser python: len(knowledge_pads)==0 and\n
+ hasUserActivity python: here.ERP5Site_hasUserActivity(\n
+ active_knowledge_pad,\n
+ mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ isAnon python: context.portal_membership.isAnonymousUser();\n
+ createDefaultPadForUser python: len(knowledge_pads)==0 and\n
+ not hasUserActivity;\n
+ waitForActivitiesOnServer python: active_knowledge_pad is None and\n
hasUserActivity;\n
- waitForActivitiesOnServer python: pending_activities and \n
- len(knowledge_pads)>=1 and \n
- active_knowledge_pad is None;\n
current_web_section python:\n
context.REQUEST.get(\'current_web_section\', here);\n
current_web_section python:\n
@@ -107,8 +105,9 @@
\n
</tal:block>\n
\n
- <div tal:condition="python: createDefaultPadForUser and not isAnon \n
- and isUserAllowedToCreateKnowledgePads">\n
+ <div tal:condition="python: not isAnon and\n
+ createDefaultPadForUser and \n
+ isUserAllowedToCreateKnowledgePads">\n
\n
<div class="wait_block">\n
<h6 i18n:translate="" i18n:domain="ui"> \n
@@ -122,8 +121,8 @@
tal:content="structure python: \n
\'\'\'createDefaultPadOnServer(5000,\n
\'%s/ERP5Site_createDefaultKnowledgePadListForUser\', \n
- \'%s\', \'%s/view\', \'web_section\');\'\'\' \n
- %(current_web_section_url, default_pad_group, current_web_section_url)">\n
+ \'%s\', \'%s/view\', \'%s\');\'\'\' \n
+ %(current_web_section_url, default_pad_group, current_web_section_url, mode)">\n
</script>\n
</div>\n
\n
@@ -132,9 +131,7 @@
<span metal:use-macro="container/Base_viewKnowledgePadMacroLibrary/macros/knowledge_pad_security_check"> Security check\n
</span>\n
\n
- </tal:block>\n
-\n
-
+ </tal:block>
]]></string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnThree.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnThree.xml?rev=32761&r1=32760&r2=32761&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnThree.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnThree.xml [utf8] Thu Feb 18 12:55:12 2010
@@ -41,24 +41,24 @@
<tal:block \n
tal:define="isAnon python: context.portal_membership.isAnonymousUser();\n
+ mode python: \'web_section\';\n
default_pad_group python: options.get(\'default_pad_group\', None);\n
- knowledge_pads python: \n
- here.ERP5Site_getKnowledgePadListForUser(mode=\'web_section\',\n
- default_pad_group=default_pad_group);\n
- struct python:\n
- here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \n
- default_pad_group);\n
- active_knowledge_pad python: struct[0];\n
- knowledge_pads python: struct[1];\n
- hasUserActivity python:\n
- here.ERP5Site_hasUserActivity(active_knowledge_pad);\n
- pending_activities python: active_knowledge_pad is None or \n
- hasUserActivity;\n
- createDefaultPadForUser python: len(knowledge_pads)==0 and\n
- hasUserActivity;\n
- waitForActivitiesOnServer python: pending_activities and \n
- len(knowledge_pads)>=1 and \n
- active_knowledge_pad is None;\n
+ knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(\n
+ mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ struct python: here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \n
+ default_pad_group);\n
+ active_knowledge_pad python: struct[0];\n
+ knowledge_pads python: struct[1];\n
+ hasUserActivity python: here.ERP5Site_hasUserActivity(\n
+ active_knowledge_pad,\n
+ mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ isAnon python: context.portal_membership.isAnonymousUser();\n
+ createDefaultPadForUser python: len(knowledge_pads)==0 and\n
+ not hasUserActivity;\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
current_web_section python:\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnTwo.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnTwo.xml?rev=32761&r1=32760&r2=32761&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnTwo.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnTwo.xml [utf8] Thu Feb 18 12:55:12 2010
@@ -41,24 +41,24 @@
<tal:block \n
tal:define="isAnon python: context.portal_membership.isAnonymousUser();\n
+ mode python: \'web_section\';\n
default_pad_group python: options.get(\'default_pad_group\', None);\n
- knowledge_pads python: \n
- here.ERP5Site_getKnowledgePadListForUser(mode=\'web_section\',\n
- default_pad_group=default_pad_group);\n
- struct python:\n
- here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \n
- default_pad_group);\n
+ knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(\n
+ mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ struct python: here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \n
+ default_pad_group);\n
active_knowledge_pad python: struct[0];\n
knowledge_pads python: struct[1];\n
- hasUserActivity python:\n
- here.ERP5Site_hasUserActivity(active_knowledge_pad);\n
- pending_activities python: active_knowledge_pad is None or \n
- hasUserActivity;\n
- createDefaultPadForUser python: len(knowledge_pads)==0 and\n
- hasUserActivity;\n
- waitForActivitiesOnServer python: pending_activities and \n
- len(knowledge_pads)>=1 and \n
- active_knowledge_pad is None;\n
+ hasUserActivity python: here.ERP5Site_hasUserActivity(\n
+ active_knowledge_pad,\n
+ mode=mode,\n
+ default_pad_group=default_pad_group);\n
+ isAnon python: context.portal_membership.isAnonymousUser();\n
+ createDefaultPadForUser python: len(knowledge_pads)==0 and\n
+ not hasUserActivity;\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
current_web_section python:\n
Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=32761&r1=32760&r2=32761&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Thu Feb 18 12:55:12 2010
@@ -1,1 +1,1 @@
-478
+480
More information about the Erp5-report
mailing list