https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=27113
David Cook <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|BLOCKED |Failed QA --- Comment #146 from David Cook <[email protected]> --- FYI tiny merge conflict when applying this at the moment: --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@@ -91,8 -91,8 +91,14 @@@ }); </script> [% END %] ++<<<<<<< HEAD + +[% IF Koha.Preference( 'CookieConsent' ) %] + [% Asset.js("js/cookieconsent.js") | $raw %] ++======= + <!-- Intranet inc JS IntranetAutocompleteElasticSearch --> + [% IF ( Koha.Preference('IntranetAutocompleteElasticSearch') ) %] + [% Asset.js("js/elasticsearch/autocomplete.js") | $raw %] ++>>>>>>> Bug 27113: ElasticSearch: Autocomplete in input search [% END %] <!-- / js_includes.inc --> -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
