[Erp5-report] r35896 mayoro - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/e...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jun 2 14:23:13 CEST 2010
Author: mayoro
Date: Wed Jun 2 14:23:11 2010
New Revision: 35896
URL: http://svn.erp5.org?rev=35896&view=rev
Log:
2010-06-02 mayoro
* add some processing in procedure title in case of special caracters before generating portal_type
Added:
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml
Modified:
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml
erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml
erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.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
Added: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml?rev=35896&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml (added)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Egov_getTendererFromUserName.xml [utf8] Wed Jun 2 14:23:11 2010
@@ -1,0 +1,143 @@
+<?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
+ Return the tenderer of the procédure \n
+ ie: return the organisation on wich belong the user\n
+ if it doesn\'t exist return the user\n
+"""\n
+portal = context.getPortalObject()\n
+user_name = context.getViewPermissionOwner()\n
+user_obj = context.ERP5Site_getPersonObjectFromUserName(user_name)\n
+tenderer = \'\'\n
+if user_obj is not None:\n
+ organisation_value = user_obj.getCareerSubordinationValue()\n
+ if organisation_value is not None: \n
+ tenderer = organisation_value.getTitle()\n
+ else:\n
+ tenderer = user_obj.getTitle()\n
+return tenderer\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string></string> </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>
+ <string>portal</string>
+ <string>user_name</string>
+ <string>user_obj</string>
+ <string>tenderer</string>
+ <string>None</string>
+ <string>organisation_value</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>Egov_getTendererFromUserName</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Folder_viewEgovContentList/listbox_organisation_title.xml [utf8] Wed Jun 2 14:23:11 2010
@@ -273,7 +273,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.SAFI_getTendererFromUserName()</string> </value>
+ <value> <string>python: cell.EGov_getTendererFromUserName()</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewPendingApplicationRenderer.xml [utf8] Wed Jun 2 14:23:11 2010
@@ -57,7 +57,7 @@
</div>\n
<div class="become_vip_explanations">\n
<tal:block i18n:domain="ui" i18n:translate="">\n
- Safi is a major Internet portal for performing administrative formalities\n
+ ERP5 EGov is a major Internet portal for performing administrative formalities\n
online. It is a quick and easy way to make a statement, or a application for\n
jutificatif,... without having to move or to queue. For more\n
information, please click\n
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_widget_library/WebSite_viewRegisterInformationHead.xml [utf8] Wed Jun 2 14:23:11 2010
@@ -47,7 +47,7 @@
\n
<tal:block metal:define-macro="main">\n
<div class="become_member_head section_explanation" i18n:translate="" i18n:domain="ui">\n
- The SAFI portal allows to make on-line administratives formalities.\n
+ The ERP5 EGov portal allows to make on-line administratives formalities.\n
It is possible to make requests without being registred (anonymous request).\n
However the registration is deeply advised.\n
</div>\n
Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendPendingNotificationByMail.xml [utf8] Wed Jun 2 14:23:11 2010
@@ -81,7 +81,7 @@
wf_info=form.Egov_getProcedureWorkflowStateInfo(\'egov_universal_workflow\',\'pending\')\n
date_of_submission=wf_info[\'time\'].strftime(\'%d/%m/%y %H:%M\')\n
\n
-subject = translateString("[SAFI] Your ${procedure} reference: ${form_id} has been submitted", \n
+subject = translateString("[E-government] Your ${procedure} reference: ${form_id} has been submitted", \n
mapping = dict(procedure=procedure, form_id=form_id))\n
\n
msg_content=""" \n
@@ -90,7 +90,7 @@
\n
The procedure is pending and will continue after your payment.\n
\n
-SAFI TEAM\n
+E-government TEAM\n
\n
"""\n
\n
Modified: erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/WorkflowTemplateItem/portal_workflow/egov_interaction_workflow/scripts/sendSubmissionNotificationByMail.xml [utf8] Wed Jun 2 14:23:11 2010
@@ -81,7 +81,7 @@
wf_info=form.Egov_getProcedureWorkflowStateInfo(\'egov_universal_workflow\',\'submitted\')\n
date_of_submission=wf_info[\'time\'].strftime(\'%d/%m/%y %H:%M\')\n
\n
-subject = translateString("[SAFI] Your ${procedure} document number: ${form_id} has been submitted", \n
+subject = translateString("[E-government] Your ${procedure} document number: ${form_id} has been submitted", \n
mapping = dict(procedure=procedure, form_id=form_id))\n
\n
msg_content=""" \n
@@ -89,7 +89,7 @@
Your ${procedure} has been transmitted under the reference : ${form_id}, at ${date_of_submission}\n
\n
\n
-SAFI TEAM\n
+E-government TEAM\n
\n
"""\n
\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=35896&r1=35895&r2=35896&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] Wed Jun 2 14:23:11 2010
@@ -56,7 +56,16 @@
<value> <string>procedure_request = state_change[\'object\']\n
\n
portal_type_name = procedure_request.getProcedureTitle()\n
+portal_type_name = portal_type_name.replace("\'", "")\n
+portal_type_name = portal_type_name.replace(\'é\', \'e\')\n
+portal_type_name = portal_type_name.replace(\'è\', \'e\')\n
+portal_type_name = portal_type_name.replace(\'à\', \'a\')\n
+portal_type_name = portal_type_name.replace(\'ç\', \'c\')\n
+portal_type_name = portal_type_name.replace(\'ê\', \'e\')\n
portal_type_name = \' \'.join([word.capitalize() for word in portal_type_name.split(\' \')])\n
+\n
+#in case of so much whitespace in the name like \'Fo ooo\' filled in the form \n
+portal_type_name.replace(\' \',\'\')\n
\n
## verifying if portal_type exist or not\n
\n
Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Wed Jun 2 14:23:11 2010
@@ -1,3 +1,6 @@
+2010-06-02 mayoro
+* add some processing in procedure title in case of special caracters before generating portal_type
+
2010-06-02 mayoro
* rename extension for egov security
* remove some word added by mistakes
Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=35896&r1=35895&r2=35896&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Wed Jun 2 14:23:11 2010
@@ -1,1 +1,1 @@
-521
+523
More information about the Erp5-report
mailing list