| Summary: | Remove files left behind after removing Solr | ||
|---|---|---|---|
| Product: | Koha | Reporter: | Owen Leonard <oleonard> |
| Component: | Templates | Assignee: | Owen Leonard <oleonard> |
| Status: | CLOSED FIXED | QA Contact: | Marcel de Rooy <m.de.rooy> |
| Severity: | minor | ||
| Priority: | P5 - low | CC: | fridolin.somers, m.de.rooy, martin.renvoize, nick |
| Version: | Main | ||
| Hardware: | All | ||
| OS: | All | ||
| Change sponsored?: | --- | Patch complexity: | Trivial patch |
| Documentation contact: | Documentation submission: | ||
| Text to go in the release notes: | Version(s) released in: | ||
| Circulation function: | |||
| Bug Depends on: | 12538 | ||
| Bug Blocks: | |||
| Attachments: |
Bug 20974: Remove files left behind after removing Solr
Bug 20974: Remove files left behind after removing Solr Bug 20974: Remove files left behind after removing Solr |
||
|
Description
Owen Leonard
2018-06-21 13:34:10 UTC
Created attachment 76229 [details] [review] 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. Created attachment 76762 [details] [review] 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> 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. 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. (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. Created attachment 76970 [details] [review] 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> Awesome work all! Pushed to master for 18.11 Pushed to 18.05.x for 18.05.03, always nice to tidy up a bit :) |