From 7f0ba708827dec5bb77222405009f1771e43655a Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Thu, 31 Jul 2008 02:47:25 +0000 Subject: Bug 313122: Implement Product->create, $product->update and $product->remove_from_db, and make editproducts.cgi use them - Patch by Frédéric Buclin r=mkanat a=LpSolit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/products/confirm-delete.html.tmpl | 28 ++----- .../en/default/admin/products/create.html.tmpl | 2 - template/en/default/admin/products/edit.html.tmpl | 5 +- .../en/default/admin/products/footer.html.tmpl | 4 +- template/en/default/admin/products/list.html.tmpl | 7 +- .../en/default/admin/products/updated.html.tmpl | 93 ++++++++-------------- template/en/default/filterexceptions.pl | 4 - template/en/default/global/messages.html.tmpl | 6 ++ template/en/default/global/user-error.html.tmpl | 80 +++++++------------ 9 files changed, 78 insertions(+), 151 deletions(-) (limited to 'template/en') diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl index 7667d70e5..43ebf8a81 100644 --- a/template/en/default/admin/products/confirm-delete.html.tmpl +++ b/template/en/default/admin/products/confirm-delete.html.tmpl @@ -31,14 +31,6 @@ style_urls = ['skins/standard/admin.css'] %] -[% IF classification %] - [% classification_url_part = BLOCK %]&classification= - [%- classification.name FILTER url_quote %] - [%- END %] -[% ELSE %] - [% classification_url_part = "" %] -[% END %] - @@ -66,8 +58,7 @@ @@ -113,8 +104,7 @@
Field
Product: - + [% product.name FILTER html %]
[% IF product.components.size > 0 %] - Components: @@ -148,8 +138,7 @@
[% IF product.versions.size > 0 %] - + Versions: [% ELSE %] @@ -172,8 +161,7 @@
[% IF product.milestones.size > 0 %] - + Milestones: [% ELSE %] @@ -196,10 +184,8 @@ [% terms.Bugs %]: [% IF product.bug_count %] - + [% product.bug_count FILTER html %] [% ELSE %] @@ -264,8 +250,6 @@ - [% END %] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index e1cd38140..49c4ca71f 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -53,8 +53,6 @@
- - + [%- product.name FILTER url_quote %]"> Edit Group Access Controls: @@ -139,8 +138,6 @@ versions: value="[% product.name FILTER html %]"> - diff --git a/template/en/default/admin/products/footer.html.tmpl b/template/en/default/admin/products/footer.html.tmpl index 4b8fe053b..c35551748 100644 --- a/template/en/default/admin/products/footer.html.tmpl +++ b/template/en/default/admin/products/footer.html.tmpl @@ -61,9 +61,7 @@ Edit product + href="editproducts.cgi?action=edit&product=[% product.name FILTER url_quote %]"> '[% product.name FILTER html %]'. [% END %] diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl index 3f1576913..b82a6a5b0 100644 --- a/template/en/default/admin/products/list.html.tmpl +++ b/template/en/default/admin/products/list.html.tmpl @@ -39,14 +39,13 @@ [% edit_contentlink = BLOCK %] editproducts.cgi?action=edit&product=%%name%% - [%- classification_url_part %] [% END %] [% delete_contentlink = BLOCK %] editproducts.cgi?action=del&product=%%name%% - [%- classification_url_part %] [% END %] -[% bug_count_contentlink = BLOCK %]buglist.cgi?product=%%name%% - [%- classification_url_part %][% END %] +[% bug_count_contentlink = BLOCK %] + buglist.cgi?product=%%name%% +[% END %] [% columns = [ diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl index 4d5f518ec..b04fa4663 100644 --- a/template/en/default/admin/products/updated.html.tmpl +++ b/template/en/default/admin/products/updated.html.tmpl @@ -16,38 +16,18 @@ # Rights Reserved. # # Contributor(s): Gavin Shelley + # Frédéric Buclin #%] [%# INTERFACE: - # - # old_product : Bugzilla::Product Object; old product. # product : Bugzilla::Product Object; new product. - # # classification: Bugzilla::Classification Object; The product classification (may be empty or missing) - # - # checkvotes: boolean; is true if vote related fields have changed. If so, - # then the following parameters will be specified: - # - # toomanyvotes: list of hashes, each one with an 'id' and a 'name' hash key - # detailing the bug id and the username of users who had too - # many votes for a bug - # - # toomanytotalvotes: list of hashes, each one with an 'id' and a 'name' hash key - # detailing the bug id and the username of users who had - # too many total votes - # - # confirmedbugs: list of bug ids, which were confirmed by votes - # - # changer: string; login of the user making the changes, used for mailing - # bug changes if necessary - # + # changes: hashref with all changes made to the product. Each key is an edited field, + # and its value is an arrayref of the form [old values, new values]. #%] [% IF classification %] - [% classification_url_part = BLOCK %]&classification= - [%- classification.name FILTER url_quote %] - [% END %] - [% classification_text = BLOCK %] + [% classification_text = BLOCK %] of classification '[% classification.name FILTER html %]' [% END %] [% END %] @@ -58,28 +38,24 @@ title = title style_urls = ['skins/standard/admin.css'] %] -[% updated = 0 %] -[% IF product.name != old_product.name %] +[% IF changes.name.defined %]

