diff options
Diffstat (limited to 'template/en/default/admin/flag-type')
| -rw-r--r-- | template/en/default/admin/flag-type/confirm-delete.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/admin/flag-type/edit.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/admin/flag-type/list.html.tmpl | 23 |
3 files changed, 9 insertions, 31 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 fda34e3b1..0af9fb5a2 100644 --- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl +++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl @@ -21,18 +21,16 @@ [% PROCESS global/variables.none.tmpl %] -[%# Filter off the name here to be used multiple times below %] -[% name = BLOCK %][% flag_type.name FILTER html %][% END %] +[% title = BLOCK %]Confirm Deletion of Flag Type '[% flag_type.name FILTER html %]'[% END %] -[% PROCESS global/header.html.tmpl - title = "Confirm Deletion of Flag Type '$name'" -%] +[% PROCESS global/header.html.tmpl title = title %] <p> - There are [% flag_type.flag_count %] flags of type [% name FILTER html %]. + There are [% flag_type.flag_count %] flags of type [% flag_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>, + <a href="editflagtypes.cgi?action=deactivate&id=[% flag_type.id %]&token= + [%- token FILTER html %]">deactivate it</a>, in which case the type and its flags will remain in the database but will not appear in the [% terms.Bugzilla %] UI. </p> @@ -45,8 +43,8 @@ </tr> <tr> <td> - <a href="editflagtypes.cgi?action=delete&id=[% flag_type.id %]"> - Yes, delete + <a href="editflagtypes.cgi?action=delete&id=[% flag_type.id %]&token= + [%- token FILTER html %]">Yes, delete </a> </td> <td align="right"> diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 942fb3b09..e78c83643 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -53,6 +53,7 @@ <form method="post" action="editflagtypes.cgi"> <input type="hidden" name="action" value="[% action %]"> <input type="hidden" name="id" value="[% type.id %]"> + <input type="hidden" name="token" value="[% token FILTER html %]"> <input type="hidden" name="target_type" value="[% type.target_type %]"> [% FOREACH category = type.inclusions %] <input type="hidden" name="inclusions" value="[% category.value FILTER html %]"> diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index 94fe3da0c..3346f9570 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -101,25 +101,6 @@ <a href="editflagtypes.cgi?action=enter&target_type=attachment">Create Flag Type For Attachments</a> </p> -<script type="text/javascript"> - <!-- - function confirmDelete(id, name, count) - { - if (count > 0) { - var msg = 'There are ' + count + ' flags of type ' + name + '. ' + - 'If you delete this type, those flags will also be ' + - 'deleted.\n\nNote: to deactivate the type instead ' + - 'of deleting it, edit it and uncheck its "is active" ' + - 'flag.\n\nDo you really want to delete this flag type?'; - if (!confirm(msg)) return false; - } - location.href = "editflagtypes.cgi?action=delete&id=" + id; - return false; // prevent strict JavaScript warning that this function - // does not always return a value - } - //--> -</script> - [% PROCESS global/footer.html.tmpl %] @@ -157,9 +138,7 @@ <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 %]" - onclick="return confirmDelete([% type.id %], '[% type.name FILTER js FILTER html %]', - [% type.flag_count %]);">Delete</a> + | <a href="editflagtypes.cgi?action=confirmdelete&id=[% type.id %]">Delete</a> </td> </tr> |