diff options
| author | Simon Green <sgreen@redhat.com> | 2014-06-06 01:47:27 +0200 |
|---|---|---|
| committer | Simon Green <sgreen@redhat.com> | 2014-06-06 01:47:27 +0200 |
| commit | d2c2138b20b7a3c8e05fda35d3116862fcda210b (patch) | |
| tree | f05c24ab1104b85c326b4d6b0cd116892122502b /template | |
| parent | 2f75161d4f6fcd97e24cef94027664ced163d833 (diff) | |
| download | bugzilla-d2c2138b20b7a3c8e05fda35d3116862fcda210b.tar.gz bugzilla-d2c2138b20b7a3c8e05fda35d3116862fcda210b.tar.xz | |
Bug 442013 - Create Bugzilla::User->set_groups and set_bless_groups and have editusers.cgi use them
r=justdave, a=glob
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 34c678e4f..f47a1d6ec 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -26,14 +26,12 @@ canceled. [% ELSIF message_tag == "account_updated" %] - [% IF changed_fields.size - + groups_added_to.size + groups_removed_from.size - + groups_granted_rights_to_bless.size + groups_denied_rights_to_bless.size %] + [% IF changes.size %] [% title = "User $loginold updated" %] The following changes have been made to the user account [%+ loginold FILTER html %]: <ul> - [% FOREACH field = changed_fields %] + [% FOREACH field = changes.keys %] <li> [% IF field == 'login_name' %] The login is now [% otheruser.login FILTER html %]. @@ -53,35 +51,31 @@ [% ELSE %] [% terms.Bug %]mail has been enabled. [% END %] + [% ELSIF field == 'groups' %] + [% IF changes.groups.1.size %] + The account has been added to the + [%+ changes.groups.1.join(', ') FILTER html %] + group[% 's' IF changes.groups.1.size > 1 %]. + [% END %] + [% IF changes.groups.0.size %] + The account has been removed from the + [%+ changes.groups.0.join(', ') FILTER html %] + group[% 's' IF changes.groups.0.size > 1 %]. + [% END %] + [% ELSIF field == 'bless_groups' %] + [% IF changes.bless_groups.1.size %] + The account has been granted rights to bless the + [%+ changes.bless_groups.1.join(', ') FILTER html %] + group[% 's' IF changes.bless_groups.1.size > 1 %]. + [% END %] + [% IF changes.bless_groups.0.size %] + The account has been denied rights to bless the + [%+ changes.bless_groups.0.join(', ') FILTER html %] + group[% 's' IF changes.bless_groups.0.size > 1 %]. + [% END %] [% END %] </li> [% END %] - [% IF groups_added_to.size %] - <li> - The account has been added to the following group[% 's' IF groups_added_to.size > 1 %]: - [%+ groups_added_to.join(', ') FILTER html %] - </li> - [% END %] - [% IF groups_removed_from.size %] - <li> - The account has been removed from the following group[% 's' IF groups_removed_from.size > 1 %]: - [%+ groups_removed_from.join(', ') FILTER html %] - </li> - [% END %] - [% IF groups_granted_rights_to_bless.size %] - <li> - The account has been granted rights to bless the - [%+ groups_granted_rights_to_bless.join(', ') FILTER html %] - group[% 's' IF groups_granted_rights_to_bless.size > 1 %]. - </li> - [% END %] - [% IF groups_denied_rights_to_bless.size %] - <li> - The account has been denied rights to bless the - [%+ groups_denied_rights_to_bless.join(', ') FILTER html %] - group[% 's' IF groups_denied_rights_to_bless.size > 1 %]. - </li> - [% END %] </ul> [% ELSE %] [% title = "User $otheruser.login not changed" %] |