Allow site admin to control if email verification step is mandatory or

not.

bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference.xml

@@ -30,7 +30,7 @@
         </item>
         <item>
             <key> <string>last_id</string> </key>
-            <value> <string>1</string> </value>
+            <value> <string>2</string> </value>
         </item>
         <item>
             <key> <string>portal_type</string> </key>

bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_credential_recovery_automatic_approval_property.xml

@@ -33,7 +33,7 @@
         </item>
         <item>
             <key> <string>description</string> </key>
-            <value> <string>Automaticaly accept credential recovery</string> </value>
+            <value> <string>Automatically accept credential recovery</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

bt5/erp5_credential/PropertySheetTemplateItem/portal_property_sheets/CredentialPreference/preferred_email_verification_check_property.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Standard Property" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_local_properties</string> </key>
+            <value>
+              <tuple>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>mode</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>elementary_type/boolean</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>If set will make an email verification by sending an email activation message to specified by user email address.</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>preferred_email_verification_check_property</string> </value>
+        </item>
+        <item>
+            <key> <string>mode</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Standard Property</string> </value>
+        </item>
+        <item>
+            <key> <string>preference</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>property_default</string> </key>
+            <value> <string>python: True</string> </value>
+        </item>
+        <item>
+            <key> <string>write_permission</string> </key>
+            <value> <string>Manage properties</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_newCredentialRequest.xml

@@ -109,11 +109,18 @@ if portal_preferences.getPreferredCredentialAlarmAutomaticCall():\n
   credential_request.submit("Automatic submit")\n
   message_str = "Credential Request Created."\n
 else:\n
-  # Send email to subscriber in activities.\n
-  credential_request.activate(activity=\'SQLQueue\').CredentialRequest_sendSubmittedNotification(\n
-    context_url=context.absolute_url(),\n
-    notification_reference=\'erp5-subscription.notification\')\n
-  message_str = "Thanks for your registration. You will be receive an email to activate your account."\n
+  context.log(\'--- %s \' %portal_preferences.isPreferredEmailVerificationCheck())\n
+  if portal_preferences.isPreferredEmailVerificationCheck():\n
+    # Send email to subscriber in order to check email\'s address\n
+    credential_request.activate(activity=\'SQLQueue\').CredentialRequest_sendSubmittedNotification(\n
+      context_url=context.absolute_url(),\n
+      notification_reference=\'erp5-subscription.notification\')\n
+    message_str = "Thanks for your registration. You will be receive an email to activate your account."\n
+  else:\n
+    # no email verification is needed\n
+    credential_request.submit("Automatic submit")\n
+    message_str = "Credential Request Created."\n
+    \n
 \n
 portal.Base_redirect(form_id=\'login_form\', \n
                      keep_items = dict(portal_status_message=context.Base_translateString(message_str)))\n

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential.xml

@@ -90,6 +90,7 @@
                         <string>my_preferred_login_and_password_notifier</string>
                         <string>my_preferred_subscription_assignment_category_list</string>
                         <string>my_preferred_credential_contract_document_reference</string>
+                        <string>my_preferred_email_verification_check</string>
                       </list>
                     </value>
                 </item>

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/SystemPreference_viewCredential/my_preferred_email_verification_check.xml

+<?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_email_verification_check</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_checkbox</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>Email Verification</string> </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_credential/bt/revision

-377
+378
\ No newline at end of file