|
Description
Kyle M Hall (khall)
2015-12-02 16:45:46 UTC
Created attachment 45332 [details] [review] Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit Created attachment 45335 [details] [review] Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit Created attachment 45336 [details] [review] Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit Test Plan: 1) Apply this patch 2) Replace your ISSUESLIP with the following: [% USE KohaDates %] <h3>[% branch.branchname %]</h3> Checked out to [% borrower.title %] [% borrower.firstname %] [% borrower.initials %] [% borrower.surname %] <br /> ([% borrower.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out Today</h4> [% FOREACH checkout IN borrower.checkouts %] [% IF checkout.is_from_today %] <p> [% checkout.item.biblio.title %] <br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due | $KohaDates %]<br /> </p> [% END %] [% END %] 3) Print a quick slip for a patron, note the data is complete Comment on attachment 45336 [details] [review] Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit Review of attachment 45336 [details] [review]: ----------------------------------------------------------------- The sample_notices.sql files for non-English files could have been kept closer to the original in terms of language, rather than changing them to English. New files could have used the license text found on the wiki. http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence You added a Koha level library without any test coverage. Wende an: Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit fatal: sha1 information is lacking or useless (installer/data/mysql/de-DE/mandatory/sample_notices.sql). Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge zurückzufallen. Kann nicht zu 3-Wege-Merge zurückfallen. Anwendung des Patches fehlgeschlagen bei 0001 Bug 15283 - Switch default ISSUEQSLIP notice to Template Toolkit Die Kopie des fehlgeschlagenen Patches befindet sich in: /home/mirko/koha/.git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-15283---Switch-default-ISSUEQSLIP-notice-to-Te-CHhaFv.patch This patch will never apply without a rewrite because Koha/Borrower.pm has been moved to Koha/Patron.pm Also we really need bits of this, specifically "is_from_today" in Checkout.pm independent of this bug. Created attachment 70651 [details] [review] Bug 15283: Switch default ISSUEQSLIP notice to Template Toolkit Please test if changes are correct. Blocked by Bug 15282 Looking at the the new PQA status of bug 15282 this is no longer blocked, but looking at the other commends, it should be FQA? Created attachment 91656 [details] [review] Bug 15283: Switch default ISSUEQSLIP notice to TT Test Plan: 1) Apply this patch 2) Replace your ISSUESLIP with the following: [%- USE KohaDates -%] <h3>[% branch.branchname %]</h3> Checked out to [% patron.title %] [% patron.firstname %] [% patron.initials %] [% patron.surname %] <br /> ([% patron.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out Today</h4> [% FOREACH checkout IN patron.todays_checkouts %] <p> [% checkout.item.biblio.title %] </br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due %]<br /> </p> [% END %] 3) Print a quick slip for a patron, note the data is complete Patch rescued, please test Created attachment 91657 [details] [review] Bug 15283: Switch default ISSUEQSLIP notice to TT Test Plan: 1) Apply this patch 2) Replace your ISSUESLIP with the following: [%- USE KohaDates -%] <h3>[% branch.branchname %]</h3> Checked out to [% patron.title %] [% patron.firstname %] [% patron.initials %] [% patron.surname %] <br /> ([% patron.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out Today</h4> [% FOREACH checkout IN patron.todays_checkouts %] <p> [% checkout.item.biblio.title %] </br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due %]<br /> </p> [% END %] 3) Print a quick slip for a patron, note the data is complete Rescued-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Hi Martin, is test plan right? We solve ISSUEQSLIP but test plan says: "Replace your ISSUESLIP with the following". Is ot correct? (In reply to Michal Denar from comment #16) > Hi Martin, > is test plan right? We solve ISSUEQSLIP but test plan says: "Replace your > ISSUESLIP with the following". Is ot correct? You are correct Michal.. it should be ISSUEQSLIP. I didn't notice that when rescuing the patch.. it's always dealt with the Q variety, just always had an incorrect test plan.. oops. Test Plan: 1) Apply this patch 2) Replace your ISSUEQSLIP with the following: [%- USE KohaDates -%] <h3>[% branch.branchname %]</h3> Checked out to [% patron.title %] [% patron.firstname %] [% patron.initials %] [% patron.surname %] <br /> ([% patron.cardnumber %]) <br /> [% today | $KohaDates %]<br /> <h4>Checked Out Today</h4> [% FOREACH checkout IN patron.todays_checkouts %] <p> [% checkout.item.biblio.title %] </br /> Barcode: [% checkout.item.barcode %]<br /> Date due: [% checkout.date_due %]<br /> </p> [% END %] 3) Print a quick slip for a patron, note the data is complete Sorry, but patch don't work for me. Result on page for print don!t contain info about today borrowed document. Please, see https://prnt.sc/ov1po3 The issue here was 'patron' vs 'borrower' as the variable name passed into the template. However, the patch no longer applies and isn't trivial to rebase with the addition of the news block into the template in master. I'll swing back around to this when I find a moment. |