From 9451fe4f8c5662127d53c23b6976ec5f203d0f0e Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 6 Sep 2013 12:43:59 -0400
Subject: Bug 913208 - Allow deleting of tracking flags that do not have bug
 values set but have activity entries in bugs_activity r=glob

---
 .../template/en/default/hook/global/user-error-errors.html.tmpl      | 5 -----
 .../template/en/default/pages/tracking_flags_admin_edit.html.tmpl    | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'extensions/TrackingFlags/template/en')

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 13f9980dc..7987c7d8d 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,11 +54,6 @@
   [% 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
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 97a9e5a02..85915dbde 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
@@ -174,9 +174,9 @@ var selected_components = [
 
 <div>
   <input type="submit" name="submit" id="submit" value="[% mode == 'edit' ? 'Save Changes' : 'Add' %]">
-  [% IF can_delete %]
+  [% IF !flag.bug_count %]
     <input type="hidden" name="delete" id="delete" value="">
-    <input type="submit" value="Delete"
+    <input type="submit" value="Delete Flag [% IF flag.activity_count %] and Activity[% END  %]"
           onclick="return delete_confirm('[% flag.name FILTER js FILTER html %]')">
   [% END %]
 </div>
-- 
cgit v1.2.3-24-g4f1b