diff options
author | lpsolit%gmail.com <> | 2008-02-06 23:15:34 +0100 |
---|---|---|
committer | lpsolit%gmail.com <> | 2008-02-06 23:15:34 +0100 |
commit | d4f1fd5168130441b735497bac94810a3ccc34c3 (patch) | |
tree | d1992b4574056b6a3861028857729175fcfb2c55 /template/en/default/global | |
parent | 8474e73b2aed9342d7ffe12aaf40adf085fdc606 (diff) | |
download | bugzilla-d4f1fd5168130441b735497bac94810a3ccc34c3.tar.gz bugzilla-d4f1fd5168130441b735497bac94810a3ccc34c3.tar.xz |
Bug 349369: Allow unused custom fields to be deleted from editfields.cgi - Patch by Alex Eiser <aeiser@arc.nasa.gov> r/a=LpSolit
Diffstat (limited to 'template/en/default/global')
-rw-r--r-- | template/en/default/global/messages.html.tmpl | 5 | ||||
-rw-r--r-- | template/en/default/global/user-error.html.tmpl | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 007aab4d4..dfa4f78f4 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -254,6 +254,11 @@ The new custom field '[% field.name FILTER html %]' has been successfully created. + [% ELSIF message_tag == "custom_field_deleted" %] + [% title = "Custom Field Deleted" %] + The custom field '[% field.name FILTER html %]' has been + successfully deleted. + [% ELSIF message_tag == "custom_field_updated" %] [% title = "Custom Field Updated" %] Properties of the '[% field.name FILTER html %]' field have been diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 73d0f1d1f..8b3b5e20e 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -328,6 +328,21 @@ [% title = "Unknown Custom Field" %] There is no custom field with the name '[% name FILTER html %]'. + [% ELSIF error == "customfield_not_obsolete" %] + [% title = "Custom Field Not Obsolete" %] + The custom field '[% name FILTER html %]' is not obsolete. + Please obsolete a custom field before attempting to delete it. + + [% ELSIF error == "customfield_has_activity" %] + [% title = "Custom Field Has Activity" %] + The custom field '[% name FILTER html %]' cannot be deleted because + it has recorded activity. + + [% ELSIF error == "customfield_has_contents" %] + [% title = "Custom Field Has Contents" %] + The custom field '[% name FILTER html %]' cannot be deleted because + at least one [% terms.bug %] has a non empty value for this field. + [% ELSIF error == "dependency_loop_multi" %] [% title = "Dependency Loop Detected" %] The following [% terms.bug %](s) would appear on both the "depends on" |