[Erp5-report] r38583 fx.algrain - in /experimental/bt5/erp5_credential: PropertySheetTempla...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 23 12:14:59 CEST 2010
Author: fx.algrain
Date: Thu Sep 23 12:14:48 2010
New Revision: 38583
URL: http://svn.erp5.org?rev=38583&view=rev
Log:
Use a preference to define the default assignment duration
Added:
experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_duration.xml
Modified:
experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialPreference.py
experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml
experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
Modified: experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialPreference.py
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialPreference.py?rev=38583&r1=38582&r2=38583&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialPreference.py [utf8] (original)
+++ experimental/bt5/erp5_credential/PropertySheetTemplateItem/CredentialPreference.py [utf8] Thu Sep 23 12:14:48 2010
@@ -53,4 +53,11 @@ class CredentialPreference:
'default' : False,
'write_permission': 'Manage properties',
'mode' : '' },
+ { 'id' : 'preferred_credential_assignment_duration',
+ 'description' : 'Validation duration for assignments created from a credential (Days)',
+ 'type' : 'int',
+ 'preference' : 1,
+ 'default' : 3650,
+ 'write_permission': 'Manage properties',
+ 'mode' : '' },
)
Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml?rev=38583&r1=38582&r2=38583&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml [utf8] Thu Sep 23 12:14:48 2010
@@ -71,19 +71,21 @@ context.CredentialRequest_closePersonAss
\n
\n
#Initialisation\n
-assignment_duration = int(context.WebSite_getLayoutProperty(\'layout_assignment_validation_duration\', \'365\'))\n
+assignment_duration = context.portal_preferences.getPreferredCredentialAssignmentDuration()\n
today = DateTime()\n
delay = today+assignment_duration\n
+\n
+organisation_url = organisation and organisation.getRelativeUrl() or None;\n
for role,create_assingment in assignment_configuration.items():\n
if create_assingment:\n
assignment_for_website = person.newContent(\n
portal_type=\'Assignment\',\n
- title = \'%s assignment\' % role,\n
+ title = \'%s %s Assignment\' % (context.getSite(\'\').capitalize(), role.capitalize()),\n
role = role, \n
site = context.getSite(),\n
activity = context.getActivityList(),\n
function = context.getFunctionList(),\n
- destination_uid = organisation.getUid(),\n
+ destination = organisation_url,\n
start_date = today,\n
stop_date = delay\n
)\n
@@ -152,11 +154,12 @@ for role,create_assingment in assignment
<string>has_assignment</string>
<string>bool</string>
<string>_write_</string>
- <string>int</string>
<string>assignment_duration</string>
<string>DateTime</string>
<string>today</string>
<string>delay</string>
+ <string>None</string>
+ <string>organisation_url</string>
<string>create_assingment</string>
<string>assignment_for_website</string>
<string>current_assignment_list</string>
Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml?rev=38583&r1=38582&r2=38583&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml [utf8] Thu Sep 23 12:14:48 2010
@@ -84,6 +84,7 @@
<string>my_preferred_credential_request_automatic_approval</string>
<string>my_preferred_organisation_credential_update_automatic_approval</string>
<string>my_preferred_person_credential_update_automatic_approval</string>
+ <string>my_preferred_credential_assignment_duration</string>
</list>
</value>
</item>
Added: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_duration.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_duration.xml?rev=38583&view=auto
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_duration.xml (added)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_credential_assignment_duration.xml [utf8] Thu Sep 23 12:14:48 2010
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_preferred_credential_assignment_duration</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_integer_field</string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>Duration of assignment (Days)</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
More information about the Erp5-report
mailing list