Avoid triggering user login migration

plone · Dec 13, 2017 · 50f8a31 · 50f8a31
1 parent 6a38836
commit 50f8a31
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -18,6 +18,10 @@ Bug fixes:
   Fixes https://github.com/plone/Products.CMFPlone/issues/2238
   [pbauer]
 
+- Avoid triggering an unnecessary migration of user logins
+  when the use_email_as_login setting is migrated to portal_registry.
+  [davisagli]
+
 
 2.0.9 (2017-11-26)
 ------------------

diff --git a/plone/app/upgrade/v50/betas.py b/plone/app/upgrade/v50/betas.py
@@ -167,8 +167,18 @@ def _get_enable_self_reg():
     settings.enable_user_folders = pmembership.getMemberareaCreationFlag()
     settings.allow_anon_views_about = site_properties.getProperty(
         'allowAnonymousViewAbout', False)
+
+    # suppress migrating login names while setting use_email_as_login to existing value
+    from Products.CMFPlone.controlpanel import events
+    migrate_to_email_login = events.migrate_to_email_login
+    migrate_from_email_login = events.migrate_from_email_login
+    events.migrate_to_email_login = lambda x: None
+    events.migrate_to_email_login = lambda x: None
     settings.use_email_as_login = site_properties.getProperty(
         'use_email_as_login', False)
+    events.migrate_to_email_login = migrate_to_email_login
+    events.migrate_from_email_login = migrate_from_email_login
+
     settings.use_uuid_as_userid = site_properties.getProperty(
         'use_uuid_as_userid', False)
 

diff --git a/plone/app/upgrade/v50/configure.zcml b/plone/app/upgrade/v50/configure.zcml
@@ -158,7 +158,7 @@
            />
 
        <gs:upgradeStep
-           title="Run to50beta4 upgrade profile"
+           title="Upgrade plone.app.querystring"
            description=""
            handler=".betas.upgrade_querystring"
            />