From 645307b7dad849212762afcecf819a268cc810d3 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Sun, 26 Feb 2006 07:10:23 +0000 Subject: Bug 284875: Move GetBugLink, GetAttachmentLink, and quoteUrls out of globals.pl - Patch by Frédéric Buclin r=mkanat a=justdave MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/en/default/attachment/create.html.tmpl | 2 +- template/en/default/attachment/edit.html.tmpl | 2 +- template/en/default/attachment/show-multiple.html.tmpl | 2 +- template/en/default/bug/summarize-time.html.tmpl | 2 +- template/en/default/filterexceptions.pl | 2 +- template/en/default/global/user-error.html.tmpl | 12 ++++++++---- template/en/default/global/variables.none.tmpl | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index 4de1e5a08..410f274f2 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -26,7 +26,7 @@ [%# Define strings that will serve as the title and header of this page %] [% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %] [% h1 = BLOCK %]Create New Attachment for - [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] + [%+ "$terms.Bug $bugid" FILTER bug_link(bugid) FILTER none %][% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] [% PROCESS global/header.html.tmpl diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index 53eb44d9e..b2b5b13e5 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -28,7 +28,7 @@ [% END %] [% h1 = BLOCK %] Attachment [% attachment.id %] Details for - [%+ GetBugLink(attachment.bug_id, "$terms.Bug ${attachment.bug_id}") %] + [%+ "$terms.Bug ${attachment.bug_id}" FILTER bug_link(attachment.bug_id) FILTER none %] [% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index 06cea8683..03ad0ea47 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -22,7 +22,7 @@ [% PROCESS global/variables.none.tmpl %] [% filtered_summary = bugsummary FILTER html %] [% h1 = BLOCK %]View All Attachments for - [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] + [%+ "$terms.Bug $bugid" FILTER bug_link(bugid) FILTER none %][% END %] [% PROCESS global/header.html.tmpl title = "View All Attachments for $terms.Bug #$bugid" h1 = h1 diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index 5761b24cf..35808f951 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -21,7 +21,7 @@ [% title = "Time Summary " %] [% IF do_depends %] [% title = title _ "for " %] - [% h1 = title _ GetBugLink(ids.0, "$terms.Bug $ids.0") %] + [% h1 = title _ "$terms.Bug $ids.0" FILTER bug_link(ids.0) FILTER none %] [% title = title _ "$terms.Bug $ids.0: " %] [% h1 = (h1 _ " (and $terms.bugs blocking it)") IF do_depends %] [% ELSE %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index dbc618ee6..40a96e70b 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -29,7 +29,7 @@ # Simple literals - [% " selected" ... # Values always used for numbers - [% (i|j|k|n|count) %] # Params - [% Param(... -# Safe functions - [% (time2str|GetBugLink)... +# Safe functions - [% (time2str)... # Safe vmethods - [% foo.size %] [% foo.length %] # [% foo.push() %] # TT loop variables - [% loop.count %] 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 - [% alias FILTER html %]. Please choose another one. + [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %] + has already taken the alias [% alias FILTER html %]. + 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: -- cgit v1.2.3-24-g4f1b