summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorOlivier Dony <odo@openerp.com>2012-08-14 12:51:14 +0200
committerOlivier Dony <odo@openerp.com>2012-08-14 12:51:14 +0200
commit0a22166f88ec8415dbdff8a4e31961e6355d5b9c (patch)
treedfc0e28c83f3db97790227d83147280c7178e7fb /addons
parent0b2118c10d927de303a69fc4ddb3dc155030aeda (diff)
[FIX] mail.alias: fix constraint creation warnings + properly hide alias on creation form for inhering classes
bzr revid: odo@openerp.com-20120814105114-ei0qbgy71fyc8jtb
Diffstat (limited to 'addons')
-rw-r--r--addons/crm/crm.py7
-rw-r--r--addons/hr_recruitment/hr_recruitment.py30
-rw-r--r--addons/mail/mail_group.py1
-rw-r--r--addons/mail/res_users.py28
-rw-r--r--addons/project/project.py1
5 files changed, 50 insertions, 17 deletions
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 891187f6a87..b45b8ea8712 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -132,9 +132,10 @@ class crm_case_section(osv.osv):
return ids
_defaults = {
- 'active': lambda *a: 1,
- 'allow_unlink': lambda *a: 1,
- 'stage_ids': _get_stage_common
+ 'active': 1,
+ 'allow_unlink': 1,
+ 'stage_ids': _get_stage_common,
+ 'alias_domain': False, # always hide alias during creation
}
_sql_constraints = [
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 9fe3cbfc4b4..89a81a34c99 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -518,25 +518,41 @@ class hr_job(osv.osv):
"create new applicants for this job position."),
}
- def init(self, cr):
- # Installation hook to create aliases for all jobs, right after _auto_init
+ _defaults = {
+ 'alias_domain': False, # always hide alias during creation
+ }
+
+ def _auto_init(self, cr, context=None):
+ """Installation hook to create aliases for all jobs and avoid constraint errors."""
+
+ # disable the unique alias_id not null constraint, to avoid spurious warning during
+ # super.auto_init. We'll reinstall it afterwards.
+ self._columns['alias_id'].required = False
+
+ super(hr_job,self)._auto_init(cr, context=context)
+
registry = RegistryManager.get(cr.dbname)
mail_alias = registry.get('mail.alias')
- hr_job = registry.get('hr.job')
- jobs_no_alias = hr_job.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
+ hr_jobs = registry.get('hr.job')
+ jobs_no_alias = hr_jobs.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
# Use read() not browse(), to avoid prefetching uninitialized inherited fields
- for job_data in hr_job.read(cr, SUPERUSER_ID, jobs_no_alias, ['name']):
+ for job_data in hr_jobs.read(cr, SUPERUSER_ID, jobs_no_alias, ['name']):
alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': 'job+'+job_data['name'],
'alias_defaults': {'job_id': job_data['id']}},
model_name='hr.applicant')
- hr_job.write(cr, SUPERUSER_ID, job_data['id'], {'alias_id': alias_id})
+ hr_jobs.write(cr, SUPERUSER_ID, job_data['id'], {'alias_id': alias_id})
_logger.info('Mail alias created for hr.job %s (uid %s)', job_data['name'], job_data['id'])
# Finally attempt to reinstate the missing constraint
try:
cr.execute('ALTER TABLE hr_job ALTER COLUMN alias_id SET NOT NULL')
except Exception:
- pass
+ _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+ "If you want to have it, you should update the records and execute manually:\n"\
+ "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
+ self._table, 'alias_id', self._table, 'alias_id')
+
+ self._columns['alias_id'].required = True
def create(self, cr, uid, vals, context=None):
mail_alias = self.pool.get('mail.alias')
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 77169e7f27e..96ece8b4cbd 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -135,6 +135,7 @@ class mail_group(osv.osv):
'public': True,
'responsible_id': (lambda s, cr, uid, ctx: uid),
'image': _get_default_image,
+ 'alias_domain': False, # always hide alias during creation
}
def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 30ef2b25124..a2ca7207aa4 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -54,6 +54,7 @@ class res_users(osv.osv):
_defaults = {
'notification_email_pref': 'to_me',
+ 'alias_domain': False, # always hide alias during creation
}
def __init__(self, pool, cr):
@@ -67,25 +68,38 @@ class res_users(osv.osv):
self.SELF_WRITEABLE_FIELDS.append('notification_email_pref')
return init_res
- def init(self, cr):
- # Installation hook to create aliases for all users, right after _auto_init
+ def _auto_init(self, cr, context=None):
+ """Installation hook to create aliases for all users and avoid constraint errors."""
+
+ # disable the unique alias_id not null constraint, to avoid spurious warning during
+ # super.auto_init. We'll reinstall it afterwards.
+ self._columns['alias_id'].required = False
+
+ super(res_users,self)._auto_init(cr, context=context)
+
registry = RegistryManager.get(cr.dbname)
mail_alias = registry.get('mail.alias')
- res_users = registry.get('res.users')
- users_no_alias = res_users.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
+ res_users_model = registry.get('res.users')
+ users_no_alias = res_users_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
# Use read() not browse(), to avoid prefetching uninitialized inherited fields
- for user_data in res_users.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
+ for user_data in res_users_model.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': user_data['login'],
'alias_force_id': user_data['id']},
model_name=self._name)
- res_users.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
+ res_users_model.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
_logger.info('Mail alias created for user %s (uid %s)', user_data['login'], user_data['id'])
# Finally attempt to reinstate the missing constraint
try:
cr.execute('ALTER TABLE res_users ALTER COLUMN alias_id SET NOT NULL')
except Exception:
- pass
+ _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+ "If you want to have it, you should update the records and execute manually:\n"\
+ "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
+ self._table, 'alias_id', self._table, 'alias_id')
+
+ self._columns['alias_id'].required = True
+
def create(self, cr, uid, data, context=None):
# create default alias same as the login
diff --git a/addons/project/project.py b/addons/project/project.py
index c7038fc6afb..7b848af06a3 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -267,6 +267,7 @@ class project(osv.osv):
'type_ids': _get_type_common,
'alias_model': 'project.task',
'privacy_visibility': 'public',
+ 'alias_domain': False, # always hide alias during creation
}
# TODO: Why not using a SQL contraints ?