You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/03/16 10:54:18 UTC
[3/3] 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/c204f36b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c204f36b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c204f36b
Branch: refs/heads/ib/7833
Commit: c204f36bd2ef86e0a48870693784ce7020f2a6e1
Parents: 8e7a753
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Fri Mar 13 19:09:37 2015 +0200
Committer: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Committed: Fri Mar 13 19:09:37 2015 +0200
----------------------------------------------------------------------
Allura/allura/scripts/trim_emails.py | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c204f36b/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')