|
Description
Josef Moravec
2018-11-02 17:39:56 UTC
Created attachment 81916 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) Hi Josef, Here is the mail I've just received : The sandbox you've requested is not ready. Some problems occurred applying patches from bug 21757: <h1>Something went wrong !</h1>Applying: Bug 21757: Clenup of moremember.pl and its templates Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt M koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt M members/moremember.pl Falling back to patching base and 3-way merge... Auto-merging members/moremember.pl CONFLICT (content): Merge conflict in members/moremember.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt CONFLICT (modify/delete): koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt deleted in Bug 21757: Clenup of moremember.pl and its templates and modified in 6533f32c3a7acdaaa6769e6039472045add847e2. Version 6533f32c3a7acdaaa6769e6039472045add847e2 of koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt left in tree. Removing koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 21757: Clenup of moremember.pl and its templates The copy of the patch that failed is found in: .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. Bug 21757 - Patron detail script (moremember.pl) cleanup 81916 - Bug 21757: Clenup of moremember.pl and its templates Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-21757-Clenup-of-morememberpl-and-its-templates-ZONSXB.patch . Created attachment 85782 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) (In reply to Séverine Queune from comment #2) > Hi Josef, > Here is the mail I've just received : > > The sandbox you've requested is not ready. Thanks for testing! Patch is rebased now. Hi Josef, can you rebase this patch on master? Thank you. Created attachment 88007 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) (In reply to Michal Denar from comment #5) > Hi Josef, > can you rebase this patch on master? > > Thank you. Rebased, thanks for testing Josef, I've tried to broke patron page. I found just one problem. Print summary give error: Template process failed: file error - /home/vagrant/kohaclone/koha-tmpl/intranet-tmpl//en/modules/members/moremember-print.tt: not found at /home/vagrant/kohaclone/C4/Templates.pm line 122 Hi Josef, There is also the alert "Patron's card has been reported lost." when "Lost card" is checked that has disappeared. Created attachment 88058 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) (In reply to Michal Denar from comment #8) > Josef, > I've tried to broke patron page. > > I found just one problem. > Print summary give error: > Template process failed: file error - > /home/vagrant/kohaclone/koha-tmpl/intranet-tmpl//en/modules/members/ > moremember-print.tt: not found at /home/vagrant/kohaclone/C4/Templates.pm > line 122 (In reply to Séverine Queune from comment #9) > Hi Josef, > There is also the alert "Patron's card has been reported lost." when "Lost > card" is checked that has disappeared. Thanks for testing Michal and Séverine, I addressed both of the issues, so ready for another round ;) Patch tested with a sandbox, by Séverine QUEUNE <severine.queune@bulac.fr> Created attachment 88060 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Can you please rebase? Created attachment 88146 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> (In reply to Katrin Fischer from comment #14) > Can you please rebase? done ;) This changes the beahaviour of the patron duplicate message as the template for displaying the data of the duplicate candidate patron is removed. I am not sure about this change and it's not described in the commit messsage. Can you please take a look? Created attachment 88268 [details] [review] Bug 21757: (folow-up) Restore patron brief detail page Test plan 1) Try to create patron with same name/datefobirth to trigger the duplicate patron check 2) Click on "View existing record" link on "Duplicate patron record?" alert message 3) You should see the patron data, but withou toolbar, menu, and so on. Hi Josef, the duplicate dialog now works as expected, but I have issues loading the checkouts table (datatable errors, endless loading). Also the tabs are broken. Please check! Created attachment 88595 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Created attachment 88596 [details] [review] Bug 21757: (folow-up) Restore patron brief detail page Test plan 1) Try to create patron with same name/datefobirth to trigger the duplicate patron check 2) Click on "View existing record" link on "Duplicate patron record?" alert message 3) You should see the patron data, but withou toolbar, menu, and so on. Created attachment 88597 [details] [review] Bug 21757: (follow-up) Fix number of columns in checkouts table footer template (In reply to Katrin Fischer from comment #19) > Hi Josef, > the duplicate dialog now works as expected, but I have issues loading the > checkouts table (datatable errors, endless loading). Also the tabs are > broken. Please check! Thanks for testing, fixed in follow-up. Created attachment 88643 [details] [review] Bug 21757: Clenup of moremember.pl and its templates This patch: - removes unused templates - use objects as much as possible - remove many template params Test plan: 1) Apply the patch 2) Play with patron detail page and try to broke it anyhow ;) - messaging preferences - enhanced attributes - guarantors and guarantees - fines - messages - checkouts - overdues - use different date formats, price formats and address formats - ... there is many thinks you could try with this one page ;) Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 88644 [details] [review] Bug 21757: (folow-up) Restore patron brief detail page Test plan 1) Try to create patron with same name/datefobirth to trigger the duplicate patron check 2) Click on "View existing record" link on "Duplicate patron record?" alert message 3) You should see the patron data, but withou toolbar, menu, and so on. Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Created attachment 88645 [details] [review] Bug 21757: (follow-up) Fix number of columns in checkouts table footer template Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Awesome work all! Pushed to master for 19.05 Enhancement will not be backported for 18.11.x series |