Commit 806a1665e13e167ebde65c0043bc3eee0562cb84
1 parent
9839cbc7
Exists in
staging
and in
42 other branches
ActionItem1165: making e-mail work
Showing
2 changed files
with
2 additions
and
0 deletions
Show diff stats
script/import-cooperation.net
| @@ -100,6 +100,7 @@ for username in ARGV | @@ -100,6 +100,7 @@ for username in ARGV | ||
| 100 | 100 | ||
| 101 | # create user | 101 | # create user |
| 102 | user = User.new(:login => login, :email => username, :environment => environment) | 102 | user = User.new(:login => login, :email => username, :environment => environment) |
| 103 | + user.enable_email = true | ||
| 103 | 104 | ||
| 104 | # import person data | 105 | # import person data |
| 105 | imported_data = Hash.from_xml(File.read(File.join(IMPORT_DIR, username + '.xml')))['person'] | 106 | imported_data = Hash.from_xml(File.read(File.join(IMPORT_DIR, username + '.xml')))['person'] |
util/mail/postgresql/mail_users.sql
| @@ -27,6 +27,7 @@ JOIN domains on | @@ -27,6 +27,7 @@ JOIN domains on | ||
| 27 | ( | 27 | ( |
| 28 | ( | 28 | ( |
| 29 | profiles.preferred_domain_id is null and | 29 | profiles.preferred_domain_id is null and |
| 30 | + domain.is_default and | ||
| 30 | domains.owner_id = environments.id and | 31 | domains.owner_id = environments.id and |
| 31 | domains.owner_type = 'Environment' | 32 | domains.owner_type = 'Environment' |
| 32 | ) | 33 | ) |