Follow up r32741

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@32761 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml

@@ -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
+              knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(\n
+                                          mode=mode,\n
                                           default_pad_group=default_pad_group);\n
-              struct python:\n
-               here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \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
+              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>

bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnThree.xml

@@ -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
+               knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(\n
+                                             mode=mode,\n
                                              default_pad_group=default_pad_group);\n
-              struct python:\n
-               here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \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
+               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

bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnTwo.xml

@@ -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
+               knowledge_pads python: here.ERP5Site_getKnowledgePadListForUser(\n
+                                          mode=mode,\n
                                           default_pad_group=default_pad_group);\n
-               struct python:\n
-                here.WebSite_getActiveKnowledgePadForUser(knowledge_pads, \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
+               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

bt5/erp5_knowledge_pad/bt/revision

-478
+480
\ No newline at end of file