diff options
| author |   Jeff Fearn <jfearn@redhat.com> | 2022-08-02 13:30:09 +1000 |
|---|---|---|
| committer | Jeff Fearn <jfearn@redhat.com> | 2022-08-02 13:30:09 +1000 |
| commit | ca4fe000a6493ae14e8f636b4df5374b98ba25d5 (patch) | |
| tree | b40dc8cfc790aa9990d3a8cdc958a1241fe5b491 /template/en | |
| parent | Bug 1167530 - Improve description of Grant Group in the documentation (diff) | |
| download | bugzilla-ca4fe000a6493ae14e8f636b4df5374b98ba25d5.tar.gz bugzilla-ca4fe000a6493ae14e8f636b4df5374b98ba25d5.tar.bz2 bugzilla-ca4fe000a6493ae14e8f636b4df5374b98ba25d5.zip | |
Bug 1882298 - Admin can create requests for groups the user isn't eligible for
Block adding bless for users.
Block adding the user to groups they are not eligible for.
Block modifying membership of Agile Teams.
Link group name to group edit page.
Link team group name to team edit page.
Add group category to table.
Change-Id: Ib1744c0f8de7b9e15c69f8c713d09b3eb51583a0
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/admin/users/edit.html.tmpl | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl index bf38d0a81..fb94df525 100644 --- a/template/en/default/admin/users/edit.html.tmpl +++ b/template/en/default/admin/users/edit.html.tmpl @@ -58,6 +58,7 @@ <th class="checkbox">|</th> [% END %] <th colspan="2">User is a member of these groups</th> + <th>Category</th> <!-- column 6 --> </tr> <tr> [% IF editusers %] @@ -65,6 +66,7 @@ [% END %] <th></th> <!-- column 4 --> <th></th> <!-- column 5 --> + <th>[% UNLESS editusers %]Category[% END %]</th> <!-- column 6 --> </tr> </thead> <tbody> @@ -77,6 +79,10 @@ [% %]<input type="checkbox" name="bless_[% group.id %]" value="1" + [% UNLESS perms.directbless %] + disabled="disabled" + title="Do not grant bless directly, put the user in a group that has bless." + [% END %] [% ' checked="checked"' IF perms.directbless %]> [% ']' IF perms.indirectbless %]</td> [% END %] @@ -87,15 +93,31 @@ id="group_[% group.id %]" name="group_[% group.id %]" value="1" + [% reasons = [] %] + [% UNLESS group.admin_can_manage(otheruser, reasons) %] + disabled="disabled" + title="You cannot manage this membership because: [% reasons.join(' ') FILTER html %]" + [% END %] [% ' checked="checked"' IF perms.directmember %]> [% '*' IF perms.regexpmember %] [% ']' IF perms.derivedmember %]</td> <td class="groupname"> <label for="group_[% group.id %]"> - <strong>[% group.name FILTER html %]:</strong> + [% IF group.category == 'Agile' %] + <a href="/page.cgi?id=agiletools/team/show.html&team_id=[% group.my_team.id FILTER uri %]"> + [% ELSIF user.in_group("creategroups") %] + <a href="/editgroups.cgi?action=changeform&group=[% group.id FILTER uri %]"> + [% END %] + [% group.name FILTER html %]: + [% IF group.category == 'Agile' || user.in_group("creategroups") %] + </a> + [% END %] [%+ group.description FILTER html_light %] </label> </td> + <td class="category>"> + [% group.category FILTER html %] + </td> </tr> [% END %] </tbody> @@ -189,7 +211,7 @@ $(document).ready(function() { ordering: false, stateSave: true, pagingType: 'full_numbers', - aLengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'All']], + aLengthMenu: [[25, 50, 100, 500, -1], [25, 50, 100, 500, 'All']], [% IF user.settings.def_table_size.value %] iDisplayLength: [% user.settings.def_table_size.value FILTER html %], [%- END %] @@ -199,7 +221,7 @@ $(document).ready(function() { ordering: true, stateSave: true, pagingType: 'full_numbers', - aLengthMenu: [[10, 25, 50, 100, -1], [10, 25, 50, 100, 'All']], + aLengthMenu: [[25, 50, 100, 500, -1], [25, 50, 100, 500, 'All']], fixedHeader: true, [% IF user.settings.def_table_size.value %] iDisplayLength: [% user.settings.def_table_size.value FILTER html %], |