- Updated product name from '[% old_product.name FILTER html %]' to - [% product.name FILTER html %]. + Updated product name from '[% changes.name.0 FILTER html %]' to + '[% product.name FILTER html %]'.

- [% updated = 1 %] [% END %] -[% IF product.description != old_product.description %] +[% IF changes.description.defined %]

Updated description to:

[% product.description FILTER html_light %]

- [% updated = 1 %] [% END %] -[% IF product.disallow_new != old_product.disallow_new %] +[% IF changes.disallownew.defined %]

Product is now [% IF product.disallow_new %] @@ -89,15 +65,14 @@ [% END %] new [% terms.bugs %].

- [% updated = 1 %] [% END %] -[% IF product.milestone_url != old_product.milestone_url %] +[% IF changes.milestoneurl.defined %]

Updated milestone URL - [% IF old_product.milestone_url != '' %] - from
- [%- old_product.milestone_url FILTER html %] + [% IF changes.milestoneurl.0 != '' %] + from
+ [%- changes.milestoneurl.0 FILTER html %] [% END %] to [% IF product.milestone_url != '' %] @@ -107,45 +82,43 @@ be empty. [% END %]

- [% updated = 1 %] [% END %] -[% IF product.default_milestone != old_product.default_milestone %] +[% IF changes.defaultmilestone.defined %]

- Updated default milestone from '[% old_product.default_milestone FILTER html %]' to + Updated default milestone from '[% changes.defaultmilestone.0 FILTER html %]' to '[% product.default_milestone FILTER html %]'.

- [% updated = 1 %] [% END %] -[% IF product.votes_per_user != old_product.votes_per_user %] +[% IF changes.votesperuser.defined %]

Updated votes per user from - [%+ old_product.votes_per_user FILTER html %] to + [%+ changes.votesperuser.0 FILTER html %] to [%+ product.votes_per_user FILTER html %].

- [% updated = 1 %] + [% checkvotes = 1 %] [% END %] -[% IF product.max_votes_per_bug != old_product.max_votes_per_bug %] +[% IF changes.maxvotesperbug.defined %]

Updated maximum votes per [% terms.bug %] from - [%+ old_product.max_votes_per_bug FILTER html %] to + [%+ changes.maxvotesperbug.0 FILTER html %] to [%+ product.max_votes_per_bug FILTER html %].

- [% updated = 1 %] + [% checkvotes = 1 %] [% END %] -[% IF product.votes_to_confirm != old_product.votes_to_confirm %] +[% IF changes.votestoconfirm.defined %]

Updated number of votes needed to confirm a [% terms.bug %] from - [%+ old_product.votes_to_confirm FILTER html %] to + [%+ changes.votestoconfirm.0 FILTER html %] to [%+ product.votes_to_confirm FILTER html %].

- [% updated = 1 %] + [% checkvotes = 1 %] [% END %] -[% UNLESS updated %] +[% IF !changes.keys.size %]

Nothing changed for product '[% product.name FILTER html %]'.

[% END %] @@ -159,8 +132,8 @@

Checking existing votes in this product for anybody who now has too many votes for [% terms.abug %]...
- [% IF toomanyvotes.size > 0 %] - [% FOREACH detail = toomanyvotes %] + [% IF changes.too_many_votes.size %] + [% FOREACH detail = changes.too_many_votes %] →removed votes for [% terms.bug %] [%- detail.id FILTER html %] from [% detail.name FILTER html %]
@@ -172,8 +145,8 @@

