\n";
-
-}
-
sub Validate ($$) {
my ($name, $description) = @_;
if ($name eq "") {
- print "You must enter a non-blank name for the keyword. Please press\n";
- print "Back and try again.\n";
- PutTrailer($localtrailer);
+ ThrowUserError("keyword_blank_name");
exit;
}
if ($name =~ /[\s,]/) {
- print "You may not use commas or whitespace in a keyword name.\n";
- print "Please press Back and try again.\n";
- PutTrailer($localtrailer);
+ ThrowUserError("keyword_invalid_name");
exit;
}
if ($description eq "") {
- print "You must enter a non-blank description of the keyword.\n";
- print "Please press Back and try again.\n";
- PutTrailer($localtrailer);
+ ThrowUserError("keyword_blank_description");
exit;
}
}
@@ -121,10 +57,7 @@ confirm_login();
print Bugzilla->cgi->header();
unless (UserInGroup("editkeywords")) {
- PutHeader("Not allowed");
- print "Sorry, you aren't a member of the 'editkeywords' group.\n";
- print "And so, you aren't allowed to add, modify or delete keywords.\n";
- PutTrailer();
+ ThrowUserError("keyword_access_denied");
exit;
}
@@ -136,51 +69,31 @@ detaint_natural($::FORM{id});
if ($action eq "") {
- PutHeader("Select keyword");
- my $tableheader = qq{
-
-
-
Edit keyword ...
-
Description
-
Bugs
-
Action
-
-};
- print $tableheader;
- my $line_count = 0;
- my $max_table_size = 50;
+ my @keywords;
SendSQL("SELECT keyworddefs.id, keyworddefs.name, keyworddefs.description,
COUNT(keywords.bug_id)
FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id = keywords.keywordid
GROUP BY keyworddefs.id
ORDER BY keyworddefs.name");
+
while (MoreSQLData()) {
my ($id, $name, $description, $bugs) = FetchSQLData();
- $description ||= "missing";
- $bugs ||= 'none';
- if ($line_count == $max_table_size) {
- print "
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/keywords/created.html.tmpl b/template/en/default/admin/keywords/created.html.tmpl
new file mode 100755
index 000000000..ebb6a1f9f
--- /dev/null
+++ b/template/en/default/admin/keywords/created.html.tmpl
@@ -0,0 +1,36 @@
+
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Terry Weissman
+ # Vlad Dascalu
+ #%]
+
+[%# INTERFACE:
+ # name: string; the name of the current keyword.
+ #%]
+
+[% PROCESS global/header.html.tmpl
+ title = "Adding new keyword"
+%]
+
+
The keyword [% name FILTER html %] has been added.
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
new file mode 100755
index 000000000..2f84e147a
--- /dev/null
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -0,0 +1,68 @@
+
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Terry Weissman
+ # Vlad Dascalu
+ #%]
+
+[%# INTERFACE:
+ # keyword_id: number. The ID of the keyword.
+ # name: string. The name of the keyword.
+ # description: string. The description of the keyword.
+ # bug_count: number. The number of bugs with the keyword.
+ #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
+ title = "Edit keyword"
+%]
+
+
+
+
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl
new file mode 100755
index 000000000..e1f6eefbd
--- /dev/null
+++ b/template/en/default/admin/keywords/list.html.tmpl
@@ -0,0 +1,95 @@
+
+[%# The contents of this file are subject to the Mozilla Public
+ # License Version 1.1 (the "License"); you may not use this file
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.mozilla.org/MPL/
+ #
+ # Software distributed under the License is distributed on an "AS
+ # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ # implied. See the License for the specific language governing
+ # rights and limitations under the License.
+ #
+ # The Original Code is the Bugzilla Bug Tracking System.
+ #
+ # The Initial Developer of the Original Code is Netscape Communications
+ # Corporation. Portions created by Netscape are
+ # Copyright (C) 1998 Netscape Communications Corporation. All
+ # Rights Reserved.
+ #
+ # Contributor(s): Terry Weissman
+ # Vlad Dascalu
+ #%]
+
+[%# INTERFACE:
+ # max_table_size: number. Determines the maximum number of
+ # rows in each keywords table.
+ # keywords: array with keyword objects having the properties:
+ # - keyword_id: number. The ID of the keyword.
+ # - name: string. The name of the keyword.
+ # - description: string. The description of the keyword.
+ # - bug_count: number. The number of bugs with the keyword.
+ #%]
+
+[% PROCESS global/variables.none.tmpl %]
+
+[% PROCESS global/header.html.tmpl
+ title = "Select keyword"
+%]
+
+[% max_table_size = 50 %]
+
+[% BLOCK table_header %]
+
+
+
Edit keyword ...
+
Description
+
[% terms.Bugs %]
+
Action
+
+[% END %]
+
+[% BLOCK table_footer %]
+
+[% END %]
+
+[% FOREACH keyword = keywords %]
+ [% IF loop.count() % max_table_size == 1 %]
+ [% PROCESS table_header %]
+ [% END %]
+
+
+
+[% PROCESS table_footer %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/keywords/rebuild-cache.html.tmpl b/template/en/default/admin/keywords/rebuild-cache.html.tmpl
index 4c4ea4b9a..bd68f9ed5 100755
--- a/template/en/default/admin/keywords/rebuild-cache.html.tmpl
+++ b/template/en/default/admin/keywords/rebuild-cache.html.tmpl
@@ -21,8 +21,8 @@
#%]
[%# INTERFACE:
- # action: string. Contains the current action (either "update" or "delete").
- # name: string. Contains the name of the current keyword.
+ # action: string; the current action (either "update" or "delete").
+ # name: string; the name of the current keyword.
#%]
[% IF action == "update" %]
@@ -50,7 +50,6 @@ Keyword [% name FILTER html %] [%+status FILTER html %].
keyword cache
-
[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index c75f86bb3..05b52c5b8 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -492,6 +492,16 @@
'const.CONTROLMAPMANDATORY',
],
+'admin/keywords/list.html.tmpl' => [
+ 'keyword.id',
+ 'keyword.bug_count',
+],
+
+'admin/keywords/edit.html.tmpl' => [
+ 'keyword_id',
+ 'bug_count',
+],
+
'admin/keywords/confirm-delete.html.tmpl' => [
'keyword_id',
'bug_count',
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 82be89b1d..6f0881c20 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -171,6 +171,10 @@
[% ELSIF error == "invalid_field_name" %]
Can't use [% field FILTER html %] as a field name.
+
+ [% ELSIF error == "invalid_keyword_id" %]
+ The keyword ID [% id FILTER html %] couldn't be
+ found.
[% ELSIF error == "missing_bug_id" %]
No [% terms.bug %] ID was given.
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 1bbd00efc..f20081529 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -387,6 +387,27 @@
[% ELSIF error == "invalid_username_or_password" %]
[% title = "Invalid Username Or Password" %]
The username or password you entered is not valid.
+
+ [% ELSIF error == "keyword_access_denied" %]
+ [% title = "Access Denied" %]
+ Sorry, you aren't a member of the 'editkeywords' group, and so
+ you aren't allowed to add, modify or delete keywords.
+
+ [% ELSIF error == "keyword_already_exists" %]
+ [% title = "Keyword Already Exists" %]
+ A keyword with the name [% name FILTER html %] already exists.
+
+ [% ELSIF error == "keyword_blank_description" %]
+ [% title = "Blank Keyword Description Not Allowed" %]
+ You must enter a non-blank description for the keyword.
+
+ [% ELSIF error == "keyword_blank_name" %]
+ [% title = "Blank Keyword Name Not Allowed" %]
+ You must enter a non-blank name for the keyword.
+
+ [% ELSIF error == "keyword_invalid_name" %]
+ [% title = "Invalid Keyword Name" %]
+ You may not use commas or whitespace in a keyword name.
[% ELSIF error == "login_needed_for_password_change" %]
[% title = "Login Name Required" %]
--
cgit v1.2.3-24-g4f1b