Bug 899091 - SENTRY ERROR: Can't locate object method "cf_partner_koi_tcl" via package "Bugzilla::Bug" at /loader/0x7f88f01cfd60/Bugzilla/Extension/Push/Serialise.pm line 217

r=glob

3 files changed, 18 insertions, 15 deletions

diff --git a/extensions/TrackingFlags/template/en/default/hook/global/messages-messages.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/global/messages-messages.html.tmpl
index 45bb7332c..ce254b8cc 100644
--- a/extensions/TrackingFlags/template/en/default/hook/global/messages-messages.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/global/messages-messages.html.tmpl
@@ -6,10 +6,13 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% IF message_tag == 'tracking_flags_created' %]
-  The tracking flag has been created.
+[% IF message_tag == 'tracking_flag_created' %]
+  The tracking flag '[% flag.name FILTER html %]' has been created.
 
-[% ELSIF message_tag == 'tracking_flags_updated' %]
-  The tracking flag has been updated.
+[% ELSIF message_tag == 'tracking_flag_updated' %]
+  The tracking flag '[% flag.name FILTER html %]' has been updated.
+
+[% ELSIF message_tag == "tracking_flag_deleted" %]
+  The tracking flag '[% flag.name FILTER html %]' has been deleted.
 
 [% END %]
diff --git a/extensions/TrackingFlags/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/TrackingFlags/template/en/default/hook/global/user-error-errors.html.tmpl
index f17df1bdf..13f9980dc 100644
--- a/extensions/TrackingFlags/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -54,4 +54,14 @@
   [% title = "Invalid flag type" %]
   The flag type '[% type FILTER html %]' is invalid.
 
+[% ELSIF error == "tracking_flag_has_activity" %]
+  [% title = "Tracking Flag Has Activity" %]
+  The tracking flag '[% flag.name FILTER html %]' cannot be deleted because
+  it has recorded activity.
+
+[% ELSIF error == "tracking_flag_has_contents" %]
+  [% title = "Tracking Flag Has Contents" %]
+  The tracking flag '[% flag.name FILTER html %]' cannot be deleted because
+  at least one [% terms.bug %] has a non empty value for this field.
+
 [% END %]
diff --git a/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl b/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
index d9f11fa2a..0c4a443f9 100644
--- a/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
+++ b/extensions/TrackingFlags/template/en/default/pages/tracking_flags_admin_edit.html.tmpl
@@ -29,16 +29,6 @@ var selected_components = [
   style_urls = [ 'extensions/TrackingFlags/web/styles/admin.css' ]
 %]
 
-[% IF mode == 'deleted' %]
-
-  <p>The tracking flag [% flag_name FILTER html %] has been deleted.</p>
-  <hr>
-  <p>Return to the <a href="page.cgi?id=tracking_flags_admin_list.html">list of Tracking Flags</a>.</p>
-
-  [% RETURN %]
-
-[% END %]
-
 <script>
   var groups = [% groups || '[]' FILTER none %];
   var flag_values = [% values || '[]' FILTER none %];
@@ -56,7 +46,7 @@ var selected_components = [
 <form method="POST" action="page.cgi" onsubmit="return on_submit()">
 <input type="hidden" name="id" value="tracking_flags_admin_edit.html">
 <input type="hidden" name="mode" value="[% mode FILTER html %]">
-<input type="hidden" name="flag_id" value="[% mode == 'edit' ? flag.flag_id : 0 FILTER html %]">
+<input type="hidden" name="flag_id" value="[% flag ? flag.flag_id : 0 FILTER html %]">
 <input type="hidden" name="values" id="values" value="">
 <input type="hidden" name="visibility" id="visibility" value="">
 <input type="hidden" name="save" value="1">