Description
Jonathan Druart
2014-05-20 14:08:56 UTC
Created attachment 28368 [details] [review] Bug 12292: (followup) ensure that patrons are not restricted even when the last restriction has expired This is the same issue as bug 12134. Test Plan: 1) Add a manual restriction to a patron and wait until the expiration date of the restriction has passed. This can be simulated by modifying borrowers.debarred for a borrower and setting the date in the past. 2) Go on the detail page for a patron (members/moremember.pl) 3) Note the warning message "Patron is restricted until XX/XX/XXXX View restrictions" 4) Apply this patch 5) Repeat step 2 6) Note the warning message does not appear anymore Created attachment 28439 [details] [review] [SIGNED-OFF] Bug 12292: (followup) ensure that patrons are not restricted even when the last restriction has expired This is the same issue as bug 12134. Test Plan: 1) Add a manual restriction to a patron and wait until the expiration date of the restriction has passed. This can be simulated by modifying borrowers.debarred for a borrower and setting the date in the past. 2) Go on the detail page for a patron (members/moremember.pl) 3) Note the warning message "Patron is restricted until XX/XX/XXXX View restrictions" 4) Apply this patch 5) Repeat step 2 6) Note the warning message does not appear anymore Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Work as described, no errors. Created attachment 28440 [details] [review] [PASSED QA] Bug 12292: (followup) ensure that patrons are not restricted even when the last restriction has expired This is the same issue as bug 12134. Test Plan: 1) Add a manual restriction to a patron and wait until the expiration date of the restriction has passed. This can be simulated by modifying borrowers.debarred for a borrower and setting the date in the past. 2) Go on the detail page for a patron (members/moremember.pl) 3) Note the warning message "Patron is restricted until XX/XX/XXXX View restrictions" 4) Apply this patch 5) Repeat step 2 6) Note the warning message does not appear anymore Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> Work as described, no errors. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Trivial patch, works as advertised and passes QA scripts. Pushed to master. Thanks, Jonathan! Created attachment 28449 [details] [review] Bug 12061 - tmpl_process3.pl - Include/exclude file by name This patch adds an option to tmpl_process3.pl for exclude some files by matching their names. Also modifies current code to include only selected files to check only filenames. Checking is case insensitive !! To test after patch: A) Include only 'normarc' 1. create cd misc/translator perl tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/bootstrap/en -s normarc.po -r -f normarc - check provenance of strings egrep "^#:" normarc.po | cut -d":" -f2 | sort | uniq - only files with normarc in their names must be present 2. update perl tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/bootstrap/en -s normarc.po -r -f normarc - repeat check 3. install mkdir test perl tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/bootstrap/en -o ./test -s normarc.po -r -f normarc - check name of created files rm -rf test normarc.po B) Exclude 4. create perl tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/bootstrap/en -s xnormarc.po -r -n normarc - check provenance egrep "^#:" xnormarc.po | cut -d":" -f2 | sort | uniq | grep -i normarc - there must be no results 5. update perl tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/bootstrap/en -s xnormarc.po -r -n normarc - check provenance 6. install mkdir test perl tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/bootstrap/en -o ./test -s xnormarc.po -r -n normarc - check files find test | grep -i normarc - there must be no results You can also try another combination, use for example "-f patron -f user -f bottom" (or use -n) or mixed "-f marc -n normarc", do create/install and look filenames Changed to adapt current functionality (-f) Sorry for that, wrong Bug Pushed to 3.14.x, will be in 3.14.09 |