From eb2423b1c5e3090d09db856e7020f4dd24232674 Mon Sep 17 00:00:00 2001 From: "jocuri%softhome.net" <> Date: Wed, 24 Nov 2004 06:41:43 +0000 Subject: Patch for bug 180879: Implement privs for bug flags modification; patch by Frédéric Buclin , r=joel, a=justdave. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/admin/flag-type/edit.html.tmpl | 19 +++++++++++++++++++ template/en/default/admin/groups/delete.html.tmpl | 12 +++++++++++- template/en/default/global/user-error.html.tmpl | 16 ++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) (limited to 'template') diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index 1faaaf3b8..253a310ac 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -187,6 +187,25 @@ + + Grant Group: + + the group allowed to grant/deny flags of this type + (to allow all users to grant/deny these flags, leave this empty)
+ + + + + + Request Group: + + if flags of this type are requestable, the group allowed to request them + (to allow all users to request these flags, leave this empty)
+ Note that the request group alone has no effect if the grant group is not defined!
+ + + + diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl index 905f68cf3..842e2c6f1 100644 --- a/template/en/default/admin/groups/delete.html.tmpl +++ b/template/en/default/admin/groups/delete.html.tmpl @@ -29,6 +29,7 @@ # hasusers: boolean int. True if the group includes users in it. # hasbugs: boolean int. True if the group includes bugs in it. # hasproduct: boolean int. True if the group is binded to a product. + # hasflags: boolean int. True if the group is used by a flag type. # buglist: string. The list of bugs included in this group. #%] @@ -81,11 +82,20 @@
Delete this group anyway, and make the [% name FILTER html %] publicly visible.

[% END %] + + [% IF hasflags %] +

This group restricts who can make changes to flags of certain types. + You cannot delete this group while there are flag types using it. + +
Show + me which types - Remove all + flag types from this group for me.

+ [% END %]

Confirmation

Do you really want to delete this group?

- [% IF (hasusers || hasbugs || hasproduct) %] + [% IF (hasusers || hasbugs || hasproduct || hasflags) %]

You must check all of the above boxes or correct the indicated problems first before you can proceed.

[% END %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 93c50b85a..c92824ad3 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -344,6 +344,17 @@ [% title = "Flag Type Name Invalid" %] The name [% name FILTER html %] must be 1-50 characters long. + [% ELSIF error == "flag_update_denied" %] + [% title = "Flag Modification Denied" %] + You tried to [% IF status == "+" %] grant [% ELSIF status == "-" %] deny + [% ELSIF status == "X" %] clear [% ELSE %] request [% END %] + [% name FILTER html %] + [% IF status == "?" && old_status != "X" %], but this flag is already + set[% END %]. + Only a sufficiently empowered user [% IF status == "X" %] or the user who + set [% name FILTER html %][% old_status FILTER html %] in + the first place [% END %] can make this change. + [% ELSIF error == "format_not_found" %] [% title = "Format Not Found" %] The requested format [% format FILTER html %] does not exist with @@ -362,6 +373,11 @@ [% title = "Group not specified" %] No group was specified. + [% ELSIF error == "group_unknown" %] + [% title = "Unknown Group" %] + The group [% name FILTER html %] does not exist. Please specify + a valid group name. Create it first if necessary! + [% ELSIF error == "illegal_at_least_x_votes" %] [% title = "Your Search Makes No Sense" %] The At least ___ votes field must be a simple number. -- cgit v1.2.3-24-g4f1b