[Erp5-report] r36685 mayoro - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/e...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jun 29 14:50:17 CEST 2010
Author: mayoro
Date: Tue Jun 29 14:50:15 2010
New Revision: 36685
URL: http://svn.erp5.org?rev=36685&view=rev
Log:
2010-06-29 mayoro
* Clean up page templates and scripts, remove french expression, use Locallizer for translation
* Add Agent role for procedure
* Rename Egov_getTendererFromUserName
Added:
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getTendererFromUserName.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/view_main.xml
Modified:
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_creation.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_other_reason.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewRelatedOrganisationList/my_title.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=36685&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] Tue Jun 29 14:50:15 2010
@@ -0,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 procedure \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/EGov_register.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_register.xml?rev=36685&r1=36684&r2=36685&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 29 14:50:15 2010
@@ -91,7 +91,7 @@ password = context.Person_generatePasswo
form.setPassword(password)\n
\n
# the ownership is the form itself\n
-form.manage_addLocalRoles(new_object_id, [\'Owner\',])\n
+form.manage_addLocalRoles(new_object_id, [\'Owner\',\'Agent\'])\n
\n
\n
# login with this new form\n
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_creation.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_creation.xml?rev=36685&r1=36684&r2=36685&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_creation.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_creation.xml [utf8] Tue Jun 29 14:50:15 2010
@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>default</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -82,6 +82,10 @@
<value>
<dictionary>
<item>
+ <key> <string>default</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
<key> <string>field_id</string> </key>
<value> <string>my_checkbox</string> </value>
</item>
@@ -95,7 +99,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Origine du fonds de commerce(Création)</string> </value>
+ <value> <string>Origine du fonds de commerce(Creation)</string> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_other_reason.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_other_reason.xml?rev=36685&r1=36684&r2=36685&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_other_reason.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewDetails/my_other_reason.xml [utf8] Tue Jun 29 14:50:15 2010
@@ -13,8 +13,8 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
- <string>title</string>
<string>display_width</string>
+ <string>title</string>
</list>
</value>
</item>
@@ -93,7 +93,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Préciser</string> </value>
+ <value> <string>Define</string> </value>
</item>
</dictionary>
</value>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewRelatedOrganisationList/my_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewRelatedOrganisationList/my_title.xml?rev=36685&r1=36684&r2=36685&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewRelatedOrganisationList/my_title.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/Organisation_viewRelatedOrganisationList/my_title.xml [utf8] Tue Jun 29 14:50:15 2010
@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Dénomination</string> </value>
+ <value> <string>Denomination</string> </value>
</item>
<item>
<key> <string>truncate</string> </key>
Added: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/view_main.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/view_main.xml?rev=36685&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/view_main.xml (added)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov_theme/view_main.xml [utf8] Tue Jun 29 14:50:15 2010
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <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_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
+ xmlns:metal="http://xml.zope.org/namespaces/metal"\n
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
+ <tal:block metal:define-macro="master">\n
+ <tal:block\n
+ 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
+ dummy python: local_parameter_list.update({\'object_uid\': object_uid, \'object_path\': object_path, \'form_id\': form_id});\n
+ title python: \'%s - %s\' % (portal.Base_translateString(template.title_or_id()), here.getTitle());\n
+ ">\n
+ <tal:block metal:use-macro="here/main_template/macros/master">\n
+ <tal:block metal:fill-slot="context_bar">\n
+ <tal:block metal:use-macro="here/context_box_render/macros/master" />\n
+ </tal:block>\n
+ <tal:block metal:fill-slot="main">\n
+ <script type="text/javascript"\n
+ tal:condition="portal/portal_preferences/getPreferredHtmlStyleUnsavedFormWarning"\n
+ tal:define="message python:context.Base_translateString(\'You have unsaved changes\').replace(\'\\\'\', \'\\\\\\\'\')"\n
+ tal:content="string:installUnsavedChangesWarning(\'$message\')">\n
+ </script>\n
+ <div class="document"\n
+ tal:define="actions actions/object_view | python: []">\n
+ <div class="actions"\n
+ tal:condition="python: (not is_web_mode or editable_mode) and len(actions)">\n
+ <button tal:condition="python: not is_web_mode and form_action"\n
+ type="submit" class="save" title="Save"\n
+ tal:attributes="name string:${form_action}:method;\n
+ onClick string:javascript:clickSaveButton(\'${form_action}\');"\n
+ i18n:attributes="title" i18n:domain="ui">\n
+ <span class="image"></span>\n
+ <span class="description" i18n:translate="" i18n:domain="ui">Save</span>\n
+ </button>\n
+ <ul>\n
+ <li tal:repeat="action actions"\n
+ tal:attributes="class python: action == current_action and \'selected\' or \'not_selected\'">\n
+ <a tal:attributes="href python: \'%s%s%s\' % (action[\'url\'], \'?\' in action[\'url\'] and \'&\' or \'?\', http_parameters)"\n
+ ><span i18n:translate="" i18n:domain="ui" tal:content="action/name">action_name</span></a>\n
+ </li>\n
+ </ul>\n
+ </div>\n
+ <div tal:attributes="class python: editable_mode and \'content editable\' or \'content\'">\n
+ <tal:block metal:define-slot="main" />\n
+ <div class="bottom_actions"\n
+ tal:condition="python: is_web_mode and editable_mode and len(actions) and form_action">\n
+ <input type="hidden" name="form_action" value=""\n
+ tal:attributes="value form_action" />\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
+ tal:attributes="value python:\'%s/%s\' % (here.absolute_url(), \'view\')" />\n
+ </div>\n
+ </div>\n
+ </div>\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+ </tal:block>\n
+</tal:block>\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>content_type</string> </key>
+ <value> <string>text/html</string> </value>
+ </item>
+ <item>
+ <key> <string>expand</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>view_main</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_egov/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/change_log?rev=36685&r1=36684&r2=36685&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/change_log [utf8] Tue Jun 29 14:50:15 2010
@@ -1,5 +1,7 @@
-2010-06-28 mohamadou
-* add a script in setUpEgovInstance to allow acces on Persons and Organisations to administrative agents
+2010-06-29 mayoro
+* Clean up page templates and scripts, remove french expression, use Locallizer for translation
+* Add Agent role for procedure
+* Rename Egov_getTendererFromUserName
2010-06-26 mayoro
* correct previous commit, use contentValues because of caching method
Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=36685&r1=36684&r2=36685&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision [utf8] Tue Jun 29 14:50:15 2010
@@ -1 +1 @@
-654
\ No newline at end of file
+655
\ No newline at end of file
More information about the Erp5-report
mailing list