diff options
| -rw-r--r-- | globals.pl | 8 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 24 |
2 files changed, 20 insertions, 12 deletions
diff --git a/globals.pl b/globals.pl index 87d496c7b..89e70e0a8 100644 --- a/globals.pl +++ b/globals.pl @@ -506,17 +506,13 @@ sub CanEnterProductOrWarn { trick_taint($product); if (!defined $allow_new_bugs) { - ThrowUserError("missing_version_or_component", - { product => $product, - missing_item => 'Component' }) + ThrowUserError("missing_component", { product => $product }); } elsif (!$allow_new_bugs) { ThrowUserError("product_disabled", { product => $product}); } elsif ($allow_new_bugs < 0) { ThrowUserError("entry_access_denied", { product => $product}); } elsif (!$has_version) { - ThrowUserError("missing_version_or_component", - { product => $product, - missing_item => 'Version' }); + ThrowUserError("missing_version", { product => $product }); } return 1; } diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 800257ad9..df551e228 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -752,15 +752,14 @@ [% title = "Missing Category" %] You did not specify a category for this series. - [% ELSIF error == "missing_version_or_component" %] - [% title = BLOCK %]Missing [% missing_item FILTER none %][% END %] - Sorry; there needs to be at least one [% missing_item FILTER lower %] + [% ELSIF error == "missing_component" %] + [% title = "Missing Component" %] + Sorry; there needs to be at least one component associated with the product <em>[% product FILTER html %]</em> in order to create a new [% terms.bug %]. [% IF UserInGroup("editcomponents") %] - <a href="edit[% missing_item FILTER lower %]s.cgi?product= - [%- product FILTER url_quote %]">Create a new - [%+ missing_item FILTER lower %]</a>. + <a href="editcomponents.cgi?product=[% product FILTER url_quote %]">Create + a new component</a>. [% ELSE %] Please contact [% Param("maintainer") %], giving the name of the product in which you tried to create a new [% terms.bug %]. @@ -814,6 +813,19 @@ [% title = "Missing Subcategory" %] You did not specify a subcategory for this series. + [% ELSIF error == "missing_version" %] + [% title = "Missing Version" %] + Sorry; there needs to be at least one version + associated with the product <em>[% product FILTER html %]</em> in order to + create a new [% terms.bug %]. + [% IF UserInGroup("editcomponents") %] + <a href="editversions.cgi?product=[% product FILTER url_quote %]">Create + a new version</a>. + [% ELSE %] + Please contact [% Param("maintainer") %], giving the name of + the product in which you tried to create a new [% terms.bug %]. + [% END %] + [% ELSIF error == "need_component" %] [% title = "Component Required" %] You must specify a component to help determine the new assignee of these |