[Bug 21034] New: Re-indent circulation.tt
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Bug ID: 21034 Summary: Re-indent circulation.tt Change sponsored?: --- Product: Koha Version: master Hardware: All OS: All Status: ASSIGNED Severity: enhancement Priority: P5 - low Component: Templates Assignee: oleonard@myacpl.org Reporter: oleonard@myacpl.org QA Contact: testopia@bugs.koha-community.org CC: testopia@bugs.koha-community.org I would like to re-indent circulation.tt and remove trailing spaces. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Small patch Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 --- Comment #1 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 76656 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=76656&action=edit Bug 20520: Re-indent moremember.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #76656|0 |1 is obsolete| | --- Comment #2 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 77710 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=77710&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 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=21034 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #77710|0 |1 is obsolete| | --- Comment #3 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 77732 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=77732&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. 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=21034 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #77732|0 |1 is obsolete| | --- Comment #4 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Created attachment 77739 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=77739&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |martin.renvoize@ptfs-europe | |.com Status|Signed Off |Passed QA --- Comment #5 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Always nice to bring some sanity to the indenting :) No regressions found, passing QA. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply CC| |nick@bywatersolutions.com --- Comment #6 from Nick Clemens <nick@bywatersolutions.com> --- Needs a rebase on 13618, sorry Owen -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #77739|0 |1 is obsolete| | --- Comment #7 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 78267 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=78267&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |ASSIGNED -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #78267|0 |1 is obsolete| | --- Comment #8 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 84387 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=84387&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Maryse Simard <maryse.simard@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |maryse.simard@inlibro.com --- Comment #9 from Maryse Simard <maryse.simard@inlibro.com> --- Patch doesn't apply Applying: Bug 21034: Re-indent circulation.tt Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 21034: Re-indent circulation.tt -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Owen Leonard <oleonard@myacpl.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #84387|0 |1 is obsolete| | --- Comment #10 from Owen Leonard <oleonard@myacpl.org> --- Created attachment 88548 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=88548&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Lucas Gass <lucas@bywatersolutions.com> 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=21034 Lucas Gass <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #88548|0 |1 is obsolete| | --- Comment #11 from Lucas Gass <lucas@bywatersolutions.com> --- Created attachment 88569 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=88569&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Katrin Fischer <katrin.fischer@bsz-bw.de> 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=21034 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #88569|0 |1 is obsolete| | --- Comment #12 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Created attachment 88593 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=88593&action=edit Bug 21034: Re-indent circulation.tt This patch reindents the template for the checkout page, circulation.tt: - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, view the checkout page under various circumstances: - No card number submitted - Name submitted (patron search results) - Card number submitted - Restricted patron - Patron with circulation messages - On-site checkouts - Check all tabs: checkouts, relatives' checkouts holds, article requests, restrictions, clubs HTML validation before and after the patch should return the same results. Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> 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=21034 Nick Clemens <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Pushed to Master --- Comment #13 from Nick Clemens <nick@bywatersolutions.com> --- Awesome work all! Pushed to master for 19.05 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Martin Renvoize <martin.renvoize@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED Version(s)| |19.05.00 released in| | --- Comment #14 from Martin Renvoize <martin.renvoize@ptfs-europe.com> --- Enhancement will not be backported to 18.11.x series. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=21034 Jonathan Druart <jonathan.druart+koha@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |30068 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=30068 [Bug 30068] Wrong reference to table_borrowers in circulation.tt -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org