From 48b0cf3844779964de405a3139f8c0b3f0d7dc56 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Thu, 15 Jun 2006 04:20:52 +0000 Subject: Bug 319067: editflagtypes.cgi should allow to filter flag types based on their product/component - Patch by Frédéric Buclin r=wicked a=myk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/admin/flag-type/edit.html.tmpl | 12 +------ template/en/default/admin/flag-type/list.html.tmpl | 40 ++++++++++++++++++++++ template/en/default/global/code-error.html.tmpl | 3 -- template/en/default/global/js-products.html.tmpl | 33 ++++++++++++++++++ template/en/default/global/user-error.html.tmpl | 4 +++ template/en/default/request/queue.html.tmpl | 12 +------ 6 files changed, 79 insertions(+), 25 deletions(-) create mode 100644 template/en/default/global/js-products.html.tmpl (limited to 'template/en') diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl index cb3ce9e17..483a5d2de 100644 --- a/template/en/default/admin/flag-type/edit.html.tmpl +++ b/template/en/default/admin/flag-type/edit.html.tmpl @@ -22,17 +22,7 @@ [% PROCESS global/variables.none.tmpl %] -[%# The javascript block gets used in header.html.tmpl. %] -[% javascript = BLOCK %] - var usetms = 0; // do we have target milestone? - var first_load = 1; // is this the first time we load the page? - var last_sel = []; // caches last selection - var cpts = new Array(); - [% FOREACH prod = products %] - cpts['[% prod.name FILTER js %]'] = [ - [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; - [% END %] -[% END %] +[% PROCESS "global/js-products.html.tmpl" %] [% IF type.target_type == "bug" %] [% title = BLOCK %]Create Flag Type for [% terms.Bugs %][% END %] diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl index a9dc40519..7ca897ecd 100644 --- a/template/en/default/admin/flag-type/list.html.tmpl +++ b/template/en/default/admin/flag-type/list.html.tmpl @@ -21,6 +21,8 @@ [% PROCESS global/variables.none.tmpl %] +[% PROCESS "global/js-products.html.tmpl" %] + [% PROCESS global/header.html.tmpl title = 'Administer Flag Types' style = " @@ -28,6 +30,8 @@ .inactive { color: #787878; } .multiplicable { display: block; } " + onload="selectProduct(document.forms[0], 'product', 'component', '__All__');" + javascript_urls=["productmenu.js"] %]

@@ -44,6 +48,42 @@ depending on whether the patch passed or failed review.

+

+ You can restrict the list of flag types to those available for a given product + and component. If a product is selected with no component, only flag types + which are available to ALL components of the product are shown. +

+ +
+ + + + + + + + +
+ + + +
+
+

Flag Types for [% terms.Bugs %]

[% PROCESS display_flag_types types=bug_types %] diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 5081589ed..e1dfe57d9 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -227,9 +227,6 @@ [% END %] is invalid. - [% ELSIF error == "flag_type_component_without_product" %] - A component was selected without a product being selected. - [% ELSIF error == "flag_type_id_invalid" %] The flag type ID [% id FILTER html %] is not a positive integer. diff --git a/template/en/default/global/js-products.html.tmpl b/template/en/default/global/js-products.html.tmpl new file mode 100644 index 000000000..57126f004 --- /dev/null +++ b/template/en/default/global/js-products.html.tmpl @@ -0,0 +1,33 @@ +[%# 1.0@bugzilla.org %] +[%# 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): Myk Melez + # Frédéric Buclin + #%] + +[%# The javascript block gets used in header.html.tmpl. %] +[% javascript = BLOCK %] + var usetms = 0; // do we have target milestone? + var first_load = 1; // is this the first time we load the page? + var last_sel = []; // caches last selection + var cpts = new Array(); + [% FOREACH prod = products %] + cpts['[% prod.name FILTER js %]'] = [ + [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; + [% END %] +[% END %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 49375de0e..dd2e529c2 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -473,6 +473,10 @@ [% admindocslinks = {'flags-overview.html#flags-admin' => 'Administering Flags'} %] The CC list [% cc_list FILTER html %] must be less than 200 characters long. + [% ELSIF error == "flag_type_component_without_product" %] + [% title = "Product Missing" %] + A component was selected without a product being selected. + [% ELSIF error == "flag_type_description_invalid" %] [% title = "Flag Type Description Invalid" %] [% admindocslinks = {'flags-overview.html#flags-admin' => 'Administering Flags'} %] diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl index 73bbd8195..573e95bfa 100644 --- a/template/en/default/request/queue.html.tmpl +++ b/template/en/default/request/queue.html.tmpl @@ -24,17 +24,7 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] -[%# The javascript block gets used in header.html.tmpl. %] -[% javascript = BLOCK %] - var usetms = 0; // do we have target milestone? - var first_load = 1; // is this the first time we load the page? - var last_sel = []; // caches last selection - var cpts = new Array(); - [% FOREACH prod = products %] - cpts['[% prod.name FILTER js %]'] = [ - [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ]; - [% END %] -[% END %] +[% PROCESS "global/js-products.html.tmpl" %] [% PROCESS global/header.html.tmpl title="Request Queue" -- cgit v1.2.3-24-g4f1b