[Erp5-report] r14341 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu May 3 17:49:15 CEST 2007
Author: romain
Date: Thu May 3 17:49:15 2007
New Revision: 14341
URL: http://svn.erp5.org?rev=14341&view=rev
Log:
Fix Person_shiftDefaultCareer in order to be usable for non manager users.
Modified:
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/listbox.xml
erp5/trunk/bt5/erp5_base/bt/revision
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml?rev=14341&r1=14340&r2=14341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_shiftDefaultCareer.xml Thu May 3 17:49:15 2007
@@ -68,41 +68,46 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>object_list = []\n
-default_career = None\n
-new_start_date = None\n
-\n
-# Create a list of all career line except the default one\n
-for object in context.contentValues(filter={\'portal_type\':\'Career\'}):\n
- if object.getId() != \'default_career\': \n
- object_list += [object]\n
- else:\n
- default_career = object\n
- new_start_date = default_career.getStopDate()\n
-\n
-# No default career\n
-if default_career == None:\n
- return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/Person_viewCareer?portal_status_message=Current+career+must+exist.\')\n
-\n
-# Inverse sort of the list by id\n
-object_list.sort(lambda x, y: -cmp(int(x.getId()), int(y.getId())))\n
-\n
-# Shift all career lines id values\n
-new_id = str(context.generateNewId())\n
-for career_line in object_list:\n
- current_id = career_line.getId()\n
- context.manage_renameObject(current_id, new_id)\n
- new_id = current_id\n
-\n
-# Create a new default_career\n
-context.manage_renameObject(\'default_career\', new_id)\n
-new_default = context.manage_copyObjects(ids=(new_id,))\n
-new_object = context.manage_pasteObjects(new_default)\n
-context.manage_renameObject(new_object[0][\'new_id\'], \'default_career\')\n
-context.setCareerStopDate(None)\n
-context.setCareerStartDate(new_start_date)\n
-\n
-return context.REQUEST.RESPONSE.redirect(context.absolute_url() + \'/Person_viewCareer?portal_status_message=Last+career+step+terminated.+New+career+step+added.\')\n
+ <value> <string>from Products.CMFActivity.Errors import ActivityPendingError\n
+N_ = context.Base_translateString\n
+\n
+person = context\n
+career_list = []\n
+\n
+default_career = getattr(person, \'default_career\', None)\n
+\n
+\n
+if default_career is None:\n
+ # No default career.\n
+ message = N_(\'Current career must exist.\')\n
+ return context.Base_redirect(form_id=\'Person_viewCareer\',\n
+ keep_items={\'portal_status_message\': message})\n
+else:\n
+ # Copy and paste the default career.\n
+ # Change IDs\n
+ new_id = person.generateNewId()\n
+ try:\n
+ default_career.setId(new_id)\n
+ except ActivityPendingError, error:\n
+ message = N_("%s" % error)\n
+ return context.Base_redirect(form_id=\'Person_viewCareer\',\n
+ keep_items={\'portal_status_message\': message})\n
+\n
+ new_start_date = default_career.getStopDate()\n
+\n
+ cb_data = person.manage_copyObjects(ids=(new_id,))\n
+ copied = person.manage_pasteObjects(cb_data)\n
+\n
+ new_default_career = getattr(person, copied[0][\'new_id\'])\n
+\n
+ new_default_career.edit(\n
+ id=\'default_career\',\n
+ start_date=new_start_date,\n
+ stop_date=None)\n
+\n
+ message = N_(\'Last career step terminated. New career step added.\')\n
+ return context.Base_redirect(form_id=\'Person_viewCareer\',\n
+ keep_items={\'portal_status_message\': message})\n
</string> </value>
</item>
<item>
@@ -151,21 +156,24 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>object_list</string>
+ <string>Products.CMFActivity.Errors</string>
+ <string>ActivityPendingError</string>
+ <string>_getattr_</string>
+ <string>context</string>
+ <string>N_</string>
+ <string>person</string>
+ <string>career_list</string>
+ <string>getattr</string>
<string>None</string>
<string>default_career</string>
+ <string>message</string>
+ <string>new_id</string>
+ <string>error</string>
<string>new_start_date</string>
- <string>_getiter_</string>
- <string>_getattr_</string>
- <string>context</string>
- <string>object</string>
- <string>str</string>
- <string>new_id</string>
- <string>career_line</string>
- <string>current_id</string>
- <string>new_default</string>
- <string>new_object</string>
+ <string>cb_data</string>
+ <string>copied</string>
<string>_getitem_</string>
+ <string>new_default_career</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/listbox.xml?rev=14341&r1=14340&r2=14341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_viewCareer/listbox.xml Thu May 3 17:49:15 2007
@@ -581,7 +581,7 @@
<dictionary>
<item>
<key> <string>method_name</string> </key>
- <value> <string>searchFolder</string> </value>
+ <value> <string>contentValues</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=14341&r1=14340&r2=14341&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Thu May 3 17:49:15 2007
@@ -1,1 +1,1 @@
-111
+113
More information about the Erp5-report
mailing list