diff options
| author | lpsolit%gmail.com <> | 2006-02-26 08:10:23 +0100 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2006-02-26 08:10:23 +0100 |
| commit | 645307b7dad849212762afcecf819a268cc810d3 (patch) | |
| tree | d4dfdb2ec688efd2ea17f7ff3fc9382175b7c2bc /template/en/default/global | |
| parent | 0bd92669e6bd6cde59e85cbf9e827feb94d2536c (diff) | |
| download | bugzilla-645307b7dad849212762afcecf819a268cc810d3.tar.gz bugzilla-645307b7dad849212762afcecf819a268cc810d3.tar.xz | |
Bug 284875: Move GetBugLink, GetAttachmentLink, and quoteUrls out of globals.pl - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=justdave
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/global/variables.none.tmpl | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 3863cb150..390c6b12c 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -82,8 +82,9 @@ [% ELSIF error == "alias_in_use" %] [% title = "Alias In Use" %] - [% terms.Bug %] [%+ bug_link FILTER none %] has already taken the alias - <em>[% alias FILTER html %]</em>. Please choose another one. + [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %] + has already taken the alias <em>[% alias FILTER html %]</em>. + Please choose another one. [% ELSIF error == "alias_not_defined" %] [% title = "Alias Is Not Defined" %] @@ -303,8 +304,11 @@ [% title = "Dependency Loop Detected" %] The following [% terms.bug %](s) would appear on both the "depends on" and "blocks" parts of the dependency tree if these changes - are committed: [% both FILTER none %]. This would create a circular - dependency, which is not allowed. + are committed: + [% FOREACH dep = deps %] + [%+ dep FILTER bug_link(dep) FILTER none %] + [% END %]. + This would create a circular dependency, which is not allowed. [% ELSIF error == "dependency_loop_single" %] [% title = "Dependency Loop Detected" %] diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index 76ec1bec6..d19d6407f 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -33,7 +33,7 @@ # This means if you change "bug" to "problem", then if you have # "problem 3" in a comment, it won't become a clickable URL. # To have that feature, you must edit the quoteUrls function in - # globals.pl (in the base Bugzilla directory). + # Bugzilla/Template.pm. # Change the line: # my $bug_re = qr/bug\s*\#?\s*(\d+)/i; # to something like: |