From 422a379558b0738d842c1e5b997ef8357ff18ac4 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Tue, 30 May 2006 01:11:03 +0000 Subject: Bug 324784: editgroups.cgi should make sure groups it edits/removes are not used by editparams.cgi (in data/params) - Patch by Frédéric Buclin r=wicked a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/admin/groups/list.html.tmpl | 18 +++++++++++++++--- template/en/default/global/user-error.html.tmpl | 14 ++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'template') diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl index f32e715d6..64e30f9e4 100644 --- a/template/en/default/admin/groups/list.html.tmpl +++ b/template/en/default/admin/groups/list.html.tmpl @@ -84,10 +84,22 @@ content => " " }] overrides.action = [ { - match_value => "0" - match_field => 'isbuggroup' + match_value => Param("chartgroup") + match_field => 'name' override_content => 1 - content => " " + content => "(used as the 'chartgroup')" + }, + { + match_value => Param("insidergroup") + match_field => 'name' + override_content => 1 + content => "(used as the 'insidergroup')" + }, + { + match_value => Param("timetrackinggroup") + match_field => 'name' + override_content => 1 + content => "(used as the 'timetrackinggroup')" }, { match_value => "1" diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index ee7f6c17d..ac1bca1c2 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -519,6 +519,20 @@ [% title = "The group already exists" %] The group [% name FILTER html %] already exists. + [% ELSIF error == "group_has_special_role" %] + [% title = "Group not deletable" %] + [% IF groups.size == 1 %] + [% attr = "it" %] + [% param = "parameter" %] + [% ELSE %] + [% attr = "them" %] + [% param = "parameters" %] + [% END %] + The group '[% name FILTER html %]' is used by the + '[% groups.join("' and '") FILTER html %]' [% param FILTER html %]. + In order to delete this group, you first have to change the + [%+ param FILTER html %] to make [% attr FILTER html %] point to another group. + [% ELSIF error == "group_not_specified" %] [% title = "Group not specified" %] No group was specified. -- cgit v1.2.3-24-g4f1b