[Erp5-report] r36526 mayoro - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/e...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 22 22:34:02 CEST 2010
Author: mayoro
Date: Tue Jun 22 22:34:01 2010
New Revision: 36526
URL: http://svn.erp5.org?rev=36526&view=rev
Log:
2010-06-22 mayoro
* Allow anonymous procedure to login
* after captcha test use the desired portal_type to create new procedure (previous one was hardcoded)
* remove form_action in WebSite_viewCaptchaRenderer it's no longer used
Modified:
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_createNewProcedure.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewCaptchaRenderer.xml
erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml
erp5/trunk/bt5/erp5_egov/bt/change_log
erp5/trunk/bt5/erp5_egov/bt/revision
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_createNewProcedure.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_createNewProcedure.xml?rev=36526&r1=36525&r2=36526&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_createNewProcedure.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_createNewProcedure.xml [utf8] Tue Jun 22 22:34:01 2010
@@ -59,7 +59,7 @@ request=context.REQUEST\n
\n
if context.portal_membership.isAnonymousUser() and not captcha_ok:\n
absolute_url = context.absolute_url()\n
- new_url = \'captcha/CheckCaptcha/view\'\n
+ new_url = \'captcha/CheckCaptcha/view?portal_type=%s\' % new_application_procedure\n
redirect_url = "%s/%s" % (absolute_url, new_url)\n
else:\n
portal_type = new_application_procedure\n
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml?rev=36526&r1=36525&r2=36526&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml [utf8] Tue Jun 22 22:34:01 2010
@@ -57,19 +57,27 @@
request=context.REQUEST\n
\n
+\n
# check captcha\n
if not context.isCaptchaTextCorrect(captcha_text):\n
message = "text entered at the right of the picture is wrong"\n
translated_message = context.Base_translateString(message)\n
return request[\'RESPONSE\'].redirect(\n
- "%s?portal_status_message=%s" %\n
+ "%s/view?portal_status_message=%s" %\n
(context.absolute_url(), translated_message))\n
\n
-# create a new subscription form\n
-module = context.getDefaultModule(portal_type=\'Subscription Form\')\n
-form = module.newContent(portal_type=\'Subscription Form\')\n
-\n
web_site_url = context.getWebSiteValue().absolute_url()\n
+\n
+portal_type = request.get(\'portal_type\',\'\')\n
+\n
+if portal_type == \'\': \n
+ return request[\'RESPONSE\'].redirect(web_site_url) \n
+\n
+ \n
+# create a new anonymous procedure\n
+module = context.getDefaultModule(portal_type=portal_type)\n
+form = module.newContent(portal_type=portal_type)\n
+\n
module_id = module.getId()\n
new_object_id = form.getId()\n
\n
@@ -146,9 +154,10 @@ return result\n
<string>message</string>
<string>translated_message</string>
<string>_getitem_</string>
+ <string>web_site_url</string>
+ <string>portal_type</string>
<string>module</string>
<string>form</string>
- <string>web_site_url</string>
<string>module_id</string>
<string>new_object_id</string>
<string>redirect_url</string>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewCaptchaRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewCaptchaRenderer.xml?rev=36526&r1=36525&r2=36526&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewCaptchaRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewCaptchaRenderer.xml [utf8] Tue Jun 22 22:34:01 2010
@@ -63,16 +63,19 @@ Description:\n
to generate a new image.\n
</tal:block>\n
</div>\n
+\n
+\n
<div class="next_step_action" tal:define="object_uid here/getUid | nothing;\n
object_path here/getPath | nothing;\n
form nocall: form | nothing;\n
form_id form/id | template/title_or_id | nothing;\n
portal here/getPortalObject;\n
- form_action python: form and form.action not in (\'\', None) and portal.portal_membership.checkPermission(\'Modify portal content\', here) and form.action or nothing;\n
local_parameter_list local_parameter_list | python: {};\n
">\n
- <input type="hidden" name="form_action" value=""\n
- tal:attributes="value request/form_action" />\n
+\n
+ <input type="hidden" name="portal_type" value=""\n
+ tal:attributes="value python: request.get(\'portal_type\', \'\')" />\n
+\n
<input type="hidden" name="edit_document_url" value=""\n
tal:attributes="value python:\'%s/%s\' % (here.absolute_url(), form_id)" />\n
<input type="hidden" name="view_document_url" value=""\n
@@ -86,7 +89,7 @@ Description:\n
<img src="Captcha_getCaptchaFile?display=thumbnail&format=&resolution=75" alt="captcha"/>\n
<input class="captcha_text" type="text" size="6" name="captcha_text"/>\n
</div>\n
- <a class="onright" href="" OnClick="javascript:window.history.go(0)">\n
+ <a class="onright" href="" tal:attributes="href python:\'%s/%s?portal_type=%s\' % (here.absolute_url(), \'view\', request.get(\'portal_type\',\'\'))" OnClick="javascript:window.history.go()">\n
<img src="img/reload.png" alt="Refresh"/>\n
</a>\n
<div class="clear">\n
Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml?rev=36526&r1=36525&r2=36526&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/portal_type_interaction_workflow/scripts/EGov_generatePortalType.xml [utf8] Tue Jun 22 22:34:01 2010
@@ -206,6 +206,11 @@ module_object.setIdGenerator(\'_generate
## initialize security on the module\n
\n
module_object.EGov_setPermissionsOnEGovModule(procedure_request)\n
+\n
+# Allow anonymous procedure to login\n
+\n
+if not procedure.getStepAuthentication():\n
+ procedure_request.EGov_enableProcedureLogin(portal_type_name)\n
</string> </value>
</item>
<item>
@@ -274,6 +279,7 @@ module_object.EGov_setPermissionsOnEGovM
<string>module_object</string>
<string>portal_type_module_object</string>
<string>allowed_content_type_list</string>
+ <string>procedure</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=36526&r1=36525&r2=36526&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Tue Jun 22 22:34:01 2010
@@ -1,4 +1,9 @@
2010-06-22 mayoro
+* Allow anonymous procedure to login
+* after captcha test use the desired portal_type to create new procedure (previous one was hardcoded)
+* remove form_action in WebSite_viewCaptchaRenderer it's no longer used
+
+2010-06-22 mayoro
* add view as default view of web page captcha
2010-06-22 mayoro
Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=36526&r1=36525&r2=36526&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Tue Jun 22 22:34:01 2010
@@ -1 +1 @@
-584
\ No newline at end of file
+589
\ No newline at end of file
More information about the Erp5-report
mailing list