diff options
| author | Vladimir Panteleev <github.private@thecybershadow.net> | 2018-04-08 18:08:19 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-08 18:08:19 +0200 |
| commit | f786d42447d8515d5fb2fdd821c2635f95cbe1bf (patch) | |
| tree | ab76878be164064b73a6d4c52e271d927118e739 /template | |
| parent | 922c09396817fece1275365a474e5cbde6e1f99e (diff) | |
| download | bugzilla-f786d42447d8515d5fb2fdd821c2635f95cbe1bf.tar.gz bugzilla-f786d42447d8515d5fb2fdd821c2635f95cbe1bf.tar.xz | |
Bug 1446236 - Fix instant search without GuidedBugEntry (#38)
* instant-search.js: Don't fail if product map isn't loaded
getProduct had a hard dependency on the 'products' object, which is
provided by products.js from the GuidedBugEntry extension.
Check if the products variable exists before attempting to use
it. This can happen when loading products.js fails, which in turn can
happen when the GuidedBugEntry extension isn't present.
* Instant search: Don't load products.js without GuidedBugEntry
Fixes a 404 if the GuidedBugEntry extension is not present.
* instant-search.js: Use throbber.gif from core
Fixes remaining dependency on GuidedBugEntry.
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/search/search-instant.html.tmpl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl index d0cf078e7..ed3942166 100644 --- a/template/en/default/search/search-instant.html.tmpl +++ b/template/en/default/search/search-instant.html.tmpl @@ -8,11 +8,15 @@ [% PROCESS global/variables.none.tmpl %] +[% javascript_urls = [ 'js/instant-search.js' ] %] +[% IF has_extension('GuidedBugEntry') %] + [% javascript_urls.import(['extensions/GuidedBugEntry/web/js/products.js']); %] +[% END %] + [% PROCESS global/header.html.tmpl title = "Instant Search" generate_api_token = 1 - javascript_urls = [ 'extensions/GuidedBugEntry/web/js/products.js', - 'js/instant-search.js', ] + javascript_urls = javascript_urls %] [% UNLESS default.exists('product') && default.product.size %] |