Checking existing votes in this product for anybody who now has too many total votes...
- [% IF toomanytotalvotes.size > 0 %] - [% FOREACH detail = toomanytotalvotes %] + [% IF changes.too_many_total_votes.size %] + [% FOREACH detail = changes.too_many_total_votes %] →removed votes for [% terms.bug %] [%- detail.id FILTER html %] from [% detail.name FILTER html %]
@@ -185,14 +158,14 @@

Checking unconfirmed [% terms.bugs %] in this product for any which now have sufficient votes...
- [% IF confirmedbugs.size > 0 %] - [% FOREACH id = confirmedbugs %] + [% IF changes.confirmed_bugs.size %] + [% FOREACH id = changes.confirmed_bugs %] [%# This is INCLUDED instead of PROCESSED to avoid variables getting overwritten, which happens otherwise %] [% INCLUDE bug/process/results.html.tmpl type = 'votes' - mailrecipients = { 'changer' => changer } + mailrecipients = { 'changer' => user.login } header_done = 1 id = id %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index a02c644ef..056341b53 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -474,10 +474,6 @@ 'classification_url_part', ], -'admin/products/confirm-delete.html.tmpl' => [ - 'classification_url_part', -], - 'admin/products/footer.html.tmpl' => [ 'classification_url_part', 'classification_text', diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index fa66e273b..b67e7d598 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -129,6 +129,9 @@ [% ELSIF message_tag == "bug_has_duplicate" %] *** [% terms.Bug %] [%+ dupe FILTER html %] has been marked as a duplicate of this [% terms.bug %]. *** + [% ELSIF message_tag == "bug_group_description" %] + Access to [% terms.bugs %] in the [% product.name FILTER html %] product + [% ELSIF message_tag == "bug_moved_to" %]

[% terms.Bug %] moved to [% Param("move-to-url") FILTER html %].

If the move succeeded, [% login FILTER html %] will receive a mail @@ -706,6 +709,9 @@ [% ELSIF message_tag == "series_all_closed" %] All Closed + [% ELSIF message_tag == "series_subcategory" %] + -All- + [% ELSIF message_tag == "sudo_started" %] [% title = "Sudo session started" %] The sudo session has been started. For the next 6 hours, or until you diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 804a1913b..fbab7625c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -273,11 +273,6 @@ [% title = "Classification Does Not Exist" %] The classification '[% name FILTER html %]' does not exist. - [% ELSIF error == "classification_doesnt_exist_for_product" %] - [% title = "Classification Does Not Exist For Product" %] - The classification '[% classification FILTER html %]' does not exist - for product '[% product FILTER html %]'. - [% ELSIF error == "classification_invalid_sortkey" %] [% title = "Invalid Sortkey for Classification" %] The sortkey [% sortkey FILTER html %] for the '[% name FILTER html %]' @@ -313,8 +308,8 @@ [% ELSIF error == "component_name_too_long" %] [% title = "Component Name Is Too Long" %] - The name of a component is limited to 64 characters. - '[% name FILTER html %]' is too long ([% name.length %] characters). + The name of a component is limited to [% constants.MAX_COMPONENT_SIZE FILTER html %] + characters. '[% name FILTER html %]' is too long ([% name.length %] characters). [% ELSIF error == "component_need_initialowner" %] [% title = "Component Requires Default Assignee" %] @@ -952,8 +947,8 @@ [% ELSIF error == "milestone_name_too_long" %] [% title = "Milestone Name Is Too Long" %] - The name of a milestone is limited to 20 characters. - '[% name FILTER html %]' is too long ([% name.length %] characters). + The name of a milestone is limited to [% constants.MAX_MILESTONE_SIZE FILTER html %] + characters. '[% name FILTER html %]' is too long ([% name.length %] characters). [% ELSIF error == "milestone_required" %] [% title = "Milestone Required" %] @@ -1241,37 +1236,19 @@ [% title = "Specified Product Does Not Exist" %] The product '[% product FILTER html %]' does not exist. - [% ELSIF error == "product_votes_per_bug_must_be_nonnegative" %] - [% title = "Maximum Votes Must Be Non-negative" %] - [% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %] - '[% maxvotesperbug FILTER html %]' is an invalid value for the - 'Maximum Votes Per [% terms.Bug %]' field, which should - contain a non-negative number. - - [% ELSIF error == "product_votes_per_user_must_be_nonnegative" %] - [% title = "Votes Per User Must Be Non-negative" %] - [% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %] - '[% votesperuser FILTER html %]' is an invalid value for the - 'Votes Per User' field, which should contain a - non-negative number. - - [% ELSIF error == "product_votes_to_confirm_must_be_nonnegative" %] - [% title = "Votes To Confirm Must Be Non-negative" %] + [% ELSIF error == "product_illegal_votes" %] + [% title = "Votes Must Be Non-negative" %] [% admindocslinks = {'voting.html' => 'Setting up the voting feature'} %] - '[% votestoconfirm FILTER html %]' is an invalid value for the - 'Votes To Confirm' field, which should contain a - non-negative number. - - [% ELSIF error == "product_cant_delete_description" %] - [% title = "Cannot delete product description" %] - [% admindocslinks = {'products.html' => 'Administering products'} %] - Cannot delete the description for product - '[% product FILTER html %]'. - - [% ELSIF error == "product_cant_delete_name" %] - [% title = "Cannot delete product name" %] - [% admindocslinks = {'products.html' => 'Administering products'} %] - Cannot delete the product name for product '[% product FILTER html %]'. + '[% votes FILTER html %]' is an invalid value for the + + [% IF field == "votesperuser" %] + Votes Per User + [% ELSIF field == "maxvotesperbug" %] + Maximum Votes Per [% terms.Bug %] + [% ELSIF field == "votestoconfirm" %] + Votes To Confirm + [% END %] + field, which should contain a non-negative number. [% ELSIF error == "product_name_already_in_use" %] [% title = "Product name already in use" %] @@ -1284,19 +1261,17 @@ The product name '[% product FILTER html %]' differs from existing product '[% existing_product FILTER html %]' only in case. + [% ELSIF error == "product_name_too_long" %] + [% title = "Product name too long" %] + The name of a product is limited to [% constants.MAX_PRODUCT_SIZE FILTER html %] + characters. '[% name FILTER html %]' is too long ([% name.length %] characters). + [% ELSIF error == "product_must_define_defaultmilestone" %] [% title = "Must define new default milestone" %] [% admindocslinks = {'products.html' => 'Administering products', 'milestones.html' => 'About Milestones'} %] - [% IF classification %] - [% classification_url_part = BLOCK %]&classification= - [%- classification FILTER url_quote %] - [% END %] - [% END %] - You must - create the milestone '[% defaultmilestone FILTER html %]' before + You must + create the milestone '[% milestone FILTER html %]' before it can be made the default milestone for product '[% product FILTER html %]'. [% ELSIF error == "product_admin_denied" %] @@ -1306,7 +1281,7 @@ [% ELSIF error == "product_blank_name" %] [% title = "Blank Product Name Not Allowed" %] [% admindocslinks = {'products.html' => 'Administering products'} %] - You must enter a name for the new product. + You must enter a name for the product. [% ELSIF error == "product_disabled" %] [% title = BLOCK %]Product closed for [% terms.Bug %] Entry[% END %] @@ -1331,13 +1306,13 @@ [% ELSIF error == "product_must_have_description" %] [% title = "Product needs Description" %] [% admindocslinks = {'products.html' => 'Administering products'} %] - You must enter a description for product '[% product FILTER html %]'. + You must enter a description for this product. [% ELSIF error == "product_must_have_version" %] [% title = "Product needs Version" %] [% admindocslinks = {'products.html' => 'Administering products', 'versions.html' => 'Administering versions'} %] - You must enter a version for product '[% product FILTER html %]'. + You must enter a valid version to create a new product. [% ELSIF error == "product_not_specified" %] [% title = "No Product Specified" %] @@ -1363,7 +1338,8 @@ [% ELSIF error == "query_name_too_long" %] [% title = "Query Name Too Long" %] - The name of the query must be less than 64 characters long. + The name of the query must be less than [% constants.MAX_LEN_QUERY_NAME FILTER html %] + characters long. [% ELSIF error == "quicksearch_unknown_field" %] [% title = "Unknown QuickSearch Field" %] -- cgit v1.2.3-24-g4f1b