I propose to reformat the record matching rules template (matching-rules.tt) so that it has consistent spacing and indentation.
Created attachment 106288 [details] [review] Bug 24899: Reindent record matching rules template This patch reindents the template the record matching rules template. The only non-whitespace changes where lines were combined or split. The diff using the '-w' flag to ignore whitespace should highlight only moved lines. Test that functionality is unaffected: Administration -> Record matching rules. Test adding, editing, and deleting record matching rules. Test adding, editing, and deleting match points and match checks. Confirm that changes are saved correctly.
Created attachment 106289 [details] [review] Bug 24899: (follow-up) Add markup comments This patch adds comments to the template to highlight the markup structure. This patch should have no effect on the interface or functionality.
Hi Owen. It all seemed to work - add, edit, and delete - I've never used this feature, so don't know exactly what it does though 8-) I did notice on lines 176, 181, and 186 of the updated file that matchpoint was changed to tchpoint If this is what is required, I will sign off. David
Created attachment 111139 [details] [review] Bug 24899: Reindent record matching rules template This patch reindents the template the record matching rules template. The only non-whitespace changes where lines were combined or split. The diff using the '-w' flag to ignore whitespace should highlight only moved lines. Test that functionality is unaffected: Administration -> Record matching rules. Test adding, editing, and deleting record matching rules. Test adding, editing, and deleting match points and match checks. Confirm that changes are saved correctly.
Created attachment 111140 [details] [review] Bug 24899: (follow-up) Add markup comments This patch adds comments to the template to highlight the markup structure. This patch should have no effect on the interface or functionality.
Created attachment 111180 [details] [review] Bug 24899: Reindent record matching rules template This patch reindents the template the record matching rules template. The only non-whitespace changes where lines were combined or split. The diff using the '-w' flag to ignore whitespace should highlight only moved lines. Test that functionality is unaffected: Administration -> Record matching rules. Test adding, editing, and deleting record matching rules. Test adding, editing, and deleting match points and match checks. Confirm that changes are saved correctly. Signed-off-by: David Nind <david@davidnind.com>
Created attachment 111181 [details] [review] Bug 24899: (follow-up) Add markup comments This patch adds comments to the template to highlight the markup structure. This patch should have no effect on the interface or functionality. Signed-off-by: David Nind <david@davidnind.com>
Created attachment 111182 [details] Bug 24899 - Display issue with match checks Hi Owen. I noticed this very minor display issue with match checks: 1. Add a match check 2. After the check is added, there is no spacing and | between Match check1 and Add match check, that is it displays as "Match check 1Add match check" (see attached image) This was the case before the patches were applied, and existing in 20.05.x as well. I can open another bug for this. David
Created attachment 111543 [details] [review] Bug 26529: (follow-up) Remove warning Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 111544 [details] [review] Bug 24899: Reindent record matching rules template This patch reindents the template the record matching rules template. The only non-whitespace changes where lines were combined or split. The diff using the '-w' flag to ignore whitespace should highlight only moved lines. Test that functionality is unaffected: Administration -> Record matching rules. Test adding, editing, and deleting record matching rules. Test adding, editing, and deleting match points and match checks. Confirm that changes are saved correctly. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 111545 [details] [review] Bug 24899: (follow-up) Add markup comments This patch adds comments to the template to highlight the markup structure. This patch should have no effect on the interface or functionality. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for 20.11, thanks to everybody involved!
enhancement will not be backported to 20.05.x