[Bug 20974] New: Remove files left behind after removing Solr
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Bug ID: 20974 Summary: Remove files left behind after removing Solr Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: minor Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org CC: nick@bywatersolutions.com Depends on: 12538 Three OPAC template files were left behind when Solr support was removed: opac-tmpl/bootstrap/en/includes/search/facets.inc opac-tmpl/bootstrap/en/includes/search/page-numbers.inc opac-tmpl/bootstrap/en/includes/search/resort_form.inc Originally added by Bug 8233, "SearchEngine: Add a Koha::SearchEngine module" http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=623f3a2c84fea04e... Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12538 [Bug 12538] Solr removal -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff Patch complexity|--- |Trivial patch -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 76229 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=76229&action=edit Bug 20974: Remove files left behind after removing Solr Some files were left behind when Bug 12538 removed support for Solr. This patch removes them. To test, apply the patch and fail to observe the existence of these files: koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc Perform a search in the OPAC to confirm that nothing broke. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #76229|0 |1 is obsolete| | --- Comment #2 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 76762 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=76762&action=edit Bug 20974: Remove files left behind after removing Solr Some files were left behind when Bug 12538 removed support for Solr. This patch removes them. To test, apply the patch and fail to observe the existence of these files: koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc Perform a search in the OPAC to confirm that nothing broke. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA CC| |m.de.rooy@rijksmuseum.nl --- Comment #3 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- How did you test this, guys? git grep -E "INCLUDE [']?facets.inc" git grep -E "INCLUDE [']?page-numbers.inc" git grep -E "INCLUDE [']?resort_form.inc" Every statement still produces results ! "Perform a search in the OPAC" is stated too simply? The test depends on more settings. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |katrin.fischer@bsz-bw.de Status|Failed QA |Signed Off --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Marcel, please take a closer look. There are small differences: 1) git grep -E "INCLUDE [']?facets.inc" koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt:[% INCLUDE 'facets.inc' %] This is the intranet version of the file. The patch removes from bootstrap. 2) git grep -E "INCLUDE [']?page-numbers.inc" koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt: [% INCLUDE 'page-numbers.inc' %] koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt: [% INCLUDE 'page-numbers.inc' %] koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt: [% INCLUDE 'page-numbers.inc' %] koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt: <div id="top-pages">[% INCLUDE 'page-numbers.inc' %]</div> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt: <div id="bottom-pages">[% INCLUDE 'page-numbers.inc' %]</div> The file removed is from includes/search/, not includes. The file in includes is still there. 3) git grep -E "INCLUDE [']?resort_form.inc" Same for this one, the difference is includes/search vs. includes. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 --- Comment #5 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- (In reply to Katrin Fischer from comment #4)
Hi Marcel, please take a closer look. There are small differences:
1) git grep -E "INCLUDE [']?facets.inc" koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt:[% INCLUDE 'facets.inc' %]
This is the intranet version of the file. The patch removes from bootstrap.
2) git grep -E "INCLUDE [']?page-numbers.inc" koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt: [% INCLUDE 'page-numbers.inc' %] koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt: [% INCLUDE 'page-numbers.inc' %] koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt: [% INCLUDE 'page-numbers.inc' %] koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt: <div id="top-pages">[% INCLUDE 'page-numbers.inc' %]</div> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt: <div id="bottom-pages">[% INCLUDE 'page-numbers.inc' %]</div>
The file removed is from includes/search/, not includes. The file in includes is still there.
3) git grep -E "INCLUDE [']?resort_form.inc" Same for this one, the difference is includes/search vs. includes.
Hmm. Sorry for overlooking this. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #76762|0 |1 is obsolete| | --- Comment #6 from Marcel de Rooy <m.de.rooy@rijksmuseum.nl> --- Created attachment 76970 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=76970&action=edit Bug 20974: Remove files left behind after removing Solr Some files were left behind when Bug 12538 removed support for Solr. This patch removes them. To test, apply the patch and fail to observe the existence of these files: koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc Perform a search in the OPAC to confirm that nothing broke. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Marcel de Rooy <m.de.rooy@rijksmuseum.nl> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|testopia@bugs.koha-communit |m.de.rooy@rijksmuseum.nl |y.org | -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #7 from Nick Clemens <nick@bywatersolutions.com> --- Awesome work all! Pushed to master for 18.11 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |Pushed to Stable CC| |martin.renvoize@ptfs-europe | |.com --- Comment #8 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Pushed to 18.05.x for 18.05.03, always nice to tidy up a bit :) -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20974 Fridolin SOMERS <fridolin.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Stable |RESOLVED CC| |fridolin.somers@biblibre.co | |m Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org