[Erp5-report] r41659 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Dec 22 14:11:11 CET 2010
Author: gabriel
Date: Wed Dec 22 14:11:11 2010
New Revision: 41659
URL: http://svn.erp5.org?rev=41659&view=rev
Log:
2010-12-22 gabriel
* Implemented code to allow which the user edit the document using the reference of the document shared. If is a Anonymous User, one user is created to him.
Added:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_userFollowUpWebPage.xml
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_shareDocument.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml
erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml?rev=41659&r1=41658&r2=41659&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_renderer.xml [utf8] Wed Dec 22 14:11:11 2010
@@ -50,8 +50,30 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>if context.REQUEST.form.has_key("key"):\n
- webpage = context.portal_catalog.getResultValue(reference=context.REQUEST.form.get("key"))\n
+ <value> <string>"""\n
+ Redirect connected user to UNG Web Site or to document using the key \n
+"""\n
+portal = context.getPortalObject()\n
+\n
+if portal.portal_membership.isAnonymousUser() and context.REQUEST.form.has_key("key"):\n
+ kw = {}\n
+ module = portal.getDefaultModule(\'Person\')\n
+ reference = str(DateTime().millis())\n
+ person = module.newContent(portal_type=\'Person\',\n
+ description=context.REQUEST.get(\'HTTP_X_FORWARDED_FOR\',\'Found no ip\'),\n
+ reference=reference,\n
+ )\n
+ assignment = person.newContent(portal_type="Assignment")\n
+ assignment.open()\n
+ person.validate()\n
+ uf = getattr(portal, \'acl_users\', None)\n
+ plugin = getattr(uf, \'ung_key_auth\',None)\n
+ kw["__ac_key"] = plugin.encrypt(reference)\n
+ kw["key"] = context.REQUEST.form.get("key")\n
+ return context.Base_redirect("/", keep_items=dict(**kw)) \n
+\n
+if context.REQUEST.form.has_key("key"):\n
+ webpage = context.WebSection_userFollowUpWebPage(reference=context.REQUEST.form.get("key"))\n
webpage_id = webpage.getId()\n
editor_name = context.Base_getEditorViewName(webpage.getPortalType())\n
return context.Base_redirect("/web_page_module/%s/%s" % (webpage_id, editor_name),\n
@@ -76,6 +98,16 @@ else:\n
<value> <string></string> </value>
</item>
<item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
<key> <string>errors</string> </key>
<value>
<tuple/>
@@ -101,10 +133,24 @@ else:\n
<tuple>
<string>_getattr_</string>
<string>context</string>
+ <string>portal</string>
+ <string>kw</string>
+ <string>module</string>
+ <string>str</string>
+ <string>DateTime</string>
+ <string>reference</string>
+ <string>person</string>
+ <string>assignment</string>
+ <string>getattr</string>
+ <string>None</string>
+ <string>uf</string>
+ <string>plugin</string>
+ <string>_write_</string>
+ <string>_apply_</string>
+ <string>dict</string>
<string>webpage</string>
<string>webpage_id</string>
<string>editor_name</string>
- <string>dict</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_shareDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_shareDocument.xml?rev=41659&r1=41658&r2=41659&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_shareDocument.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_shareDocument.xml [utf8] Wed Dec 22 14:11:11 2010
@@ -52,6 +52,7 @@
<key> <string>_body</string> </key>
<value> <string>if context.getReference().startswith("default-"):\n
context.setReference(DateTime().millis())\n
+context.share()\n
return "%s/?key=%s" % (context.REQUEST.get("URL3"), context.getReference())\n
</string> </value>
</item>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml?rev=41659&r1=41658&r2=41659&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_uploadDocument.xml [utf8] Wed Dec 22 14:11:11 2010
@@ -50,14 +50,14 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>portal_type_dict = {"Web Page": "Text",\n
- "Web Table": "Spreadsheet",\n
- "Web Illustration": "Drawing"}\n
+ <value> <string>portal_type_dict = {"Web Page": ["Text", "web_page_template"],\n
+ "Web Table": ["Spreadsheet", "web_table_template"],\n
+ "Web Illustration": ["Drawing", "web_illustration_template"]}\n
\n
portal_type = context.REQUEST.form.get("portal_type")\n
document = context.Base_contribute(file=file, \n
url=None, \n
- portal_type=portal_type_dict.get(portal_type), \n
+ portal_type=portal_type_dict.get(portal_type)[0], \n
synchronous_metadata_discovery=None, \n
redirect_to_document=False, \n
attach_document_to_context=False, \n
@@ -70,19 +70,91 @@ document = context.Base_contribute(file=
follow_up_list=None, \n
)\n
\n
-return context.ERP5Site_createNewWebDocument(selection_action=portal_type,\n
+return context.ERP5Site_createNewWebDocument(template=portal_type_dict.get(portal_type)[1],\n
+ selection_action=portal_type,\n
document_path=document.getPath(),\n
upload_document=1)\n
</string> </value>
</item>
<item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
<key> <string>_params</string> </key>
<value> <string>file, **kw</string> </value>
</item>
<item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Assignee</string>
+ <string>Assignor</string>
+ <string>Auditor</string>
+ <string>Manager</string>
+ </tuple>
+ </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>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>file</string>
+ <string>kw</string>
+ <string>portal_type_dict</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>portal_type</string>
+ <string>None</string>
+ <string>_getitem_</string>
+ <string>False</string>
+ <string>document</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>WebSection_uploadDocument</string> </value>
</item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
</dictionary>
</pickle>
</record>
Added: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_userFollowUpWebPage.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_userFollowUpWebPage.xml?rev=41659&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_userFollowUpWebPage.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/WebSection_userFollowUpWebPage.xml [utf8] Wed Dec 22 14:11:11 2010
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </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>portal = context.getPortalObject()\n
+person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n
+\n
+webpage = portal.portal_catalog.getResultValue(reference=reference)\n
+if person.getRelativeUrl() not in webpage.getFollowUpList():\n
+ value_list = webpage.getFollowUpValueList()\n
+ value_list.append(person)\n
+ webpage.setFollowUpValueList(value_list)\n
+\n
+return webpage\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>reference</string> </value>
+ </item>
+ <item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </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>1</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>reference</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>portal</string>
+ <string>person</string>
+ <string>webpage</string>
+ <string>value_list</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>WebSection_userFollowUpWebPage</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log?rev=41659&r1=41658&r2=41659&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/change_log [utf8] Wed Dec 22 14:11:11 2010
@@ -1,4 +1,5 @@
2010-12-22 gabriel
+* Implemented code to allow which the user edit the document using the reference of the document shared. If is a Anonymous User, one user is created to him.
* Clean up the script to generate the UNG Domains and remove not used scripts.
2010-12-20 gabriel
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=41659&r1=41658&r2=41659&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Wed Dec 22 14:11:11 2010
@@ -1 +1 @@
-136
\ No newline at end of file
+137
\ No newline at end of file
More information about the Erp5-report
mailing list