Convert (almost) all INCLUDEs to PROCESSes in templates

RESOLVED FIXED in Bugzilla 2.16

Status

()

Bugzilla
Bugzilla-General
--
blocker
RESOLVED FIXED
16 years ago
5 years ago

People

(Reporter: gerv, Assigned: gerv)

Tracking

2.15
Bugzilla 2.16
x86
All
Dependency tree / graph

Details

Attachments

(1 attachment)

30.10 KB, patch
bbaetz
: review+
Andreas Franke (gone)
: review+
Details | Diff | Splinter Review
(Assignee)

Description

16 years ago
PROCESS is faster than INCLUDE; where we don't need the aliasing behaviour of
INCLUDE, we should use PROCESS. This is a search-and-replace job, basically -
there's only about one place we need INCLUDE - that's in dependency-tree.html.tmpl.

Gerv
(Assignee)

Updated

16 years ago
Depends on: 135707
(Assignee)

Comment 1

16 years ago
We need the patch on bug 135707 first, because it touches all the same lines of
the templates.

Gerv
(Assignee)

Updated

16 years ago
Target Milestone: --- → Bugzilla 2.16
(Assignee)

Comment 2

16 years ago
Created attachment 80103 [details] [diff] [review]
Patch v.1

All INCLUDEs to PROCESS where appropriate.

Gerv
(Assignee)

Comment 3

16 years ago
This patch is not affected by the files I forgot, which all used PROCESS anyway.
It's ready for review (and blocking any further work on the templates :-( ).

Gerv
(Assignee)

Comment 4

16 years ago
Taking.
 
Gerv
Severity: normal → blocker
Status: NEW → ASSIGNED
Keywords: patch, review

Updated

16 years ago
Attachment #80103 - Flags: review+
Comment on attachment 80103 [details] [diff] [review]
Patch v.1

I can't actually apply this to test (because you're using the new templaet
stuff), but its just changing header and footers except for one case.

r=bbaetz

Updated

16 years ago
Blocks: 139542

Comment 6

16 years ago
This is the essence of the patch (i.e. all bug header/footer changes):

ggrep -E '^[\+-]' include2process.patch | grep -v global/header.html.tmpl | grep
-v global/footer.html.tmpl | grep -v '+++ template/en/default' | grep -v '\-\-\-
template/en/default'

1. In template/en/default/account/prefs/prefs.html.tmpl , looks ok: 

-  [% INCLUDE "account/prefs/${current_tab.name}.html.tmpl" IF
current_tab.name.defined %]
+  [% PROCESS "account/prefs/${current_tab.name}.html.tmpl" IF
current_tab.name.defined %]

2. In template/en/default/bug/activity/show.html.tmpl , looks ok:

-[% INCLUDE bug/activity/table.html.tmpl %]
+[% PROCESS bug/activity/table.html.tmpl %]

3. In template/en/default/bug/create/created.html.tmpl , looks ok:

-[% INCLUDE bug/navigate.html.tmpl %]
+[% PROCESS bug/navigate.html.tmpl %]

4. In template/en/default/bug/edit.html.tmpl , looks ok:

-  [% INCLUDE attachment/list.html.tmpl
+  [% PROCESS attachment/list.html.tmpl

5. In template/en/default/bug/show-multiple.html.tmpl :
   This should probably fixed to read global/footer.html.tmpl :-)
   If you fix this, you have r=afranke. Testing this patch now.
   IMO there's no need for a new patch, so fix this and check it in.

-[% INCLUDE global/footer %]
+[% PROCESS global/footer %]

Comment 7

16 years ago
Comment on attachment 80103 [details] [diff] [review]
Patch v.1

Or, better yet, fix the footer --> footer.html.tmpl in a separate checkin after
this one. You have an implicit r=afranke x2 on that one.
Attachment #80103 - Flags: review+
(Assignee)

Comment 8

16 years ago
All fixed. Excellent :-)

Gerv
Status: ASSIGNED → RESOLVED
Last Resolved: 16 years ago
Resolution: --- → FIXED
QA Contact: matty_is_a_geek → default-qa
You need to log in before you can comment on or make changes to this bug.