[Erp5-report] r34238 ivan - in /erp5/trunk/bt5/erp5_discussion: PortalTypeWorkflowChainTemp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Apr 1 09:59:14 CEST 2010
Author: ivan
Date: Thu Apr 1 09:59:13 2010
New Revision: 34238
URL: http://svn.erp5.org?rev=34238&view=rev
Log:
Use default DMS publication workflow
Added:
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_isUserAllowedToPost.xml
Modified:
erp5/trunk/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_deleteDiscussionPost.xml
erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml
erp5/trunk/bt5/erp5_discussion/bt/change_log
erp5/trunk/bt5/erp5_discussion/bt/dependency_list
erp5/trunk/bt5/erp5_discussion/bt/revision
erp5/trunk/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list
erp5/trunk/bt5/erp5_discussion/bt/template_workflow_id_list
Modified: erp5/trunk/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/PortalTypeWorkflowChainTemplateItem/workflow_chain_type.xml [utf8] Thu Apr 1 09:59:13 2010
@@ -1,10 +1,10 @@
<workflow_chain>
<chain>
<type>Discussion Post</type>
- <workflow>discussion_post_publication_workflow, edit_workflow</workflow>
+ <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow</workflow>
</chain>
<chain>
<type>Discussion Thread</type>
- <workflow>discussion_thread_publication_workflow, edit_workflow</workflow>
+ <workflow>document_interaction_workflow, document_publication_workflow, edit_workflow</workflow>
</chain>
</workflow_chain>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThreadModule_createNewDiscussionThread.xml [utf8] Thu Apr 1 09:59:13 2010
@@ -80,13 +80,10 @@
source_value = person,\n
version = version,\n
language = language)\n
-\n
-if person is None:\n
- portal_status_message = "New discussion created. Your post will be reviewed for approval."\n
- discussion_post.stack()\n
-else:\n
- portal_status_message = "New discussion created."\n
- discussion_post.post()\n
+# depending on security model Thread and Post can be directly published or shared\n
+portal_status_message = "New discussion created. Your post will be reviewed for approval."\n
+discussion_thread.submit()\n
+discussion_post.submit()\n
\n
return discussion_thread.Base_redirect(form_id,\n
keep_items = dict(portal_status_message=context.Base_translateString(portal_status_message)))\n
@@ -105,9 +102,7 @@
<item>
<key> <string>_proxy_roles</string> </key>
<value>
- <tuple>
- <string>Assignee</string>
- </tuple>
+ <tuple/>
</value>
</item>
<item>
@@ -152,7 +147,6 @@
<string>language</string>
<string>discussion_thread</string>
<string>discussion_post</string>
- <string>None</string>
<string>portal_status_message</string>
<string>dict</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_createNewDiscussionPost.xml [utf8] Thu Apr 1 09:59:13 2010
@@ -70,12 +70,9 @@
version = version,\n
language = language)\n
\n
-if person is None:\n
- portal_status_message = "New post created. Your post will be reviewed for approval."\n
- discussion_post.stack()\n
-else:\n
- portal_status_message = "New post created."\n
- discussion_post.post()\n
+# depending on security model Post can be submited for review\n
+portal_status_message = "New post created."\n
+discussion_post.release()\n
\n
return context.Base_redirect(form_id,\n
keep_items = dict(portal_status_message=context.Base_translateString(portal_status_message)))\n
@@ -95,7 +92,7 @@
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
- <string>Assignee</string>
+ <string>Assignor</string>
</tuple>
</value>
</item>
@@ -135,7 +132,6 @@
<string>version</string>
<string>language</string>
<string>discussion_post</string>
- <string>None</string>
<string>portal_status_message</string>
<string>dict</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_deleteDiscussionPost.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_deleteDiscussionPost.xml?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_deleteDiscussionPost.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_deleteDiscussionPost.xml [utf8] Thu Apr 1 09:59:13 2010
@@ -57,9 +57,10 @@
Delete Discussion Post.\n
"""\n
discussion_post = getattr(context, delete_discussion_post_id)\n
+discussion_post.reject()\n
discussion_post.delete()\n
context.Base_redirect(\'view\', \\\n
- keep_items={\'portal_status_message\': context.Base_translateString(\'Post deleted.\')})\n
+ keep_items={\'portal_status_message\': context.Base_translateString(\'Post rejected.\')})\n
</string> </value>
</item>
<item>
Added: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_isUserAllowedToPost.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_isUserAllowedToPost.xml?rev=34238&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_isUserAllowedToPost.xml (added)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/DiscussionThread_isUserAllowedToPost.xml [utf8] Thu Apr 1 09:59:13 2010
@@ -1,0 +1,125 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>"""\n
+ Evaluate if user is allowed to create new Discussion Post in context.\n
+ \n
+"""\n
+return context.portal_membership.checkPermission(\'Add portal content\', context) or \\\n
+ (context.getValidationState() in (\'published\', \'published_alive\', \\\n
+ \'shared\', \'shared_alive\', \\\n
+ \'released\', \'released_alive\',))\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>_getattr_</string>
+ <string>context</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>DiscussionThread_isUserAllowedToPost</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/SkinTemplateItem/portal_skins/erp5_discussion/ListBox_asPostStyleHTML.xml [utf8] Thu Apr 1 09:59:13 2010
@@ -141,24 +141,22 @@
\n
<hr>\n
<input type="checkbox" name="good_uid" tal:attributes="value event/getUid; id python: \'listbox_cb_%s\' % (event.getUid())" style="visibility:hidden">\n
- <tal:block tal:condition="python: real_context.portal_membership.getAuthenticatedMember()">\n
- <button tal:condition="python: real_context.portal_membership.checkPermission(\'Add portal content\', real_context)" \n
- type="submit" \n
- title="Reply" \n
- name="DiscussionThread_viewCreateNewDiscussionPostDialog:method" \n
- style="border:dashed 1px #3D6474; background-color:#eee; padding:3px;" \n
- tal:attributes="onClick python: \'getElementById(\\\'listbox_cb_%s\\\').checked = true\' % (event_object.getUid())">\n
- <span>Reply</span>\n
+ <button tal:condition="python: real_context.DiscussionThread_isUserAllowedToPost()" \n
+ type="submit" \n
+ title="Reply" \n
+ name="DiscussionThread_viewCreateNewDiscussionPostDialog:method" \n
+ style="border:dashed 1px #3D6474; background-color:#eee; padding:3px;" \n
+ tal:attributes="onClick python: \'getElementById(\\\'listbox_cb_%s\\\').checked = true\' % (event_object.getUid())">\n
+ <span>Reply</span>\n
+ </button>\n
+ <tal:block tal:condition="python:real_context.portal_membership.checkPermission(\'Delete objects\', event_object)">\n
+ <button type="submit" \n
+ title="Delete" \n
+ name="DiscussionThread_deleteDiscussionPost:method"\n
+ tal:attributes="onClick python: \'deleteDiscussionPost(\\\'%s\\\')\' %event.getId()"\n
+ style="border:dashed 1px #3D6474; background-color:#FF654A; padding:3px;">\n
+ <span>Delete</span>\n
</button>\n
- <tal:block tal:condition="python:real_context.portal_membership.checkPermission(\'Delete objects\', event_object)">\n
- <button type="submit" \n
- title="Delete" \n
- name="DiscussionThread_deleteDiscussionPost:method"\n
- tal:attributes="onClick python: \'deleteDiscussionPost(\\\'%s\\\')\' %event.getId()"\n
- style="border:dashed 1px #3D6474; background-color:#FF654A; padding:3px;">\n
- <span>Delete</span>\n
- </button>\n
- </tal:block>\n
</tal:block>\n
</div>\n
</tal:block>\n
Modified: erp5/trunk/bt5/erp5_discussion/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/change_log?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/change_log [utf8] Thu Apr 1 09:59:13 2010
@@ -1,2 +1,5 @@
+2010-03-18 Ivan
+* use default DMS publication workflow
+
2010-03-18 Ivan
* import provided by FX code
Modified: erp5/trunk/bt5/erp5_discussion/bt/dependency_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/dependency_list?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/dependency_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/dependency_list [utf8] Thu Apr 1 09:59:13 2010
@@ -1,3 +1,4 @@
erp5_base
erp5_rss_style
-erp5_knowledge_pad
+erp5_knowledge_pad
+erp5_dms
Modified: erp5/trunk/bt5/erp5_discussion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/revision?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/revision [utf8] Thu Apr 1 09:59:13 2010
@@ -1,1 +1,1 @@
-31
+34
Modified: erp5/trunk/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/template_portal_type_workflow_chain_list [utf8] Thu Apr 1 09:59:13 2010
@@ -1,4 +1,6 @@
-Discussion Post | discussion_post_publication_workflow
+Discussion Post | document_interaction_workflow
+Discussion Post | document_publication_workflow
Discussion Post | edit_workflow
-Discussion Thread | discussion_thread_publication_workflow
+Discussion Thread | document_interaction_workflow
+Discussion Thread | document_publication_workflow
Discussion Thread | edit_workflow
Modified: erp5/trunk/bt5/erp5_discussion/bt/template_workflow_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_discussion/bt/template_workflow_id_list?rev=34238&r1=34237&r2=34238&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_discussion/bt/template_workflow_id_list [utf8] (original)
+++ erp5/trunk/bt5/erp5_discussion/bt/template_workflow_id_list [utf8] Thu Apr 1 09:59:13 2010
@@ -1,2 +1,0 @@
-discussion_post_publication_workflow
-discussion_thread_publication_workflow
More information about the Erp5-report
mailing list