diff options
| author | miketosh <michael.j.tosh@lmco.com> | 2011-10-23 14:20:15 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2011-10-23 14:20:15 +0200 |
| commit | d47f6057e0257b3282ff25a144b9ef36ec741012 (patch) | |
| tree | f390798c18074a9eda97f5801abdf81712cafb9a | |
| parent | 0122a4e056b7f9c4f22d7c67ba9801f0c8c49d71 (diff) | |
| download | bugzilla-d47f6057e0257b3282ff25a144b9ef36ec741012.tar.gz bugzilla-d47f6057e0257b3282ff25a144b9ef36ec741012.tar.xz | |
Bug 690173: Cannot delete user accounts due to FK on audit_log
r/a=mkanat
| -rw-r--r-- | Bugzilla/DB/Schema.pm | 3 | ||||
| -rw-r--r-- | Bugzilla/Install/DB.pm | 12 | ||||
| -rw-r--r-- | Bugzilla/User.pm | 12 | ||||
| -rw-r--r-- | template/en/default/admin/users/confirm-delete.html.tmpl | 11 |
4 files changed, 36 insertions, 2 deletions
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index 33527c367..6d9a33ef7 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm @@ -516,7 +516,8 @@ use constant ABSTRACT_SCHEMA => { FIELDS => [ user_id => {TYPE => 'INT3', REFERENCES => {TABLE => 'profiles', - COLUMN => 'userid'}}, + COLUMN => 'userid', + DELETE => 'SET NULL'}}, class => {TYPE => 'varchar(255)', NOTNULL => 1}, object_id => {TYPE => 'INT4', NOTNULL => 1}, field => {TYPE => 'varchar(64)', NOTNULL => 1}, diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index 5ce3c7a4e..84267de41 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -656,6 +656,9 @@ sub update_table_definitions { # 2011-06-15 dkl@mozilla.com - Bug 658929 _migrate_disabledtext_boolean(); + # 2011-10-11 miketosh - Bug 690173 + _on_delete_set_null_for_audit_log_userid(); + ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################ @@ -3602,6 +3605,15 @@ sub _rename_tags_to_tag { } } +sub _on_delete_set_null_for_audit_log_userid { + my $dbh = Bugzilla->dbh; + my $fk = $dbh->bz_fk_info('audit_log', 'user_id'); + if ($fk and !defined $fk->{DELETE}) { + $fk->{DELETE} = 'SET NULL'; + $dbh->bz_alter_fk('audit_log', 'user_id', $fk); + } +} + 1; __END__ diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm index 48ce41a57..849c1d915 100644 --- a/Bugzilla/User.pm +++ b/Bugzilla/User.pm @@ -1763,6 +1763,18 @@ sub mail_settings { return $self->{'mail_settings'}; } +sub has_audit_entries { + my $self = shift; + my $dbh = Bugzilla->dbh; + + if (!exists $self->{'has_audit_entries'}) { + $self->{'has_audit_entries'} = + $dbh->selectrow_array('SELECT 1 FROM audit_log WHERE user_id = ? ' . + $dbh->sql_limit(1), undef, $self->id); + } + return $self->{'has_audit_entries'}; +} + sub is_insider { my $self = shift; diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl index 1e7077eaf..8f1a3d2fc 100644 --- a/template/en/default/admin/users/confirm-delete.html.tmpl +++ b/template/en/default/admin/users/confirm-delete.html.tmpl @@ -226,7 +226,8 @@ [% IF assignee_or_qa || cc || component_cc || email_setting || flags.requestee || namedqueries || profile_setting || quips || series || watch.watched || - watch.watcher || whine_events || whine_schedules || other_safe %] + watch.watcher || whine_events || whine_schedules || otheruser.has_audit_entries || + other_safe %] <div class="warningmessages"> <p>The following deletions are <b>safe</b> and will not generate referential integrity inconsistencies.</p> @@ -427,6 +428,14 @@ but the whines themselves will be left unaltered. </li> [% END %] + [% IF otheruser.has_audit_entries %] + <li> + The user has performed audited administrative tasks + that are logged in the database. + If you delete this user account, the audit log entries + will no longer be indentifiable. + </li> + [% END %] [% Hook.process('warn_safe') %] </ul> </div> |