diff options
Diffstat (limited to 'template')
5 files changed, 12 insertions, 15 deletions
diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl index 99dba148e..fda34e3b1 100644 --- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl @@ -29,7 +29,7 @@ %] <p> - There are [% flag_count %] flags of type [% name FILTER html %]. + There are [% flag_type.flag_count %] flags of type [% name FILTER html %]. If you delete this type, those flags will also be deleted. Note that instead of deleting the type you can <a href="editflagtypes.cgi?action=deactivate&id=[% flag_type.id %]">deactivate it</a>, diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 7f88c62bc..5985e8db0 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -192,7 +192,7 @@ <td> the group allowed to grant/deny flags of this type (to allow all users to grant/deny these flags, select no group)<br> - [% PROCESS select selname = "grant_gid" %] + [% PROCESS select selname = "grant_group" %] </td> </tr> @@ -202,7 +202,7 @@ if flags of this type are requestable, the group allowed to request them (to allow all users to request these flags, select no group)<br> Note that the request group alone has no effect if the grant group is not defined!<br> - [% PROCESS select selname = "request_gid" %] + [% PROCESS select selname = "request_group" %] </td> </tr> @@ -232,7 +232,8 @@ <option value="">(no group)</option> [% FOREACH group = groups %] <option value="[% group.name FILTER html %]" - [% " selected" IF type.${selname} == group.name %]>[% group.name FILTER html %] + [% " selected" IF (type.${selname} && type.${selname}.name == group.name) %]> + [%- group.name FILTER html %] </option> [% END %] </select> diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 7ca897ecd..f578c3a17 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -51,7 +51,7 @@ <p> You can restrict the list of flag types to those available for a given product and component. If a product is selected with no component, only flag types - which are available to ALL components of the product are shown. + which are available to at least one component of the product are shown. </p> <form action="editflagtypes.cgi" method="get"> @@ -59,8 +59,8 @@ <tr> <th><label for="product">Product:</label></th> <td> - <select name="product" onchange="selectProduct(this.form, 'product', 'component', '__All__');"> - <option value="">__All__</option> + <select name="product" onchange="selectProduct(this.form, 'product', 'component', '__Any__');"> + <option value="">__Any__</option> [% FOREACH prod = products %] <option value="[% prod.name FILTER html %]" [% " selected" IF selected_product == prod.name %]> @@ -71,7 +71,7 @@ <th><label for="component">Component:</label></th> <td> <select name="component"> - <option value="">__All__</option> + <option value="">__Any__</option> [% FOREACH comp = components %] <option value="[% comp FILTER html %]" [% " selected" IF selected_component == comp %]> @@ -152,8 +152,8 @@ <span class="multiplicable">multiplicable</span> [% END %] </td> - <td>[% type.grant_group_name FILTER html %]</td> - <td>[% type.request_group_name FILTER html %]</td> + <td>[% IF type.grant_group %][% type.grant_group.name FILTER html %][% END %]</td> + <td>[% IF type.request_group %][% type.request_group.name FILTER html %][% END %]</td> <td> <a href="editflagtypes.cgi?action=copy&id=[% type.id %]">Copy</a> | <a href="editflagtypes.cgi?action=confirmdelete&id=[% type.id %]" diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index bc2ee0fa8..062408a09 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -527,7 +527,7 @@ ], 'admin/flag-type/confirm-delete.html.tmpl' => [ - 'flag_count', + 'flag_type.flag_count', 'flag_type.id', ], diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index a131d25d6..f64cf6411 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -227,10 +227,6 @@ [% END %] is invalid. - [% ELSIF error == "flag_type_id_invalid" %] - The flag type ID <em>[% id FILTER html %]</em> is not - a positive integer. - [% ELSIF error == "flag_type_inactive" %] [% title = "Inactive Flag Types" %] Some flag types are inactive and cannot be used to create new flags. |