[Erp5-report] r35790 fabien - in /experimental/bt5/erp5_credential: PortalTypeAllowedConten...

[nobody at svn.erp5.org]

Author: fabien
Date: Mon May 31 16:06:29 2010
New Revision: 35790

URL: http://svn.erp5.org?rev=35790&view=rev
Log:
all Email portal_type in Credential Request. If login is not found on my_user_id, try on your_user_id, this make this script reusable in Dialog mode

Modified:
    experimental/bt5/erp5_credential/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
    experimental/bt5/erp5_credential/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
    experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml
    experimental/bt5/erp5_credential/bt/revision
    experimental/bt5/erp5_credential/bt/template_portal_type_allowed_content_type_list
    experimental/bt5/erp5_credential/bt/template_portal_type_hidden_content_type_list

Modified: experimental/bt5/erp5_credential/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=35790&r1=35789&r2=35790&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml [utf8] Mon May 31 16:06:29 2010
@@ -1,6 +1,9 @@
 <allowed_content_type_list>
  <portal_type id="Credential Recovery Module">
   <item>Credential Recovery</item>
+ </portal_type>
+ <portal_type id="Credential Request">
+  <item>Email</item>
  </portal_type>
  <portal_type id="Credential Request Module">
   <item>Credential Request</item>

Modified: experimental/bt5/erp5_credential/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml?rev=35790&r1=35789&r2=35790&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/PortalTypeHiddenContentTypeTemplateItem/hidden_content_type_list.xml [utf8] Mon May 31 16:06:29 2010
@@ -1,4 +1,7 @@
 <hidden_content_type_list>
+ <portal_type id="Credential Request">
+  <item>Email</item>
+ </portal_type>
  <portal_type id="Person">
   <item>Credential Question</item>
  </portal_type>

Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml?rev=35790&r1=35789&r2=35790&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_checkLoginAvailability.xml [utf8] Mon May 31 16:06:29 2010
@@ -57,6 +57,9 @@
 from Products.ERP5Type.Message import translateString\n
 user_id = request.get(\'field_my_user_id\', \n
                       request.get(\'my_user_id\'))\n
+if not user_id:\n
+  user_id = request.get(\'field_your_user_id\', \n
+                      request.get(\'your_user_id\'))\n
 \n
 if not context.ERP5Site_isLoginAvailable(user_id):\n
   return 0\n

Modified: experimental/bt5/erp5_credential/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/bt/revision?rev=35790&r1=35789&r2=35790&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_credential/bt/revision [utf8] Mon May 31 16:06:29 2010
@@ -1,1 +1,1 @@
-29
+30

Modified: experimental/bt5/erp5_credential/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/bt/template_portal_type_allowed_content_type_list?rev=35790&r1=35789&r2=35790&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/bt/template_portal_type_allowed_content_type_list [utf8] (original)
+++ experimental/bt5/erp5_credential/bt/template_portal_type_allowed_content_type_list [utf8] Mon May 31 16:06:29 2010
@@ -1,4 +1,5 @@
 Credential Recovery Module | Credential Recovery
 Credential Request Module | Credential Request
+Credential Request | Email
 Credential Update Module | Credential Update
 Person | Credential Question

Modified: experimental/bt5/erp5_credential/bt/template_portal_type_hidden_content_type_list
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/bt/template_portal_type_hidden_content_type_list?rev=35790&r1=35789&r2=35790&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/bt/template_portal_type_hidden_content_type_list [utf8] (original)
+++ experimental/bt5/erp5_credential/bt/template_portal_type_hidden_content_type_list [utf8] Mon May 31 16:06:29 2010
@@ -1,1 +1,2 @@
+Credential Request | Email
 Person | Credential Question