summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xeditflagtypes.cgi14
-rw-r--r--template/en/default/admin/flag-type/list.html.tmpl17
2 files changed, 31 insertions, 0 deletions
diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index dfef55647..1851e8b13 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -102,6 +102,20 @@ sub list {
Bugzilla::FlagType::match({ 'target_type' => 'attachment',
'group' => scalar $cgi->param('group') }, 1);
+ # Users want to see group names, not IDs
+ # So get the group names
+ my %group_name_cache = ();
+ foreach my $flag_type_set ("bug_types", "attachment_types") {
+ foreach my $flag_type (@{$vars->{$flag_type_set}}) {
+ foreach my $group ("grant", "request") {
+ my $gid = $flag_type->{$group . "_gid"};
+ next if (!$gid);
+ $group_name_cache{$gid} ||= new Bugzilla::Group($gid)->name();
+ $flag_type->{$group . "_group_name"} = $group_name_cache{$gid};
+ }
+ }
+ }
+
# Return the appropriate HTTP response headers.
print $cgi->header();
diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl
index bd1d7cb72..a9dc40519 100644
--- a/template/en/default/admin/flag-type/list.html.tmpl
+++ b/template/en/default/admin/flag-type/list.html.tmpl
@@ -26,6 +26,7 @@
style = "
table#flag_types tr th { text-align: left; }
.inactive { color: #787878; }
+ .multiplicable { display: block; }
"
%]
@@ -88,6 +89,9 @@
<th>Edit name ...</th>
<th>Description</th>
<th>Sortkey</th>
+ <th>Properties</th>
+ <th>Grant group</th>
+ <th>Request group</th>
<th>Actions</th>
</tr>
@@ -98,6 +102,19 @@
<td>[% type.description FILTER html %]</td>
<td align="right">[% type.sortkey FILTER html %]</td>
<td>
+ [% IF type.is_requestable %]
+ <span class="requestable">requestable</span>
+ [% END %]
+ [% IF type.is_requestable && type.is_requesteeble %]
+ <span class="requesteeble">(specifically)</span>
+ [% END %]
+ [% IF type.is_multiplicable %]
+ <span class="multiplicable">multiplicable</span>
+ [% END %]
+ </td>
+ <td>[% type.grant_group_name FILTER html %]</td>
+ <td>[% type.request_group_name FILTER html %]</td>
+ <td>
<a href="editflagtypes.cgi?action=copy&amp;id=[% type.id %]">Copy</a>
| <a href="editflagtypes.cgi?action=confirmdelete&amp;id=[% type.id %]"
onclick="return confirmDelete([% type.id %], '[% type.name FILTER js FILTER html %]',