You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2015/04/01 23:10:21 UTC
[04/45] allura git commit: [#7833] ticket:741 Strip email addresses
in EmailAddress collection as well
[#7833] ticket:741 Strip email addresses in EmailAddress collection as well
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/97073958
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/97073958
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/97073958
Branch: refs/heads/hss/7072
Commit: 97073958155edf5af5b245d4feb31f7fa35bccb4
Parents: 27f9c9f
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Fri Mar 13 19:09:37 2015 +0200
Committer: Heith Seewald <hs...@slashdotmedia.com>
Committed: Thu Mar 19 18:37:45 2015 +0000
----------------------------------------------------------------------
Allura/allura/scripts/trim_emails.py | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/97073958/Allura/allura/scripts/trim_emails.py
----------------------------------------------------------------------
diff --git a/Allura/allura/scripts/trim_emails.py b/Allura/allura/scripts/trim_emails.py
index 0ce4caa..f847224 100644
--- a/Allura/allura/scripts/trim_emails.py
+++ b/Allura/allura/scripts/trim_emails.py
@@ -17,6 +17,8 @@
import logging
+from ming.orm import session
+
from allura.scripts import ScriptTask
from allura import model as M
from allura.lib.utils import chunked_find
@@ -37,6 +39,14 @@ class TrimEmails(ScriptTask):
if u.preferences.email_address is not None:
u.preferences.email_address = M.EmailAddress.canonical(
u.preferences.email_address)
+ session(u).flush(u)
+ for chunk in chunked_find(M.EmailAddress, {}):
+ for a in chunk:
+ log.info('Trimming email address entry %s', a.email)
+ a.email = M.EmailAddress.canonical(a.email)
+ session(a).flush(a)
+ M.main_orm_session.flush()
+ M.main_orm_session.clear()
log.info('Finished trimming emails')