From gitmaster at git.koha-community.org Mon Mar 3 16:35:48 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Mar 2014 15:35:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-511-g9ca12df Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9ca12df4a006901b1f4710f364e3acc0259e46a1 (commit) from 160c44d4e9f529fc6e6ecbdab23ffab6bce5630e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9ca12df4a006901b1f4710f364e3acc0259e46a1 Author: Tomas Cohen Arazi Date: Thu Feb 27 12:40:57 2014 -0300 Bug 7234: koha-common Debian package now includes koha-sites.conf This patch adds a sample koha-sites.conf file, which will be included by the koha-common package in /etc/koha (where it belongs). It is fixed to include the current defaults (DOM indexing for both biblios and authorities, disabled use of memcached, and good defaults for a normal setup if enabled). All options are commented for ease of use by average users. To test - verify that the defaults are sane (let me know if it needs to be fixed). - build the package and verify that the file gets installed. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Mark Tompsett Signed-off-by: Robin Sheat Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: debian/templates/koha-sites.conf | 61 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 debian/templates/koha-sites.conf hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 7 08:44:07 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Mar 2014 07:44:07 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-2-g142f491 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 142f4913fd36ec0c3b5f68faf51b08e376e4edcb (commit) via 0a3ab18a1e96f7249cf676d2966138819696b9ee (commit) from 1b1f24fbed0310df38036153a8283bf6a37fe9b3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 142f4913fd36ec0c3b5f68faf51b08e376e4edcb Author: Owen Leonard Date: Tue Jan 14 08:50:09 2014 -0500 Bug 11503: [Follow-up] fix another typo There is still a typo left to fix which I didn't catch because I was doing a spell-check and didn't double-check the bug report: Van der Griten -> Van der Grinten Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit 5c67d182ea718a37032edabbe000933776baa251) commit 0a3ab18a1e96f7249cf676d2966138819696b9ee Author: Owen Leonard Date: Fri Jan 10 11:00:22 2014 -0500 Bug 11503: fix several typos This patch corrects several typos: Some reported in Bug 11503, others found during a systematic spell check of the help files. To test, examine the changes and confirm that the spelling changes are correct. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit a5c762d491465bcc7ad8d8f5e94ff5c36c172091) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/subtypes_unimarc.inc | 2 +- .../intranet-tmpl/prog/en/modules/authorities/authorities.tt | 2 +- .../en/modules/cataloguing/value_builder/unimarc_field_120.tt | 4 ++-- .../en/modules/cataloguing/value_builder/unimarc_field_121a.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/help/about.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/admin/auth_subfields_structure.tt | 4 ++-- .../prog/en/modules/help/admin/authorised_values.tt | 2 +- .../prog/en/modules/help/admin/item_circulation_alerts.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/preferences.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/members/member-flags.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/help/plugins/plugins-home.tt | 2 +- .../prog/en/modules/help/plugins/plugins-upload.tt | 2 +- .../prog/en/modules/help/reports/guided_reports.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/reserve/request.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/help/serials/serials-edit.tt | 2 +- .../prog/en/modules/help/serials/subscription-detail.tt | 2 +- .../prog/en/modules/help/serials/subscription-frequencies.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt | 2 +- .../prog/en/modules/help/tools/marc_modification_templates.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/help/tools/quotes-upload.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/quotes.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- 26 files changed, 40 insertions(+), 40 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 7 08:47:00 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Mar 2014 07:47:00 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-3-g50c3169 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 50c316916e9c1ee74939f7ede91c65fe9e9683b6 (commit) from 142f4913fd36ec0c3b5f68faf51b08e376e4edcb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 50c316916e9c1ee74939f7ede91c65fe9e9683b6 Author: Tomas Cohen Arazi Date: Mon Feb 10 11:55:06 2014 -0300 Bug 11509: (trivial rmaint followup) wrong parameter count While adding the --help and -h switches I forgot to change to arguments count validation so that one can actually use those parameters (i.e. koha-create should accept being invoked with only one parameter). This patch just changes the minimum parateres required from 2 to 1. To reproduce: - Run 'koha-create --help' from master => Usage information is printed BUT ALSO an "Error: wrong parameters" message - Apply the patch and - Run 'koha-create --help' => Usage informatio it printed and no error message. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Galen Charlton (cherry picked from commit 692c4f03b5adebec754c1a8db16e2db97c63f554) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 7 08:54:03 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Mar 2014 07:54:03 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-4-ge708fa8 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via e708fa862b8f25445da2d86efde62c1c6348acf3 (commit) from 50c316916e9c1ee74939f7ede91c65fe9e9683b6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e708fa862b8f25445da2d86efde62c1c6348acf3 Author: Owen Leonard Date: Fri Jan 10 12:45:30 2014 -0500 Bug 11381: improve styling of IDreamBooks content in bootstrap theme Styling of IDreamBooks elements is not correct in the bootstrap theme because the relevant CSS was not transferred from the prog theme. This patch adds it back. To test, switch to the bootstrap theme and enable IDreamBooks system preferences in the OPAC, particularly IDreamBooksReadometer. Find a book in the OPAC which shows IDreamBooks review data and confirm that everything looks correct. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described. Tested with "The help". Signed-off-by: Galen Charlton (cherry picked from commit f2c61429944140abfd0a097bdb50b03e08ef569b) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 41 +++++++++++++++++++++ koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 50 ++++++++++++++++++++++++++ 2 files changed, 91 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 7 08:58:35 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Mar 2014 07:58:35 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-5-gc8bc38a Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via c8bc38a682d322378ef3a2d2e19d9aadab1d362d (commit) from e708fa862b8f25445da2d86efde62c1c6348acf3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c8bc38a682d322378ef3a2d2e19d9aadab1d362d Author: Owen Leonard Date: Fri Jan 10 15:46:29 2014 -0500 Bug 11505: fix untranslatable table headers in Label batch manager The label batch manager script hard-codes the table header cell labels in order to pass them to an HTML-building function. This obviously isn't the best solution for internationalization, but picking the whole scheme apart would be very complicated. Instead this patch uses a SWITCH statement to check for each possible case and outputs the correct translatable string for each. To test, apply the patch and run "perl translate update" for any translation. Check the revised po file and confirm that the new strings are present. View the label batch edit page and confirm that the table headings look correct: Tools -> Labels -> Manage batches -> Edit batch. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described, passes all tests. Similar fixes are probably needed for other pages of the labels modules. Signed-off-by: Galen Charlton (cherry picked from commit e8f5ee9eef7a558ae1af8237493f8dc52e52945a) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/labels/label-edit-batch.tt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 15:37:46 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 14:37:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-514-ge9903d7 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via e9903d760e41410bf871053ccccf00c3a037862d (commit) via e2de21a943afabc1e9025266d8f1b95df4e57160 (commit) via 9e5fcb0d5dd230946719ee4825a3d41bd18effe7 (commit) from 9ca12df4a006901b1f4710f364e3acc0259e46a1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e9903d760e41410bf871053ccccf00c3a037862d Author: Galen Charlton Date: Mon Mar 10 14:57:17 2014 +0000 Bug 11866: (follow-up) repair security issue introduced by main patch The main patch allows /any/ user with an account on the Koha system to view the staff-side course-reserves home page -- including ordinary patrons. This patch repairs the oversight. Signed-off-by: Galen Charlton commit e2de21a943afabc1e9025266d8f1b95df4e57160 Author: Jonathan Druart Date: Mon Mar 10 14:55:46 2014 +0100 Bug 11866: (follow-up) ensure that empty toolbar is not displayed If a user does not have course_reserve permission, a an empty toolbar is displayed. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 9e5fcb0d5dd230946719ee4825a3d41bd18effe7 Author: Kyle M Hall Date: Thu Feb 27 08:55:22 2014 -0500 Bug 11866: do not require special permissions to view course reserves in staff interface A librarian with no course reserves permissions cannot view course reserves from the staff intranet, yet can from the OPAC. This doesn't make much sense. Librarians should not require any course reserves permissions to view courses and reserves from the staff intranet. Test Plan: 1) Log into staff intranet as a librarian with no course reserves permissions 2) Note you cannot view course reserves 3) Apply this patch 4) Note you can now view course reserves 5) Verify you cannot modify courses or course reserves Signed-off-by: Owen Leonard Bug 11866 [Follow-up] Staff side course reserves too restrictive This follow-up patch adds a check for the "UseCourseReserves" system preference to the display of the Course reserves menu item in the header. To test, view the "More" menu with the "UseCourseReserves" system preference on and off. The menu item should appear and disappear accordingly. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: course_reserves/course-reserves.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 2 +- .../prog/en/modules/course_reserves/course-details.tt | 10 ++++++---- .../prog/en/modules/course_reserves/course-reserves.tt | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 15:50:40 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 14:50:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-515-g2453b99 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 2453b991b8cfdfa693a02faf33072768828e3473 (commit) from e9903d760e41410bf871053ccccf00c3a037862d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2453b991b8cfdfa693a02faf33072768828e3473 Author: Owen Leonard Date: Thu Feb 20 10:19:42 2014 -0500 Bug 11802 - corrects for the patron purchase suggestions page This patch corrects some errors with the staff client's patron purchase suggestions page (members/purchase-suggestions.pl). To test, apply the patch and make sure the patronimages system preference is enabled. - View the purchase suggestions page for a patron whose record has a patron image attached. The image should appear in the left-hand sidebar. - View the page for a patron who has submitted no purchase suggestions. The message should be styled correctly. - The toolbar on the page should look correct and work correctly. Signed-off-by: Jesse Maseto Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/purchase-suggestions.tt | 10 ++++++---- members/purchase-suggestions.pl | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 15:55:36 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 14:55:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-516-g9ce9eea Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9ce9eea2dbb35be4f3f28314cb90f4edb624c31c (commit) from 2453b991b8cfdfa693a02faf33072768828e3473 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9ce9eea2dbb35be4f3f28314cb90f4edb624c31c Author: Owen Leonard Date: Thu Feb 20 15:18:46 2014 -0500 Bug 11328 - Show local cover images in staff client search results Local cover images do not appear in staff client search results. This patch adds them. To test, enable the LocalCoverImages system preference and add at least one cover image to a title. Perform a search which will return results that include your title. Confirm that the local cover image is displayed. Search results should also display correctly with and without AmazonCoverImages enabled as well as with LocalCoverImages disabled. Signed-off-by: wajasu Signed-off-by: Brendan Gallagher Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/staff-global.css | 13 +++++++++++++ .../prog/en/modules/catalogue/results.tt | 20 ++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 16:03:05 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 15:03:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-518-g19e83d9 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 19e83d9b9fd9c06211ce7738f3e0d9c428462a34 (commit) via 858bcedc1f28342b87bc4b196fc3dfa8cbd26275 (commit) from 9ce9eea2dbb35be4f3f28314cb90f4edb624c31c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 19e83d9b9fd9c06211ce7738f3e0d9c428462a34 Author: Galen Charlton Date: Mon Mar 10 15:24:43 2014 +0000 Bug 11860: (follow-up) standardize spelling of "call number" It is "call number", not "callnumber". Signed-off-by: Galen Charlton commit 858bcedc1f28342b87bc4b196fc3dfa8cbd26275 Author: Julian Maurice Date: Fri Dec 20 11:55:24 2013 +0100 Bug 11860: Display subscription callnumber in OPAC detail page Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 7 +++++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 16:07:40 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 15:07:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-519-g15ad306 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 15ad3061b2fb11df6ecf5601d5b7d49d7792ba9f (commit) from 19e83d9b9fd9c06211ce7738f3e0d9c428462a34 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15ad3061b2fb11df6ecf5601d5b7d49d7792ba9f Author: Owen Leonard Date: Thu Feb 20 11:38:53 2014 -0500 Bug 11794 - restore functioning of opacSerialDefaultTab The opacSerialDefaultTab system preference should control whether to show the holdings or subscriptions tab by default on the detail page for a serial. This behavior was broken when we last updated jQueryUI because of a change in the jQueryUI active tab class name. This patch corrects the class on the detail page and removes the old class from the authorities detail page (where it was unnecessary anyway). To test, view a serial record in the OPAC under various settings of the opacSerialDefaultTab preference. The default tab should correctly follow the preference. Test in prog and Bootstrap themes. Edit: Rebased on current master. Note that the change to opac-auth-detail.tt is because the page never has more than one tab, hence doesn't need the "active" designation. Signed-off-by: Jesse Maseto Signed-off-by: Katrin Fischer Tested in prog and bootstrap. All tests and QA script pass. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 16:29:25 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 15:29:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-523-g5479468 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 547946894833155f4b61be6d0544a6c195744395 (commit) via 0713f3bf032b92535e87595e95a44898fb70c72b (commit) via 3f028c72d4935485727d41a16184437326f581dd (commit) via 4d3242163451c429569e1236bc5a32c3b704bd96 (commit) from 15ad3061b2fb11df6ecf5601d5b7d49d7792ba9f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 547946894833155f4b61be6d0544a6c195744395 Author: Galen Charlton Date: Mon Mar 10 15:42:24 2014 +0000 Bug 10558: (follow-up) choose label for matching records correctly This patch ensures that the record type of the import batch (i.e., biblio or authority) is consulted in order to choose the "Matches biblio" or "Matches authority" labels. Signed-off-by: Galen Charlton commit 0713f3bf032b92535e87595e95a44898fb70c72b Author: Kyle M Hall Date: Tue Jul 16 08:32:55 2013 -0400 Bug 10558 [QA Follow-up] This patch addresses a number of issues with the main patch: - regression on bug 2060 (i.e., displaying authority import batches correctly) - regression on bug 10170 (translation of import record states)A - use of datatables.inc - lack of clarity as to the licensing of tools/batch_records_ajax.pl - insufficent sanitizing of input used to generate an SQL statement Signed-off-by: Galen Charlton commit 3f028c72d4935485727d41a16184437326f581dd Author: Owen Leonard Date: Wed Jul 10 12:29:23 2013 -0400 Bug 10558: (follow-up) styling improvements This patch makes improvements to the default DataTables CSS and corrects a couple of errors in the original patch. CSS for the "full numbers" type pagination, used by this and the quotes editor, has been cleaned up and made more visually consistent with the brief pagination style. Also changed: - removed some hard-coded paths containing "http://staff.kohadev..." - Added a column header to the column showing record match details. This provides both information and a clearer target for clicking to resort - Expanding the default table pager controls for this page and the quotes editor (for consistency) - Correction to quotes.css to fix pager display problem on wide screens Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit 4d3242163451c429569e1236bc5a32c3b704bd96 Author: Kyle M Hall Date: Tue Jul 9 12:30:58 2013 -0400 Bug 10558 - Convert records table in manage-marc-import.pl to Ajax DataTable Some libraries would like to sort by columns for the records of an import batch. This seems like a good use of Ajax DataTables. Test plan: 1) Apply this patch 2) Import a record batch into Koha a) Use some form of matching b) Have some records that will match and some that won't c) Have at least 30 records so you can test the pager 3) Verify the new table is functionally equivalent to the old static one Signed-off-by: Owen Leonard Tests fine and looks good with the exception of the corrections I put in a follow-up. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 13 +- koha-tmpl/intranet-tmpl/prog/en/css/datatables.css | 45 ++-- koha-tmpl/intranet-tmpl/prog/en/css/quotes.css | 1 - .../prog/en/modules/tools/manage-marc-import.tt | 226 ++++++++++---------- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 1 + tools/batch_records_ajax.pl | 119 +++++++++++ tools/manage-marc-import.pl | 53 +---- 7 files changed, 277 insertions(+), 181 deletions(-) create mode 100755 tools/batch_records_ajax.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 16:44:22 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 15:44:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-526-gbf3b1aa Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via bf3b1aac7b7bc422bea26bb2c045be69d93ef0bf (commit) via 850e7e58352fd1fcb2772308cbfc6375b6a45735 (commit) via 8ee0bc049a183e795fc37608a4b3790d4aef2267 (commit) from 547946894833155f4b61be6d0544a6c195744395 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bf3b1aac7b7bc422bea26bb2c045be69d93ef0bf Author: Mark Tompsett Date: Tue Jan 21 00:41:00 2014 -0500 Bug 11587: get rid of warnings generated by IsSuperLibrarian with anonymous sessions This corrects line 1250 of C4/Context.pm to be: return ($userenv->{flags}//0) % 2; And thus avoids an uninitialized value used in the modulus. TEST PLAN --------- 1) Apply the first patch (to update t/Context.t) 2) prove -v t/Context.t -- This should fail tests 7 and 8 3) Apply this patch (to fix C4/Context.pm) 4) prove -v t/Context.t -- All tests should succeed Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 850e7e58352fd1fcb2772308cbfc6375b6a45735 Author: Jonathan Druart Date: Fri Jan 24 13:00:37 2014 +0100 Bug 11587 - Add UT for IsSuperLibrarian if flags == 0 Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 8ee0bc049a183e795fc37608a4b3790d4aef2267 Author: Mark Tompsett Date: Tue Jan 21 00:34:43 2014 -0500 Bug 11587 - IsSuperLibrarian generates warnings (UT) Simply viewing OPAC detail triggers a modulus warning entry. This first patch adds two test cases to t/Context.t to test for this situation. TEST PLAN --------- 1) Apply this patch (to upgrade t/Context.t) 2) prove -v t/Context.t -- Tests 7 and 8 will fail 3) Apply main patch (to amend C4/Context.pm) 4) prove -v t/Context.t -- All tests will succeed Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Context.pm | 2 +- t/Context.t | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 17:25:34 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 16:25:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-530-g8d76441 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 8d76441a4c0eb33f4f4e8cf796e093ff12bfd334 (commit) via f4251e85facb4e8597b2879dea1ea02e21d6a763 (commit) via b8173f2cd997994590b84e0d2cd477777a773569 (commit) via 575aa91ffa422eecf5bb969a264ed41384bb44d2 (commit) from bf3b1aac7b7bc422bea26bb2c045be69d93ef0bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8d76441a4c0eb33f4f4e8cf796e093ff12bfd334 Author: Galen Charlton Date: Mon Mar 10 16:44:00 2014 +0000 Bug 11224: (follow-up) clean up unit test for bug 10723 This patch removes the remainder of the old unit test for bug 10723 and updates the label of the new test that now checks that SearchOrders({ pending => 1}) omits received orders. Signed-off-by: Galen Charlton commit f4251e85facb4e8597b2879dea1ea02e21d6a763 Author: Galen Charlton Date: Mon Mar 10 16:24:14 2014 +0000 Bug 11224: (follow-up) apply tidying Signed-off-by: Galen Charlton commit b8173f2cd997994590b84e0d2cd477777a773569 Author: Galen Charlton Date: Mon Mar 10 16:17:51 2014 +0000 Bug 11224: (follow-up) incorporate test for bug 11777 This patch adds authorisedby to the list of expected fields returned by SearchOrders(). Signed-off-by: Galen Charlton commit 575aa91ffa422eecf5bb969a264ed41384bb44d2 Author: Mathieu Saby Date: Sat Nov 9 14:28:07 2013 +0100 Bug 11224 : Add UT to routines of C4::Acquisition returning order(s) C4::Acquisition need more UT, and more robust ones. This patch adds some. This patch adds UT to - GetOrder - GetOrders - GetCancelledOrders - GetLateOrders It refactors UT for SearchOrders New UT use 2 new routines, used for check the list of fields returned by a routine: _check_fields_of_order _check_fields_of_orders These 2 routines could later be used by other UT _check_fields_of_order has its own UT (tests n?14,15,16). to test : prove -v t/db_dependent/Acquisition.t Signed-off-by: Liz Rea Unit tests pass, passes koha-qa. Signed-off-by: Kyle M Hall Passes koha-qa and t Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 1 + t/db_dependent/Acquisition.t | 912 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 756 insertions(+), 157 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 18:27:34 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 17:27:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-537-ge51b441 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via e51b44178141ddd32134758d20d388c648fb0dfd (commit) via 5f8bef581d5170a4a5c7a965379264d78935041f (commit) via adc09764bc90c34300444c5ea43bfd040f0d571d (commit) via 9b9fd8597945d221d9d89d6ae6517c0c65179232 (commit) via 52924e7b0ecddcceec8d22299e8fa4c5f04a991a (commit) via 5372082724002476bc7565f7c66a7e6aaa06c24b (commit) via 3e344d7e0718e5a8ac810ca5235f68c1e6d3f370 (commit) from 8d76441a4c0eb33f4f4e8cf796e093ff12bfd334 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e51b44178141ddd32134758d20d388c648fb0dfd Author: Galen Charlton Date: Mon Mar 10 17:48:54 2014 +0000 Bug 8918: (follow-up) tidy code and description of CalculatePriority() This patch improves the formatting and the description of the new CalculatePriority() routine. Signed-off-by: Galen Charlton commit 5f8bef581d5170a4a5c7a965379264d78935041f Author: Marcel de Rooy Date: Fri Feb 7 12:05:24 2014 +0100 Bug 8918: (follow-up) support creating brief UNIAMRC bibs in Reserves.t Changed title and author field for UNIMARC. Signed-off-by: Marcel de Rooy Tested for MARC21, NORMARC and UNIMARC by adding temporary set_preference.. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit adc09764bc90c34300444c5ea43bfd040f0d571d Author: Julian Maurice Date: Thu Feb 6 15:42:08 2014 +0100 Bug 8918: (follow-up) allow t/db_dependent/Reserves.t to pass if marcflavour is UNIMARC Set marcflavour to MARC21 to make tests pass. Signed-off-by: Marcel de Rooy Works for MARC21. But I would prefer a better fix for UNIMARC. Will send a follow-up for that. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit 9b9fd8597945d221d9d89d6ae6517c0c65179232 Author: Marcel de Rooy Date: Thu Jan 30 14:16:03 2014 +0100 Bug 8918: (follow-up) more unit tests for CalculatePriority Adding a few unit tests, including the following situations: Placing a hold when there is a wait. Placing a hold when there is a future hold. Calculating priority with future date. Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit 52924e7b0ecddcceec8d22299e8fa4c5f04a991a Author: Julian Maurice Date: Tue Nov 5 16:25:56 2013 +0100 Bug 8918: Add a unit test for CalculatePriority Rebased on January 29, 2014 (marcelr) Added text on the two 'is'-statements. Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit 5372082724002476bc7565f7c66a7e6aaa06c24b Author: Marcel de Rooy Date: Fri Apr 12 11:27:42 2013 +0200 Bug 8918: (follow-up) improve descriptions of two related sysprefs Updating pref descriptions for ReservesNeedReturns and ILS-DI:AuthorizedIPs. Just sideway related to this report, but not important enough to separate. Signed-off-by: Marcel de Rooy Signed-off-by: Julian Maurice Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit 3e344d7e0718e5a8ac810ca5235f68c1e6d3f370 Author: Julian Maurice Date: Mon Oct 15 14:06:04 2012 +0200 Bug 8918: Fix reserve priority in ILS-DI The priority of new hold requests was not calculated when using ILS-DI. A new routine is added, C4::Reserves::CalculatePriority(), to calculate the priority prior to placing a request. A separate bug report, 11640, covers the changes in reserves to use this new routine more generally. This patch does therefore only affect ILS-DI. Note: ILS-DI already allows you to generate multiple holds on a biblio or item for the same patron. This patch does not change that behavior. Test plan: [1] Place multiple holds using ILS-DI HoldTitle service: /cgi-bin/koha/ilsdi.pl?service=HoldTitle&patron_id=BORROWERNUMBER&bib_id=BIBLIONUMBER&request_location=test Check the priority. [2] Do the same using HoldItem service: /cgi-bin/koha/ilsdi.pl?service=HoldItem&patron_id=BORROWERNUMBER&bib_id=BIBLIONUMBER&item_id=ITEMNUMBER Check the priority again. [3] Use a biblio with multiple items. Place item level holds on both. Check in one of these items in another branch. Confirm transfer. Check in the other item in the original branch. Confirm hold. Now you have a waiting and a transit hold. Test HoldTitle and HoldItem service again a few times. [4] Enable AllowHoldDateInFuture and add a future hold. Now test HoldTitle and HoldItem again and check if these holds are inserted before the future hold (lower priority). January 29, 2014: Rebased this patch and amended it to make a distinction between fixing the ILS-DI bug and using the new routine. Updated commit message and test plan (marcelr). Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 26 ++++----- C4/Reserves.pm | 45 +++++++++++++++ .../en/modules/admin/preferences/circulation.pref | 2 +- .../en/modules/admin/preferences/web_services.pref | 3 +- t/db_dependent/Reserves.t | 60 ++++++++++++++++++-- 5 files changed, 114 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 18:35:39 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 17:35:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-538-ge0b1305 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via e0b13056b24655e52bb80543995ff9efe0470e34 (commit) from e51b44178141ddd32134758d20d388c648fb0dfd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e0b13056b24655e52bb80543995ff9efe0470e34 Author: Owen Leonard Date: Fri Feb 7 12:09:08 2014 -0500 Bug 11713 - Use new DataTables include in course reserves templates This patch modifies two course reserves templates to use the new DataTables include. This simplifies the inclusion of assets and updates to the latest DataTables version. Also included: - Adds a sorting filter on the course reserves detail table to excluding articles from sorting. - Corrects the styling of toolbar buttons (buttons should have btn and btn-small classes). To test you must have UseCourseReserves enabled and have multiple existing courses, at least one of which should have items on reserve. 1. View the list of courses. Table sorting should work correctly. The "new course" button should look consistent with other staff client toolbar buttons. 2. View the list of reserves on a course. - Toolbar buttons should look consistent with other staff client toolbar buttons. - Sorting should work correctly, excluding sorting on the Edit, Remove, and "Other course reserves" columns. - Titles on reserve which begin with an article should be sorted correctly with article excluded - Test sorting with item-level_itypes on and off. - Test sorting using a patron whose permissions include various combinations of add_reserves and delete_reserves Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/course_reserves/course-details.tt | 15 +++++++-------- .../prog/en/modules/course_reserves/course-reserves.tt | 6 ++---- 2 files changed, 9 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 18:53:48 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 17:53:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-541-g67d3985 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 67d3985929d70b67e64d5f0c275109b109065d2d (commit) via 2e6d44bd3200d0dceef59f04a79a27dcadceab1d (commit) via cb45d4c2184622e15239077dd1c535a13abc53ce (commit) from e0b13056b24655e52bb80543995ff9efe0470e34 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 67d3985929d70b67e64d5f0c275109b109065d2d Author: Galen Charlton Date: Mon Mar 10 18:13:16 2014 +0000 Bug 10452: (follow-up) remove duplicate check of damaged status While reviewing the main patch for this bug to verify that the holds queue routines and C4::Reserves had the same conception of when a damaged item could fill a hold request, I noticed that GetItemsAvailableToFillHoldRequestsForBib() duplicated the code for adding an SQL clause to filter out damaged items. This patch removes the duplication and improves the POD for that routine. Signed-off-by: Galen Charlton commit 2e6d44bd3200d0dceef59f04a79a27dcadceab1d Author: Kyle M Hall Date: Fri Jan 17 09:05:40 2014 -0500 Bug 10452: [QA Followup] - Unit tests Signed-off-by: Katrin Fischer Passes all tests and QA script. Also checked t/db_dependent/Holds.t t/db_dependent/HoldsQueue.t Tested holds triggering with different settings of AllowHoldsOnDamagedItems. Works as described. Signed-off-by: Galen Charlton commit cb45d4c2184622e15239077dd1c535a13abc53ce Author: Kyle M Hall Date: Wed Jun 12 10:09:25 2013 -0400 Bug 10452: make AllowHoldsOnDamagedItems control using damaged items to fulfill holds AllowHoldsOnDamagedItems will stop item-specific holds from being placed on damaged items, but does not stop Koha from using damaged items to fill holds. This seems like incorrect behavior. Test Plan: 1) Set 'AllowHoldsOnDamagedItems' to "Don't Allow" 2) Pick an item, set it to damaged 3) Place a bib-level hold on this item's record 4) Scan the item though the returns system 5) Koha will ask to use this item to fill the hold, click "ignore" 6) Apply this patch 7) Repeat step 4 8) Koha will not ask to use this item to fill the hold Signed-off-by: Srdjan Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 3 +-- C4/Reserves.pm | 26 +++++++++++++------- .../en/modules/admin/preferences/circulation.pref | 2 +- t/db_dependent/Holds.t | 10 +++++++- 4 files changed, 28 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 19:24:13 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 18:24:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-543-g03338b7 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 03338b70e4de9866bd4afb69f0d8e5eeae3d7866 (commit) via b0870311e1b8fae10a6ab17d0e132e911c3ab3aa (commit) from 67d3985929d70b67e64d5f0c275109b109065d2d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 03338b70e4de9866bd4afb69f0d8e5eeae3d7866 Author: Galen Charlton Date: Mon Mar 10 18:42:25 2014 +0000 Bug 10955: (follow-up) improve usage information This patch improves rebuild_zebra.pl's usage help by explaining when --skip-deletes should be considered and noting that it should be used in conjunction with a cronjob to process deletions after hours. Signed-off-by: Galen Charlton commit b0870311e1b8fae10a6ab17d0e132e911c3ab3aa Author: Kyle M Hall Date: Thu Sep 26 12:47:13 2013 -0400 Bug 10955 - Add ability to skip deletions in zebraqueue It seems that record deletions can cause extreme slowdowns for Koha installations with extremely large numbers of records. It would be helpful to be able to skip record deletions when processing the zebraqueue with rebuild_zebra.pl so the deletions can be processed with a lower frequency. Test Plan: 1) Disable any zebra indexing cronjobs you may have 2) Delete a record 3) Note the operation recordDelete in the zebraqueue table having done = 0 4) Run misc/migration_tools/rebuild_zebra.pl -b -z --skip-deletes 5) Note the delete still has done = 0 6) Run misc/migration_tools/rebuild_zebra.pl -b -z 7) Note the delete now has done = 1 Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Passes all tests and QA script. Also tested for authorities, no problems found. Signed-off-by: Galen Charlton RM note: this is at best a work-around, and I will emphasize that --skip-deletes should be used only when absolutely necessary. I hope that --skip-deletes can go away at some point soon, but that may depend on changes to Zebra. ----------------------------------------------------------------------- Summary of changes: misc/migration_tools/rebuild_zebra.pl | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 19:45:27 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 18:45:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-548-g706e138 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 706e1380f9c5ac3afc9e3b61efc1031e8ff68dcd (commit) via e2ef2f51d03f31b45396a88529a46af35b0b08e3 (commit) via bb96da8ff86798df099a99e3123796731659fb67 (commit) via 8a7c31f7669a74df14d0fbc158fab493e995abba (commit) via b80b8fa40f706b9cade5f6ee39d73e1b1f9616c9 (commit) from 03338b70e4de9866bd4afb69f0d8e5eeae3d7866 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 706e1380f9c5ac3afc9e3b61efc1031e8ff68dcd Author: Galen Charlton Date: Mon Mar 10 19:05:12 2014 +0000 Bug 11605: (follow-up) use DT defaults for the new Ajax staged batch page Signed-off-by: Galen Charlton commit e2ef2f51d03f31b45396a88529a46af35b0b08e3 Author: Jonathan Druart Date: Mon Feb 3 09:40:28 2014 +0100 Bug 11605: (follow-up) fix regression Bug 11314 overrides the iDisplayLength and aLengthMenu values and should be kept. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit bb96da8ff86798df099a99e3123796731659fb67 Author: Jonathan Druart Date: Fri Jan 24 12:15:55 2014 +0100 Bug 11605: fallback to default DataTables settings where possible The default entry is 20 and can be apply to all tables. Bug 11555 apply the menu entries to all tables, redefining it is uesless and can be removed. Test plan: Test pages impacted by this patch and verify there is no regression on the tables. Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit 8a7c31f7669a74df14d0fbc158fab493e995abba Author: Jonathan Druart Date: Fri Jan 24 12:05:57 2014 +0100 Bug 11555: (follow-up) use 20 rather 25 for one of the default DT row counts If you have a look at git grep aLengthMenu, you will see we choose 20 instead of 25. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit b80b8fa40f706b9cade5f6ee39d73e1b1f9616c9 Author: Kyle M Hall Date: Tue Jan 14 10:37:09 2014 -0500 Bug 11555: Make "All" one of the default options for datatables There are many instances where librarians would like to have the ability to see all the rows in a datatable at one. It seems prudent to make this a default option for datatables, rather than change it on a case by case basis. Test Plan: 1) View the circulation history for a patron 2) Note you can select to view 10, 25, 50, or 100 entries 3) Apply this patch 4) Reload the circulation history page for a patron 5) Note the new "All" option 6) Verify the "All" option shows all the rows at once Signed-off-by: Jonathan Druart I tested the translation for "All" Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc | 3 ++- koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 -- .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt | 2 -- .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 2 -- .../prog/en/modules/admin/branch_transfer_limits.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 3 +-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 1 - .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 2 -- .../prog/en/modules/course_reserves/course-details.tt | 2 -- .../prog/en/modules/course_reserves/course-reserves.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 2 -- .../prog/en/modules/reports/guided_reports_start.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 -- koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 2 -- .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 6 ++---- 23 files changed, 11 insertions(+), 44 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 20:00:07 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 19:00:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-551-g466cfd2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 466cfd2b182bcd208ebffaf17cbcaae27eb5c50f (commit) via c5aac4e769dd2212499802520e83a6f690806f01 (commit) via 0e8f85a3b344ed1900c7b5523c1fb5aa264ab89e (commit) from 706e1380f9c5ac3afc9e3b61efc1031e8ff68dcd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 466cfd2b182bcd208ebffaf17cbcaae27eb5c50f Author: Galen Charlton Date: Mon Mar 10 19:17:49 2014 +0000 Bug 11343: tweak wording of the syspref editor for MaxItemsForBatch Signed-off-by: Galen Charlton commit c5aac4e769dd2212499802520e83a6f690806f01 Author: Galen Charlton Date: Mon Mar 10 19:12:19 2014 +0000 Bug 11343: DBRev 3.15.00.020 Signed-off-by: Galen Charlton commit 0e8f85a3b344ed1900c7b5523c1fb5aa264ab89e Author: Jonathan Druart Date: Thu Dec 5 15:30:42 2013 +0100 Bug 11343: The max number of items to process in a batch is hardcoded Until now, the maximum number of item records to process in a batch was hardcoded to 1000. This patch adds a syspref MaxItemsForBatch in order to allow to adapt this value. Test plan: - set the pref to 2 - try to delete a batch of 3 items: they are not displayed - try to modify a batch of 3 items: you are not allowed to do that - set the pref to 1000 and try again. Now items are displayed and you are allow to modify them. Signed-off-by: Christopher Brannon Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc | 1 + .../prog/en/modules/admin/preferences/tools.pref | 6 ++++++ kohaversion.pl | 2 +- tools/batchMod.pl | 6 +++--- 6 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 21:04:43 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 20:04:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-552-g54a17d9 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 54a17d97dcdcf31e9d4228c89473c82373e48e68 (commit) from 466cfd2b182bcd208ebffaf17cbcaae27eb5c50f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 54a17d97dcdcf31e9d4228c89473c82373e48e68 Author: Fr?d?rick Date: Mon Dec 9 13:45:52 2013 -0500 Bug 11359: Add the borrower's cardnumber and phonenumber to the branch overdues report The report also known as "Overdues with fines" Signed-off-by: Nicole C. Engard All tests pass, this adds data to the Patron column on the overdues with fines report to show the patron's cardnumber and phone number. Signed-off-by: Katrin Fischer This works as described and passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Overdues.pm | 1 + circ/branchoverdues.pl | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 21:53:46 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 20:53:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-554-g5c4ae87 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 5c4ae8768dee984a1bdb240e0fee790c76ae6919 (commit) via 6f728fb05062fc549a635a82970f7dc10f0f9748 (commit) from 54a17d97dcdcf31e9d4228c89473c82373e48e68 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5c4ae8768dee984a1bdb240e0fee790c76ae6919 Author: Galen Charlton Date: Mon Mar 10 21:11:40 2014 +0000 Bug 3445: DBRev. 3.15.00.021 Signed-off-by: Galen Charlton commit 6f728fb05062fc549a635a82970f7dc10f0f9748 Author: Fridolyn SOMERS Date: Tue Nov 19 11:21:13 2013 +0100 Bug 3445: add more indexes on the action_logs table This patch adds database indexes for action_logs table to speed up the "log viewer" page. Removes the existing index on timestamp+user to add an index on each column since search colums are separately defined in log viewer form. Test plan: - Update database - Play with log viewer : /cgi-bin/koha/tools/viewlog.pl - Perform searches with only one filter defined - Also check you see indexes with SQL query : SHOW CREATE TABLE action_logs Signed-off-by: Mathieu Saby Signed-off-by: Katrin Fischer Rephrased the updatedatabase message a bit: Add indexes to action_logs table Passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/kohastructure.sql | 7 ++++++- installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ kohaversion.pl | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 22:08:50 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 21:08:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-555-g9d9a002 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9d9a002432554913bc21f91cae031b3afa9077f9 (commit) from 5c4ae8768dee984a1bdb240e0fee790c76ae6919 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9d9a002432554913bc21f91cae031b3afa9077f9 Author: Fridolin SOMERS Date: Fri Jan 10 11:42:06 2014 +0100 Bug 11516: make OPAC search term highlighting work in results browser When OpacHighlightedWords syspref is on, the current search terms are highlighted in results and detail pages. This workes in detail page with the URL param 'query_desc'. This parameter must be managed in results browser (appears when OpacBrowseResults syspref is on) links. This patch adds query_desc parameter in results list and changes next nd previous links to be build into TT instead of perl to manage query_desc parameter only into TT. Test plan : - Edit sysprefs : OpacHighlightedWords on, OpacBrowseResults on. - Perform a search with a term existing into title => You see the term highlighted in search results - Go to detail of a result with highlight => You see the term highlighted - Click on "Next" => you see query_desc in URL, and if search term is present it is highlighted - Same for "Previous" - Click on "Browse results" - Click on a result => you see query_desc in URL, and if search term is present it is highlighted Signed-off-by: Aur?lie Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 13 ++++++++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 23 +++++++++++++++++--- opac/opac-detail.pl | 17 ++++++++------- 3 files changed, 39 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 22:24:54 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 21:24:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-556-g60d2475 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 60d24754ee3cdc4aa4ba52a4f61625d0ba0f3369 (commit) from 9d9a002432554913bc21f91cae031b3afa9077f9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 60d24754ee3cdc4aa4ba52a4f61625d0ba0f3369 Author: David Cook Date: Thu Jan 2 16:48:01 2014 +1100 Bug 11465: Show counts and amounts on OPAC 'your summary' tabs This patch adds counts and amounts to the tabs in the 'your summary' page of the OPAC patron account. _TEST PLAN_ Before applying: 1) Choose a test patron 2) Place a few holds 3) Check in one of the holds so that it is waiting for the patron 4) Check out a few items 5) Check out another item that can generate fines (backdate it a few weeks/months) 6) Run fines.pl to generate fines (make sure your finesmode syspref is set to prod) 7) Check your OPAC patron account. 8) Note the tabs "Checked out, Fines, Holds, and Waiting" Apply the patch 1) Switch your OPAC to the bootstrap theme 2) Refresh your browser for the OPAC patron account screen 3) Note that the applicable counts and amounts appear on the tabs -- At the moment, I just have a Bootstrap patch. This is an easy patch though, so I can duplicate to the other themes if necessary... Signed-off-by: Nicole C. Engard All tests on bootstrap pass Signed-off-by: Nicole C. Engard Signed-off-by: Katrin Fischer All tests and QA script pass. "Waiting" doesn't appear to work for me with and without the patch. "Checkouts", "Holds" and "Fines" work fine. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 10 23:56:12 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Mar 2014 22:56:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-558-g7d39b3c Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 7d39b3c72ea2422b09e3411bef974d87aecdabf9 (commit) via 4ae3665ad8afb5d283d989c4622a91690e1c4f8a (commit) from 60d24754ee3cdc4aa4ba52a4f61625d0ba0f3369 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7d39b3c72ea2422b09e3411bef974d87aecdabf9 Author: Galen Charlton Date: Mon Mar 10 22:48:03 2014 +0000 Bug 10611: (follow-up) cache DBMS driver code in context object Rather than use a package-level variable, use an object-level one. Signed-off-by: Galen Charlton commit 4ae3665ad8afb5d283d989c4622a91690e1c4f8a Author: Jonathan Druart Date: Tue Jul 16 11:53:47 2013 +0200 Bug 10611: Use mysql_auto_reconnect instead of ping DBD::Mysql provides a mysql_auto_reconnect flag. Using it avoids the time required to do a $dbh->ping(). Benchmarks: use Modern::Perl; use C4::Context; for ( 1 .. 1000 ) { $dbh = C4::Context->dbh; } * without this patch on a local DB: perl t.pl 0,49s user 0,02s system 98% cpu 0,525 total * without this patch on a remote DB: perl t.pl 0,52s user 0,05s system 1% cpu 37,358 total * with this patch on a local DB: perl t.pl 0,46s user 0,04s system 99% cpu 0,509 total * with this patch on a remote DB: perl t.pl 0,49s user 0,02s system 56% cpu 0,892 total Testing the auto reconnect: use Modern::Perl; use C4::Context; my $ping = $dbh->ping; say $ping; $dbh->disconnect; $ping = $dbh->ping; say $ping; Signed-off-by: Bernardo Gonzalez Kriegel Comment: Real improvement. No koha-qa errors prove t/db_dependent/Circulation_issuingrules.t produces no error prove t/db_dependent/Context.t produces no error Test 1) dumped Koha DB, load it on a non-local server 2) run sample script whit and without patch, local and remote use Modern::Perl; use C4::Context; for ( 1 .. 100000 ) { my $dbh = C4::Context->dbh; } Main difference I note is with remote server a) without patch real 0m16.357s user 0m2.592s sys 0m2.132s b) with patch real 0m0.259s user 0m0.240s sys 0m0.012s I think this could be good for DBs placed on remote servers Bug 10611: add a "new" parameter to C4::Context->dbh When dbh->disconnect is called and the mysql_auto_reconnect flag is set, the dbh is not recreated: the old one is used. Adding a new flag, we can now force the C4::Context->dbh method to return a new dbh. Signed-off-by: Bernardo Gonzalez Kriegel Bug 10611: Followup: remove useless calls to dbh->disconnect These 3 calls to disconnect are done at the end of the script, they are useless. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Paul Poulain Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Context.pm | 20 +++++++++++++++----- installer/install.pl | 2 -- misc/cronjobs/j2a.pl | 1 - sms/sms_listen.pl | 1 - t/db_dependent/Context.t | 5 +---- 5 files changed, 16 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 11 15:38:33 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Mar 2014 14:38:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-563-g26cdaaa Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 26cdaaae777dd21314df90177fe070730575fb85 (commit) via 25076dec54f06b6a7938f4a6cda0a80a1d3d51e4 (commit) via 2f0aac89709fec329436f15e259d49dd6072c6c1 (commit) via 1c794eaeca3877c8af32ea0b1cce7354541fdba7 (commit) via b648425aee8d23bfedf53b09593f5978ae667d7b (commit) from 7d39b3c72ea2422b09e3411bef974d87aecdabf9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 26cdaaae777dd21314df90177fe070730575fb85 Author: Galen Charlton Date: Tue Mar 11 14:57:26 2014 +0000 Bug 10777: (follow-up) improve CSS3 for Zebra-striping report email output This patch improves the CSS used to attempt to Zebra-stripe the output of emailed reports. This will work with some email clients, but other email clients (e.g., Gmail) don't handle style elements in the body or head element. Signed-off-by: Galen Charlton commit 25076dec54f06b6a7938f4a6cda0a80a1d3d51e4 Author: Nicholas van Oudtshoorn Date: Thu Aug 22 16:56:25 2013 +0800 Bug 10777: email HTML reports with the proper Content-Type The misc/cronjobs/runreport.pl allows for sending html reports via email. The problem is that the Content-Type isn't set to text/html, which means that the generated html email isn't displayed properly. This patch set the Content-Type, and also adds a tiny bit of CSS to potentially alternate row colours (just to make long reports a bit easier on the eye!) TEST PLAN ---------- 1. Run the script similar to this: ./misc/cronjobs/runreport.pl --format=html --to=YOUREMAIL --subject="Bad Formatting!" REPORTNUMBER 2. Look at the email - the html code should by visible and ugly. 3. apply the patch 4. Run the script again. 5. Look at the email - the data should look nicer now. Signed-off-by: Mark Tompsett Signed-off-by: Martin Renvoize Signed-off-by: Galen Charlton commit 2f0aac89709fec329436f15e259d49dd6072c6c1 Author: Nicole C. Engard Date: Sun Mar 9 05:10:29 2014 -0600 Bug 11918 : Fix typo on authorized values page This is a small string patch. On Authorized values this patch fixes the wording next to the library limit. To test: Visit Authorized Values Click 'Add new' or 'Edit' next to a value Make sure that the text next to the library filter is right Signed-off-by: Aleisha Signed-off-by: Katrin Fischer Text change, works as described. Signed-off-by: Galen Charlton commit 1c794eaeca3877c8af32ea0b1cce7354541fdba7 Author: Jesse Maseto Date: Mon Mar 10 09:39:22 2014 -0400 Bug 11695 - Fixed typo in marc21_field_008.xml "Tree-character alphabetic code", to "Three-character alphabetic code" Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Trees are nice, but Three is better here. String change, works as described. Signed-off-by: Galen Charlton commit b648425aee8d23bfedf53b09593f5978ae667d7b Author: Jesse Maseto Date: Mon Mar 10 09:14:44 2014 -0400 Bug 11731 - Fixed typo in message_transport_types.txt file. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer String change, all good. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../mysql/en/mandatory/message_transport_types.txt | 2 +- .../prog/en/data/marc21_field_008.xml | 14 +++++------ .../prog/en/modules/admin/authorised_values.tt | 3 +-- misc/cronjobs/runreport.pl | 25 ++++++++++++++------ 4 files changed, 27 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 11 15:44:08 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Mar 2014 14:44:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-565-g6e10045 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 6e1004544cce61822d03062645fb5460cb606a7c (commit) via f10ee65d88c64c23cbcf7fdf9417229b8d159d24 (commit) from 26cdaaae777dd21314df90177fe070730575fb85 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6e1004544cce61822d03062645fb5460cb606a7c Author: Galen Charlton Date: Tue Mar 11 15:06:04 2014 +0000 Bug 11751: DBrev 3.15.00.022 Signed-off-by: Galen Charlton commit f10ee65d88c64c23cbcf7fdf9417229b8d159d24 Author: Jonathan Druart Date: Wed Feb 12 16:34:01 2014 +0100 Bug 11751: remove dead code related to handling members of institution patrons This patch removes some dead code concerning the handling of patrons that are members of other, institutional patrons. This code did not work; removing it clears the field if somebody wants to do a better implementation of such relationships between patrons. This patch: [1] Removes the memberofinstitution system preference. [2] Removes the following routines: C4::Members::get_institutions() C4::Members::add_member_orgs() (and removing this routine removes a reference to a borrowers_to_borrowers table that does not exist). There should be no changes whatsoever to system functionality with this patch (with the trivial exception of the absence of the memberofinstitution system preference). Test plan: [1] Look at the code and use grep, git grep, etc. verify this patch does not remove something in use. [2] Verify that there are no regressions upon adding or editing a patron record. [3] Verify that the memberofinstitution system preference has been removed Signed-off-by: Galen Charlton Signed-off-by: Brendan Gallagher Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 47 -------------------- circ/circulation.pl | 22 --------- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 9 ++++ .../prog/en/modules/admin/preferences/patrons.pref | 6 --- kohaversion.pl | 2 +- members/memberentry.pl | 29 ------------ 7 files changed, 10 insertions(+), 106 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 11 16:00:47 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Mar 2014 15:00:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-568-g87330b9 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 87330b90f493d6c90168276fc749334f32beee96 (commit) via c44853ce3138e413612c5a95a4966734848163d9 (commit) via fe520d5b143611aee154e71ebcd1d460b62c60a6 (commit) from 6e1004544cce61822d03062645fb5460cb606a7c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 87330b90f493d6c90168276fc749334f32beee96 Author: Jonathan Druart Date: Tue Mar 11 09:54:55 2014 +0100 Bug 11170: (follow-up) improve a bit of unnecessarily convoluted logic This patch also adds POD and UT for the change in SearchOrders() Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit c44853ce3138e413612c5a95a4966734848163d9 Author: Marcel de Rooy Date: Mon Dec 16 11:58:32 2013 +0100 Bug 11170: (follow-up) fix typo 'occured' in parcels.tt Found this typo while testing bug 11170. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit fe520d5b143611aee154e71ebcd1d460b62c60a6 Author: Jonathan Druart Date: Wed Oct 30 15:34:15 2013 +0100 Bug 11170: make the pending order list only display orders to receive The order status ordered is set when the basket is closed. The parcel page should only display status "ordered" and "partial". Test plan: - create a basket. - create an order. - verify the order is not listed on the parcel page (i.e. you cannot receive it). - close the basket. - verify the order is listed on the parcel page. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 12 +++++++++--- acqui/parcel.pl | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- t/db_dependent/Acquisition.t | 20 +++++++++++++++++++- 4 files changed, 31 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 11 16:59:21 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Mar 2014 15:59:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-569-g1e0375e Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 1e0375e91c71ceb99d255a5789d82b1257f336b4 (commit) from 87330b90f493d6c90168276fc749334f32beee96 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1e0375e91c71ceb99d255a5789d82b1257f336b4 Author: Jonathan Druart Date: Wed Mar 5 12:06:47 2014 +0100 Bug 11755: ensure that SearchOrders returns booksellerid The SearchOrders routine should return the booksellerid and this patch adds it. This fixes several problems: [1] The link to the vendor on the order receive page breadcrumbs was broken. [2] The tax calculation in finishreceive.pl didn't run. [3] The item booksellerid field never got updated during receipt. Booksellerid was returned before bug 10723. Quick test plan: Go on orderreceive.pl and verify that the vendor link is correct. Followed test plan. Vendor link is now correct. Signed-off-by: Marc V?ron Signed-off-by: Brendan Gallagher Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 1 + t/db_dependent/Acquisition.t | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 11 17:29:29 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Mar 2014 16:29:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-570-g88c052b Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 88c052b0919142c9ff0c8d1e7ce4411c0fb1649e (commit) from 1e0375e91c71ceb99d255a5789d82b1257f336b4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88c052b0919142c9ff0c8d1e7ce4411c0fb1649e Author: Jonathan Druart Date: Mon Dec 23 09:58:30 2013 +0100 Bug 10837: make it possible to export serial claims as CSV even when no notice defined On the serial claims page, it is possible to export (using a CSV profile) or claim 1+ serials. The checkboxes are not shown if the claiming notice is not defined. So it is not possible to export claims. Test plan: - delete your notice "claimissues" - go on the serial claims page - verify that you are able to export them as CSV Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer This works as described and enables use of the export funtionality even if you are not using the email notifications. Exporting the serials will also set the claim date. Passes QA script and tests. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 11 17:47:55 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Mar 2014 16:47:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-571-g331ca7d Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 331ca7df3ec351a83982496bed7f103050e89af5 (commit) from 88c052b0919142c9ff0c8d1e7ce4411c0fb1649e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 331ca7df3ec351a83982496bed7f103050e89af5 Author: Jonathan Druart Date: Tue Feb 4 12:15:42 2014 +0100 Bug 11675: check allocated total correctly when editing a fund that has a parent fund The sth was created before the query. The query was modified after the sth creation and an error was raised. Test plan: 0/ Don't apply the patch 1/ Create a budget A (amount=1000) 2/ Create a fund A1 (amount=1000) 3/ Create a child fund A11 (amount=1000) 4/ Edit A11 and change the amount to 2000 You are able to do it, an error appears in the Koha log: "check_parent_total.pl: DBD::mysql::st execute failed: called with 2 bind variables when 1 are needed" 5/ Apply the patch, edit A11 and save. You get an error 6/ Edit A11 and change the amount to <=1000 7/ Verify that there is no regression on adding/removing/editing budgets and funds. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes all tests and QA script. Works as described, no regressions found. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: admin/check_parent_total.pl | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 12 02:27:51 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Mar 2014 01:27:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-572-gfd773f8 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via fd773f8e798f328292f49969b103892eb7dc6721 (commit) from 331ca7df3ec351a83982496bed7f103050e89af5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fd773f8e798f328292f49969b103892eb7dc6721 Author: Robin Sheat Date: Fri Feb 7 12:59:10 2014 +1300 Bug 11705 - change versioning of build-git-snapshot This change makes the package versions conform to Debian requirements for native packages. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: debian/build-git-snapshot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 12 04:45:51 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Mar 2014 03:45:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-579-g556eb67 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 556eb677186b738c036fd13a7cc3461c3f8c3d48 (commit) via 22593e2e9b613bd03fd42100e60f9a1da53476d9 (commit) via a5c7918eb3d4d83ceb22ee9881ebcef99f453345 (commit) via aeae8ef3b29117eaf6a6ac0c0917f68e172f7957 (commit) via 3d938ffc823b0193fc61822ffeb08cb127c6682e (commit) via c898f23f139866e2adb1fa46422f5cf32c5a1328 (commit) via 834abff631a4ea9bc779424d2096551d63dd13bb (commit) from fd773f8e798f328292f49969b103892eb7dc6721 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 556eb677186b738c036fd13a7cc3461c3f8c3d48 Author: Galen Charlton Date: Wed Mar 12 03:33:50 2014 +0000 Bug 108661: (follow-up) enshrine letting CardnumberLength specify just a maximum This patch finishes the work started in one of the previous follow-ups and allows CardnumberLength to be set to a value like ',5'. In conjunction with not including cardnumber in BorrowerMandatoryField, this allows a cardnumber to not be required but, if present, to not exceed the specified length. This patch also updates t/db_dependent/Members.t so that it runs in a transaction, tests the new return value of checkcardnumber, and manages the CardnumberLength syspref. To test: [1] Verify that prove -v t/db_dependent/Members.t and prove -v t/Members/cardnumber.t pass. [2] Set CardnumberLength to ",5" and take cardnubmer out of the BorrowerMandatoryField list. [3] Verify that you can save a patron record without a cardnumber, but if you supply one, that it can be at most 5 characters long. [4] Add cardnumber back to BorrowerMandatoryField. This time, the minimum length is 1 even though CardnumberLength is ",5". Signed-off-by: Galen Charlton commit 22593e2e9b613bd03fd42100e60f9a1da53476d9 Author: Galen Charlton Date: Wed Mar 12 02:54:05 2014 +0000 Bug 10861: (follow-up) use minlength/maxlength rather than pattern for client-side validation This patch replaces use of the HTML5 pattern attribute with minlength and maxlength, which is compatible with the jQuery validation plugin and which, in Chrome 33.0.1750.146 at least, works better. To test: [1] Enter a new patron record or edit an existing one. [2] Verify that the minimum and/or maximum length requirements set by the CardnumberLength syspref are validated and that form submission is prevented if the cardnumber doesn't meet the length requirements. Signed-off-by: Galen Charlton commit a5c7918eb3d4d83ceb22ee9881ebcef99f453345 Author: Galen Charlton Date: Wed Mar 12 02:26:37 2014 +0000 Bug 10861: DBrev 3.15.00.023 Signed-off-by: Galen Charlton commit aeae8ef3b29117eaf6a6ac0c0917f68e172f7957 Author: Kyle M Hall Date: Fri Dec 20 14:19:08 2013 -0500 Bug 10861: (follow-up) Clarify preference description Signed-off-by: Galen Charlton commit 3d938ffc823b0193fc61822ffeb08cb127c6682e Author: Jonathan Druart Date: Wed Dec 11 19:06:15 2013 +0100 Bug 10861: (follow-up) various refactoring This patch refactors the previous code and moves the logic from the pl to a new routine. Same test plan as previous patch. /!\ new unit test filename. Signed-off-by: Marcel de Rooy Bug 10861: Reintroduced the cardnumber length check (client side) Previous patches has removed the pattern attribute of the input, it was not needed. This patch reintroduces it. It will only work for new browser version. Moreover, it manages with the ',XX' format (see UT). Signed-off-by: Marcel de Rooy Squashed the last two follow-ups. The pattern test did not work fully for me in Firefox 26 (very recent). But I see the message when I clear the field. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton commit c898f23f139866e2adb1fa46422f5cf32c5a1328 Author: Marcel de Rooy Date: Wed Dec 11 13:46:15 2013 +0100 Bug 10861: (follow-up) for typo in patrons.pref I'd rather have a comma than a coma :) Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton Then again, if the cookies are really, really good, a cookie-induced coma would not be the worst thing. commit 834abff631a4ea9bc779424d2096551d63dd13bb Author: Jonathan Druart Date: Fri Apr 19 09:58:02 2013 +0200 Bug 10861: Add a check on cardnumber length Some libraries would like to add a check on the cardnumber length. This patch adds the ability to restrict the cardnumber to a specific length (strictly equal to XX, or length > XX or min < length < max). This restriction is checked on inserting/updating a patron or on importing patrons. This patch adds: - 1 new syspref CardnumberLength. 2 formats: a number or a range (xx,yy). - 1 new unit test file t/Members/checkcardnumber.t for the C4::Members::checkcardnumber routine. Test plan: 1/ Fill the pref CardnumberLength with '5,8' 2/ Create a new patron with an invalid cardnumber (123456789) 3/ Check that you cannot save 4/ With Firebug, replace the pattern attribute value (for the cardnumber input) with ".{5,10}" 5/ You are allowed to save but an error occurred. 6/ Try the same steps for update. 7/ Go to the import borrowers tool. 8/ Play with the import borrowers tool. We must test add/update patrons and the "record matching" field (cardnumber or a uniq patron attribute) Signed-off-by: Marcel de Rooy Tested adding, updating; importing and ran unit test. Preliminary QA comments on Bugzilla Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 64 ++++++++++++---- installer/data/mysql/updatedatabase.pl | 10 +++ .../prog/en/modules/admin/preferences/patrons.pref | 5 ++ .../prog/en/modules/members/memberentrygen.tt | 41 ++++++---- .../prog/en/modules/tools/import_borrowers.tt | 6 ++ kohaversion.pl | 2 +- members/memberentry.pl | 21 +++++- t/Members/cardnumber.t | 79 ++++++++++++++++++++ t/db_dependent/Members.t | 16 +++- tools/import_borrowers.pl | 13 +++- 10 files changed, 221 insertions(+), 36 deletions(-) create mode 100644 t/Members/cardnumber.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 12 15:33:43 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Mar 2014 14:33:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-591-g0b5b8ce Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 0b5b8cef348b61761305dd0bbc574699404c7c69 (commit) via 5c1691a8013bd38d6bae8b00a8950e1417695176 (commit) via 0039eee40c6f70023bfb93e8d3d011b47da6867a (commit) via 09fa6f09587b930670633639e306b1141632fce3 (commit) via cd21ac754223f9edd4b16e7a9d247ba3e21330ed (commit) via 6c264b24d12bafb8d0bc6eecdc7e188a622d7389 (commit) via 635d5441112171170bd3f2de7fdbf9a9feb62f48 (commit) via 18456ea5fc605d0c6dc58a860fe963bfbd3ba972 (commit) via 3273f823508f445cfdbf0ad5f60b7f4c546f0ee2 (commit) via 0b35290011a48938b55a069c2e44eee688bf70c8 (commit) via a443d16692fbda6243628fb9d5c1dedc738404f6 (commit) via ffb9e312a956ceb5e3b57c34bc6f5b055b494f5a (commit) from 556eb677186b738c036fd13a7cc3461c3f8c3d48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0b5b8cef348b61761305dd0bbc574699404c7c69 Author: Owen Leonard Date: Mon Feb 24 11:35:52 2014 -0500 Bug 11832: fix JavaScript error on staff client place hold screen if record has no items If a hold operation is blocked because the title has no items attached the patron search autocomplete JavaScript triggers an error. This patch modifies the template so that the JS is loaded only when items are present. To test, find a title which has no items attached. View the holds page for that title. There should be no JavaScript error. Patron search autocomplete should still work correctly for titles which have items attached. Deleted all items from a biblio record. Clicked the holds tab and confirmed using firebug Javascript error occurs. Applied patch, confirmed that the Javascript error described in comment 1 no longer happens. Went to another biblio with items, and confirmed patron auto-complete still functions. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton commit 5c1691a8013bd38d6bae8b00a8950e1417695176 Author: Owen Leonard Date: Fri Feb 21 15:27:41 2014 -0500 Bug 11821: disable catalog edit menu items and provide explanations when actions cannot be done Biblio edit menu items which are disabled should trigger a tooltip on hover and an alert on click with explanations. This patch implements this for the relevent menu items. To test, apply the patch for Bug 11829 if necessary. Find a record which has no items attached. Test the following views: - Normal - MARC - Labeled MARC - ISBD - Items Test these Edit menu items: - Edit items in a batch - Delete items in a batch - Delete all items Hovering over these menu items should trigger an explanatory tooltip. Clicking the menu items should trigger a similar alert. Next, locate a title with items attached. On the same pages above, test the Edit -> Delete record menu item. Hovering should trigger an explanatory tooltip. Clicking it should trigger a similar alert. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes all tests and QA script, works nicely. Signed-off-by: Galen Charlton commit 0039eee40c6f70023bfb93e8d3d011b47da6867a Author: Owen Leonard Date: Tue Feb 25 15:55:03 2014 -0500 Bug 11833 - fix filtering on saved report subgroup Filtering the list of saved reports by subgroup doesn't work because the filtering JavaScript was not updated when the table columns changed with Bug 3134. This patch corrects the target column for filtering. To test you must have multiple saved reports within one group, and at least one of those in a subgroup. - Apply the patch and go to Reports -> Use saved. - Click the tab for the group which contains your reports. - Choose the subgroup you want to filter on from the subgroup dropdown. The list of reports should be correctly filtered by your subgroup. NOTE: It seems weird to have the number of columns displayed change when filtered, but this patch does correct the filtering. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton commit 09fa6f09587b930670633639e306b1141632fce3 Author: Isaac Brodsky Date: Thu Feb 27 09:10:33 2014 -0600 Bug 1047: Punctuation in site names no longer breaks Edit/Delete z39.50 server administration The template used to show the Z39.50 server administration page had a bug that caused it to not correctly escape generated query strings. Because the Z39.50 server name is used to lookup the server in order to edit or delete it, when the server name is not passed correctly in the query string, it is impossible to bring up the edit or delete forms (without manually entering the escaped string.) This patch corrects which template is filter used to escape those query strings. To test: (1) Login to intranet, go to Administration -> Z39.50 servers (2) Select "New Z3.50 Server". Enter a server name that contains an ampersand (&), e.g.: "FOO & BAR". Enter other details and submit. Click OK to confirmation message. (3) In the server list, click on the server name, the "Edit" or "Delete" buttons for the server. The correct and full server details should be brought up. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton commit cd21ac754223f9edd4b16e7a9d247ba3e21330ed Author: Galen Charlton Date: Fri Feb 21 20:07:01 2014 +0000 Bug 11820: remove dead code in basket group management There was some code in acqui/basketgroup.pl that was apparently intended to let one create a basket group for no (or an unknown) vendor. However, this code was never reached, as there is nothing in the templates that invokes basketgroup.pl with 'add' as the operation that doesn't also pass the vendor ID along. This patch removes that dead code. To test: [1] Create a new basket group for a vendor and verify that it is created correctly. [2] Edit an existing basket group, including moving baskets in and and out of, and verify that it works. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer No regressions found, passes all tests and QA script. Signed-off-by: Galen Charlton commit 6c264b24d12bafb8d0bc6eecdc7e188a622d7389 Author: Owen Leonard Date: Wed Feb 5 10:35:47 2014 -0500 Bug 11686: make "please note your reason here..." translatable Through some quirk of the translation script a predefined value on a text input is not properly translated even though the string appears in the po file. On the suggestions form the problem can be solved by using the HTML5 placeholder attribute. To test you must have existing suggestions to manage. Apply the patch and: - Update a translation by running tranlsate update [language code] - Install/reinstall the translation by running translate install [language code] - In the English templates: - Navigate to Acquisitions -> Suggestions and find the "Mark selected as:" section below the table of existing suggestions. - Select "Other" from the "choose a reason" field. A text input field should appear with the placeholder text "please note your reason here." - In the templates you updated and installed, follow the same procedure above. The placeholder text should now appear with the correct translation. - In both English and translated templates using this bulk-status option should save your chosen status correctly with the correct reason, whether that reason be predefined or manually entered. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes tests and QA script. Tested successfully with German - nice to see this fixed! Signed-off-by: Galen Charlton commit 635d5441112171170bd3f2de7fdbf9a9feb62f48 Author: Fridolin Somers Date: Fri Jan 31 14:23:03 2014 +0100 Bug 11648 - Use word item instead of copy - opac prog Sometimes, the word copy/copies is use to speak about item/items. It would be better to use only item because translation of the word copy depends on context, it should be used only when speaking about copy like in "copy and paste". This patch replaces copy/copies in opac prog theme. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 18456ea5fc605d0c6dc58a860fe963bfbd3ba972 Author: Fridolin Somers Date: Fri Jan 31 14:22:45 2014 +0100 Bug 11648 - Use word item instead of copy - opac bootstrap Sometimes, the word copy/copies is use to speak about item/items. It would be better to use only item because translation of the word copy depends on context, it should be used only when speaking about copy like in "copy and paste". This patch replaces copy/copies in opac bootstrap theme. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 3273f823508f445cfdbf0ad5f60b7f4c546f0ee2 Author: Fridolin Somers Date: Fri Jan 31 14:22:05 2014 +0100 Bug 11648 - Use word item instead of copy - intranet Sometimes, the word copy/copies is use to speak about item/items. It would be better to use only item because translation of the word copy depends on context, it should be used only when speaking about copy like in "copy and paste". This patch replaces copy/copies in intranet. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer String changes, no regressions found. Signed-off-by: Galen Charlton commit 0b35290011a48938b55a069c2e44eee688bf70c8 Author: Jonathan Druart Date: Tue Jan 14 12:21:43 2014 +0100 Bug 11550: Add UT for C4::Acquisition::GetOrder If GetOrder is called with a nonexistent ordernumber or without any ordernumber, it should return undef. Test plan: prove t/db_dependent/Acquisition.t Signed-off-by: Katrin Fischer Updated number of tests to 68, tests and QA script all happy now. Looked at a few pages in aquisition using GetOrder as well. Signed-off-by: Galen Charlton commit a443d16692fbda6243628fb9d5c1dedc738404f6 Author: Galen Charlton Date: Wed Mar 12 14:09:30 2014 +0000 Bug 10012: DBRev 3.15.00.024 Signed-off-by: Galen Charlton commit ffb9e312a956ceb5e3b57c34bc6f5b055b494f5a Author: Galen Charlton Date: Fri Feb 21 18:14:05 2014 +0000 Bug 10012: remove last traces of NoZebra This patch removes the last traces of NoZebra: [1] The DBIC schema class for the nozebra table [2] References to the NoZebra and NoZebraIndexes sysprefs in the Italian SQL scripts. [3] Deleting the NoZebraIndexes syspref if it's still present. To test: [1] Verify that after applying the patch and running the DB upgrade, that "NoZebraIndexes" is no longer to be found in the systempreferences table. [2] Verify that "nozebra" is not referenced anywhere in the source code except for the database update scripts. Signed-off-by: Galen Charlton Signed-off-by: wajasu Signed-off-by: Marcel de Rooy ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 2 + Koha/Schema/Result/Nozebra.pm | 64 -------------- acqui/basketgroup.pl | 90 ++++++++------------ .../mysql/it-IT/necessari/system_preferences.sql | 2 - installer/data/mysql/updatedatabase.pl | 9 ++ .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 42 +++++++-- .../prog/en/modules/admin/z3950servers.tt | 4 +- .../prog/en/modules/help/cataloguing/additem.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 8 +- .../prog/en/modules/reserve/request.tt | 10 +-- .../prog/en/modules/suggestion/suggestion.tt | 3 +- .../prog/en/modules/tools/inventory.tt | 2 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 2 +- .../bootstrap/en/modules/opac-overdrive-search.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 14 +-- .../bootstrap/en/modules/opac-results-grouped.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 2 +- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 6 +- .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 6 +- .../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 6 +- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 2 +- .../prog/en/modules/opac-overdrive-search.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 14 +-- .../prog/en/modules/opac-results-grouped.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 6 +- .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 6 +- .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 6 +- kohaversion.pl | 2 +- t/db_dependent/Acquisition.t | 7 +- 30 files changed, 142 insertions(+), 185 deletions(-) delete mode 100644 Koha/Schema/Result/Nozebra.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 12 18:40:18 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Mar 2014 17:40:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-597-g4edcec3 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 4edcec3d5812b159b7012c43a04577bfd7e462bc (commit) via 65b62137fcd9101abadb79ca521281854b0ed055 (commit) via d6c40ebe5a2ff7ce883c1d36a47720a37754c633 (commit) via e55d89be20acb58deb45a30c113bf0f07170fd33 (commit) via b5d85741a7d297c70783a649ac00f26c82351a6f (commit) via 3b7349e59005696094d5f7019583211140a355f0 (commit) from 0b5b8cef348b61761305dd0bbc574699404c7c69 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4edcec3d5812b159b7012c43a04577bfd7e462bc Author: Kyle M Hall Date: Mon Jan 13 12:39:51 2014 -0500 Bug 11531: make it possible to edit transport cost for a new libraries If you are using the transport cost matrix, and you create a new library, you cannot edit the fields for this library! Test Plan: 1) Enable the transport cost matrix 2) Set some transport cost values in the matrix 3) Save the matrix 4) Create a new library 5) View the transport cost matrix again 6) Note the uneditable fields for the new branch 7) Apply this patch 8) View the transport cost matrix again 9) Note you can now edit the fields for the new branch Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton commit 65b62137fcd9101abadb79ca521281854b0ed055 Author: Julian Maurice Date: Tue Jan 7 15:24:58 2014 +0100 Bug 11861: Add ISSN column in serials claims table Signed-off-by: Koha Team Lyon 3 Signed-off-by: Katrin Fischer Added Sign off line. Passes all tests and QA script, including t/db_dependent/Serials.t Signed-off-by: Galen Charlton commit d6c40ebe5a2ff7ce883c1d36a47720a37754c633 Author: Owen Leonard Date: Mon Feb 10 09:29:13 2014 -0500 Bug 11718 - Use new DataTables include in reports templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to all circ-related pages which use DataTables. Apply the patch and test the following pages to confirm that table sorting works correctly: - Reports -> Guided reports -> Use saved (reports/guided_reports.pl?phase=Use saved): "Creation date" sorting has been reconfigured to use the title-string method for sorting on an unformatted date. C4:Reports::Guided.pm has been modified to pass an unformatted date to the template. Sorting should work correctly for all settings of the dateformat system pref. - Reports -> Catalog by item type (reports/manager.pl?report_name=itemtypes) - Reports -> Serials statistics wizard (reports/serials_stats.pl): The subscription begin and subscription end columns have been modified to use the title-string filter for sorting. An unformatted date is now passed from reports/serials_stats.pl to the template, where the KohaDates filter is used for formatting. Sorting is based on the unformatted date. Sorting should work correctly for all settings of the dateformat system pref. - Sorting of titles should now exclude article from sorting. - Minor template improvements: - Vendor name now links to vendor details. - Subscription title now links to subscription details. - Library name is now shown instead of branchcode. Signed-off-by: Aleisha Signed-off-by: Katrin Fischer Passes all tests and QA script. Checked all pages, no regressions or Javascript errors detected. Signed-off-by: Galen Charlton commit e55d89be20acb58deb45a30c113bf0f07170fd33 Author: Jonathan Druart Date: Wed Mar 5 13:44:49 2014 +0100 Bug 11493: Revert "Bug 6869 Batch item modification fails whit accented characters" This reverts commit c9905750e53e2e1615842ac696d5eeb0a8ac07fc. Test plan: 1/ Open a bib record with more than 1 item , 2/ Select all items 3/ Chose Modify selected items 4/ put you "? ? ?" in notes 5/ Verify the items have been updated correctly 6/ put you "???" in notes 7/ Verify the items have been updated correctly 8/ put you "? ? ? ???" in notes 9/ Verify the items have been updated correctly Patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Confirmed bug on master and that the patch fixes it. Passes all tests and the QA script. Signed-off-by: Galen Charlton commit b5d85741a7d297c70783a649ac00f26c82351a6f Author: Sophie Meynieux Date: Fri Feb 14 12:10:32 2014 +0100 Bug 11760: In notices, output road type description rather than code Test plan : - Define a notice containing <> - Trigger an event that generate this notice Without patch <> is replaced by ROADTYPE authorised value code. With the patch it is resplaced by its description Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer This works as described, passes tests and QA script. Note: it seems it's not possible currently to use B_streettype from the interface, but it might be worth adding it as a follow up for later use. Signed-off-by: Galen Charlton commit 3b7349e59005696094d5f7019583211140a355f0 Author: Galen Charlton Date: Wed Feb 26 16:45:09 2014 +0000 Bug 11459: use drop-down to set OrderPdfFormat syspref This patch converts the OrderPdfFormat to a choice. To test: [1] Look at OrderPdfFormat in the system preferences editor. Verify that there is a drop-down giving a choice among the three PDF basketgroup printing formats. [2] Change the OrderPdfFormat setting and print a basketgroup. Verify that the chosen template is used. Signed-off-by: Galen Charlton I followed the test plan. Patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Improves usability of the OrderPdfFormat system preference. Works as described, only changes YAML file. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 2 ++ C4/Reports/Guided.pm | 1 - C4/Serials.pm | 3 ++- admin/transport-cost-matrix.pl | 4 +++ .../en/modules/admin/preferences/acquisitions.pref | 8 ++++-- .../en/modules/reports/guided_reports_start.tt | 18 ++++++-------- .../prog/en/modules/reports/itemtypes.tt | 6 ++--- .../prog/en/modules/reports/serials_stats.tt | 26 +++++++++++--------- .../prog/en/modules/serials/claims.tt | 4 +++ reports/serials_stats.pl | 3 +-- tools/batchMod.pl | 1 - 11 files changed, 42 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 12 18:53:47 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Mar 2014 17:53:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-599-g8a9cdcd Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 8a9cdcd3bcce07ace793b9b2a6ad31f4604961a2 (commit) via 20d0aff0e88544cdddfb4a6b90fc73ed652c84bd (commit) from 4edcec3d5812b159b7012c43a04577bfd7e462bc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8a9cdcd3bcce07ace793b9b2a6ad31f4604961a2 Author: Owen Leonard Date: Tue Mar 11 10:58:44 2014 -0400 Bug 10415 - Add course reserves to staff client home page A link to course reserves is in the global header menu but not on the home page. All links from the global header should be present on the home page as well. This patch adds it. To test, apply the patch and if necessary clear your browser cache. View the staff client home page. If you have "UseCourseReserves" enabled you should see a link for the course reserves page which is visually consistent with the other module links. If you do not have course reserves enabled you should not see the link. Unrelated: I positioned the admin link after the tools link because it bugged me. Signed-off-by: Broust Signed-off-by: marjorie barry-vila Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. Course reserves is still accessible without permissions, but you can't make any changes to the reserves then. Signed-off-by: Galen Charlton commit 20d0aff0e88544cdddfb4a6b90fc73ed652c84bd Author: Fridolin Somers Date: Wed Feb 26 11:03:18 2014 +0100 Bug 11845 - set overlay and import status translatable in addorderiso2709.tt In addorderiso2709.tt, the text for overlay and import status come from database and was not translatable. Ths patch fixes that. Same as Bug 10170. Test plan : - Go to acquisition module - Display an open basket - Click on "From a staged file" - Look at table => Without patch, you see codes in "Status" column : staged, imported, ... => With patch, you see descriptions in "Status" column : Staged, Imported, ... - Click on a "Add orders" - Look at table => Without patch, you see codes in "Match?" column : no_match, auto_match, ... => With patch, you see descriptions in "Match?" column : No match, Match found, ... Signed-off-by: Nathalie CHATILLON Signed-off-by: Marcel de Rooy This is an improvement. Only the translation of auto_match as Match found could perhaps be further improved. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/css/mainpage.css | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 + .../prog/en/modules/acqui/addorderiso2709.tt | 30 ++++++++++++++++++-- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 17 +++++++---- .../prog/img/staff-home-icons-sprite.png | Bin 11151 -> 5262 bytes .../staff-home-icons-sprite.psd | Bin 117814 -> 126748 bytes 6 files changed, 42 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 13 16:08:08 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 13 Mar 2014 15:08:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-609-g3a99c04 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 3a99c0441a7400ddc2437300b94a98e645c89881 (commit) via 12df62ca33047df0c5cd372bf5574cf131f773e0 (commit) via 183d4a55ca7877ae5bf7eb8399bf37dc954117e4 (commit) via e34508744d3e76827e911531a56f84731a669784 (commit) via b987a206f6ba78ae72c5a21e0ce0d8720863746c (commit) via b056f93c4d33a9a56d56bbb081924f7c4c974a79 (commit) via 6310c992bf23d164f013ead7c0b2182226279454 (commit) via 21e6518d32477fa1fe59da64d735f3f07ae49bcd (commit) via 4ad27b99a4baa51271e8a69a8bdbfa7c26f2ec92 (commit) via e7f08df1ddb68aeb24e0439de252e8dee0bb6857 (commit) from 8a9cdcd3bcce07ace793b9b2a6ad31f4604961a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3a99c0441a7400ddc2437300b94a98e645c89881 Author: Galen Charlton Date: Thu Mar 13 15:17:37 2014 +0000 Bug 11934: (follow-up) tidy up whitespace Signed-off-by: Galen Charlton commit 12df62ca33047df0c5cd372bf5574cf131f773e0 Author: Nicolas Legrand Date: Thu Mar 13 10:40:27 2014 +0100 Bug 11934 - Replace given by if-else statements To test: [1] Verify that prove -v t/db_dependent/Circulation_issuingrules.t passes. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer replaces given-when with if-elsif-else constructs. Tests still pass and code looks good. Signed-off-by: Galen Charlton commit 183d4a55ca7877ae5bf7eb8399bf37dc954117e4 Author: Kyle M Hall Date: Tue Mar 11 10:34:40 2014 -0400 Bug 11923: fix option to sort contents of MARC record batches by citation descending When the ability to stage authority records was added to Koha, sorting record batches by citation ( i.e. title ) caused the addition of "authorized_heading" to be added to the sort. When sorting by title descending, this causes the order by clause to be "title, authorized_heading DESC" which means sort by title ASC, then authorized_heading DESC. This is incorrect and causes regular biblio batches to always be sorted ascending. Test plan: 1) Stage a batch of biblio records from a file 2) View the staged batch 3) Attempt to sort by title descending 4) Note it is still sorted by title ascending 5) Apply this patch 6) Note the sorting now works correctly Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Works as advertised. The code pertaining to sorting in routine GetImportRecordsRange will probably not win beauty prizes. Signed-off-by: Galen Charlton commit e34508744d3e76827e911531a56f84731a669784 Author: Galen Charlton Date: Thu Mar 13 14:57:04 2014 +0000 Bug 11647: (follow-up) add comment expressing that user must be logged in Signed-off-by: Galen Charlton commit b987a206f6ba78ae72c5a21e0ce0d8720863746c Author: Sophie Meynieux Date: Wed Mar 12 15:53:28 2014 +0100 Bug 11647 : (follow-up) Add template modification for bootstrap theme Signed-off-by: Aurelie Fichot Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit b056f93c4d33a9a56d56bbb081924f7c4c974a79 Author: Sophie Meynieux Date: Mon Mar 10 17:07:07 2014 +0100 Bug 11647: (follow-up) test if user is logged in before proposing to subscribe or unsubcribe from serial routing list To test : 1) Search for a subscription with patron notification active 2) If you're not logged in, a message warns you that you must log in to subscribe to notification on new issues 3) If you log in, and have not yet subscribed to this routing list, you've got a link to subscribe 4) Once you have subscribed, you've got a link to unsubscribe 5) If you log out, you've got a message saying you must log in to subscribe 6) If you log in with another user, you've got the link to subscribe or unsubscribe depending on if he has already subscribed. Signed-off-by: remy juliette Signed-off-by: Aurelie Fichot Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 6310c992bf23d164f013ead7c0b2182226279454 Author: Sophie Meynieux Date: Fri Jan 31 12:22:05 2014 +0100 Bug 11647: require that user log into OPAC to request email subscription notifications Signed-off-by: Chris Cormack Signed-off-by: remy juliette Signed-off-by: Aurelie Fichot Signed-off-by: Katrin Fischer Passes QA script and tests. Instead of hiding the feature completely, now a message tells the user to login to subscribe to the email notifications. Signed-off-by: Galen Charlton commit 21e6518d32477fa1fe59da64d735f3f07ae49bcd Author: Fridolin Somers Date: Wed Mar 5 14:26:14 2014 +0100 Bug 11366: make "no group" option in acq basket group drop-down translatable in Acq baskets, there's a pull-down for basket groups. One of the entries in that pull-down is "No group", which is untranslatable. This string is hard-coded in Perl. This patch removes the string from Perl to set it has first option in select. To allow it to be default value, the option "Add new group" is moved to last position. Test plan : - Go to a closed aquisition basket in no basket group : cgi-bin/koha/acqui/basket.pl?basketno=x => You see "No group" selected in combobox "Basket group" - Cick on this combobox => You see "No group", then existing basket groups and then "Add new group" - Select a basket group and click on "change basket group" => You see the basket group name in combobox Use translation, for example fr-FR - go to src/misc/translator - run : perl translate update fr-FR => You find in PO file : #: intranet-tmpl/prog/en/modules/acqui/basket.tt:365 #, fuzzy, c-format msgid "No group" msgstr "Nom de groupe" - remove ", fuzzy" and correct translation : "Pas de groupe" - run : perl translate install fr-FR - Go to translated aquisition basket page => You see translated option in combobox Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton commit 4ad27b99a4baa51271e8a69a8bdbfa7c26f2ec92 Author: Galen Charlton Date: Thu Mar 13 14:40:31 2014 +0000 Bug 11928: DBRev 3.15.00.025 Signed-off-by: Galen Charlton commit e7f08df1ddb68aeb24e0439de252e8dee0bb6857 Author: Mark Tompsett Date: Wed Mar 12 11:53:17 2014 -0400 Bug 11928 - Remove unused table aqorderdelivery Aqorderdelivery has apparently never been used. This patch removes it. TEST PLAN --------- 1) Apply patch. 2) Run the Koha QA Test tool. 3) Confirm table is there. 4) Run upgrade process. 5) Confirm table has been removed. 6) Drop koha database and create empty one. 7) Fresh install from staff client. 8) Confirm table was not created. 9) I'm unsure how to test the Schema's. It was just git rm'd. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 3 +- Koha/Schema/Result/Aqorderdelivery.pm | 75 -------------------- acqui/basket.pl | 7 -- installer/data/mysql/kohastructure.sql | 13 ---- installer/data/mysql/updatedatabase.pl | 15 +++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 3 +- .../bootstrap/en/modules/opac-serial-issues.tt | 20 +++--- .../prog/en/modules/opac-serial-issues.tt | 18 +++-- kohaversion.pl | 2 +- opac/opac-alert-subscribe.pl | 3 +- opac/opac-serial-issues.pl | 18 +++-- t/db_dependent/Circulation_issuingrules.t | 31 ++++---- 12 files changed, 71 insertions(+), 137 deletions(-) delete mode 100644 Koha/Schema/Result/Aqorderdelivery.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 13 17:28:41 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 13 Mar 2014 16:28:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-611-gce7b118 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via ce7b11879b850b5302b95a7b7d2f0d15089d9b44 (commit) via b02f40d6e1febc0802b82660c56f1745ea664fd5 (commit) from 3a99c0441a7400ddc2437300b94a98e645c89881 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ce7b11879b850b5302b95a7b7d2f0d15089d9b44 Author: Jonathan Druart Date: Tue Mar 11 12:07:13 2014 +0100 Bug 11127: (follow-up) define a specific message for suggestions Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit b02f40d6e1febc0802b82660c56f1745ea664fd5 Author: Jonathan Druart Date: Thu Oct 24 11:41:11 2013 +0200 Bug 11127: OPAC suggestions form - complain when trying to 'delete selected' without having selected any To reproduce: 1/ go on opac-suggestions.pl 2/ create a suggestion 3/ click on the delete link without checking any checkbox The form is submitted with a message "The selected suggestions have been deleted.". Test plan: 0/ enable the bootstrap theme 1/ after applying the patch, click on delete without any checkbox checked, a js alert should occur. 2/ check at least a cb and click on the delete link. The deletion should work. Followed test plan. Patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 1 + koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 13 17:32:41 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 13 Mar 2014 16:32:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-612-gfacbe51 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via facbe5155f06408f8978d056fae25b255c647b14 (commit) from ce7b11879b850b5302b95a7b7d2f0d15089d9b44 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit facbe5155f06408f8978d056fae25b255c647b14 Author: Julian Maurice Date: Thu Dec 19 12:00:04 2013 +0100 Bug 11386: standardize validation of the subscription add/edit form Use jQuery.validate plugin for subscription add/edit form and remove readonly attribute on date fields, as datepicker is not available for everyone. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Works as described, passes tests, and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/serials/subscription-add.tt | 42 +++++++------------- 1 file changed, 15 insertions(+), 27 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Mar 14 15:56:54 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Mar 2014 14:56:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-619-gfac91e2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via fac91e2ce1210ad202e321d1f4de2383ac693dd3 (commit) via 24470f70e1e420883f3eb8cc594211568729f9ee (commit) via b4f5fee48cccec9f1fe6f403333f11ae0349d8e7 (commit) via 0148b236bab898012b082b2e40a20a9ce6f11e60 (commit) via 266f6a095c15af1e56238e43c05bdbfc406afad4 (commit) via 353418dee043ccd332ef3f24d1f1bd330a6d2dd1 (commit) via 40d3800cc4d73be3f40fb3b895de3e7fe29e4999 (commit) from facbe5155f06408f8978d056fae25b255c647b14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fac91e2ce1210ad202e321d1f4de2383ac693dd3 Author: Jonathan Druart Date: Fri Feb 21 17:16:43 2014 +0100 Bug 11637: don't try to guess publication dates for irregular subscriptions Test plan: Create a subscription with an irregular numbering pattern. Verify the prediction pattern. With this patch, it should show "unknown" instead of the date of the first issue publication date. This patch does not fix the issue on generating the next serial. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer This is a partial fix for a small regression in the serials module. Now the prediction pattern doesn't predict dates when you test it, and shows 'Unknown' instead. We still need to fix the 'planned date' set for the expected serial. There should be no date, it should also be 'unknown'. Passes tests and QA script. Signed-off-by: Galen Charlton commit 24470f70e1e420883f3eb8cc594211568729f9ee Author: Jonathan Druart Date: Tue Jan 8 14:49:24 2013 +0100 Bug 9366: add widget to bib editor to control display of the MARC tags If the syspref hide_marc is set to "don't display", tags were not shown by default. This patch adds a checkbox to hide/show tags directly on the cataloguing page. The value is stored in a cookie. Test plan: Enable/disable the sysprefs hide_marc and advancedMARCeditor in order to check if the display is according with what the user want. Reload the page and verify the value is kept. The first value of the cookie is retrieved from the hide_marc pref. Bonus: This patch removes the link "Show MARCtag documentation links" if the syspref advancedMARCeditor is enabled. Signed-off-by: Joel Aloi Signed-off-by: Katrin Fischer This works as described, the editor will remember the choices made by the cataloguer. Passes all tests and QA script. Notes: - The error messages for mandatory fields upon saving only give the tag number and not the description, so this might require to turn back on the tag display. - The advancedMARCeditor doesn't display the documentation links before and after the patch was applied. I think it could still be useful for an advanced cataloger to be able to look up information on a field quickly. Signed-off-by: Galen Charlton commit b4f5fee48cccec9f1fe6f403333f11ae0349d8e7 Author: Magnus Enger Date: Fri Mar 7 09:10:49 2014 +0100 Bug 10647 - Make OPAC MARC plain view work for all flavours of MARC On "MARC view" in the OPAC, clicking on "Plain view" does not work for UNIMARC and NORMARC. To test: - Make sure you have a UNIMARC or NORMARC setup - Go to the "MARC view" of a record in the OPAC - Click on "view plain" and observe the "Sorry, plain view is temporarily unavailable." error message - Apply the patch - Click on "view plain" and observe that a plain view of the MARC record is now displayed - Sign off I have only tested this on NORMARC, it might be good if someone can test on UNIMARC. Updated 2014-03-13: Incoroprates changes suggested by Marcel. Test plan is the same as before. Updated 2014-03-13: Tested in my UNIMARC system. toggled opactheme to all three values, with OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay both set to default. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Tested with MARC21 and UNIMARC, passes all tests and QA script. Signed-off-by: Galen Charlton commit 0148b236bab898012b082b2e40a20a9ce6f11e60 Author: A. Sassmannshausen Date: Thu Mar 13 16:09:32 2014 +0000 Bug 11762 - bootstrap: Re-order 245 $a $b $h in results. In the results view for OPAC and Intranet search results, titles are currently displayed in 245 $a $b $h order. In detailed view the titles are displayed in the better 245 $a $h $b order. This patch corrects the behaviour for NORMARC and MARC21 in BOOTSTRAP: all now display 245 $a $h $b. To test: - Find records containing 245 $a $b and $h fields. - Compare the way they look in detail and results view on the OPAC (bootstrap). - Apply the patch. - Re-check detail and results view: all should now look the same on the OPAC (bootstrap). Signed-off-by: Jesse Weaver Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 266f6a095c15af1e56238e43c05bdbfc406afad4 Author: A. Sassmannshausen Date: Thu Mar 13 16:06:29 2014 +0000 Bug 11762 - intranet & prog: Re-order 245 $a $b $h in results. In the results view for OPAC and Intranet search results, titles are currently displayed in 245 $a $b $h order. In detailed view the titles are displayed in the better 245 $a $h $b order. This patch corrects the behaviour for NORMARC and MARC21: all now display 245 $a $h $b. To test: - Find records containing 245 $a $b and $h fields. - Compare the way they look in detail and results view in OPAC (non-bootstrap) and intranet (you should see a discrepancies). - Apply the patch. - Re-check detail and results view: all should now look the same in both OPAC (non-bootstrap) and intranet. Signed-off-by: Jesse Weaver Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. Checked with Magnus Enger about the changes for the NORMARC stylesheets and the changes are ok. Signed-off-by: Galen Charlton commit 353418dee043ccd332ef3f24d1f1bd330a6d2dd1 Author: Nicole C. Engard Date: Wed Mar 12 14:29:48 2014 -0600 Bug 11403: (follow-up) Fix typo in renew help This patch adds a missing letter to the Renew help file To test: Go to Circulation > Renew Click Help Confirm that the text now reads 'scan' instead of 'can' Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 40d3800cc4d73be3f40fb3b895de3e7fe29e4999 Author: Tomas Cohen Arazi Date: Wed Jan 22 15:38:41 2014 -0300 Bug 9114: Make frameworks import/export routines correctly use UTF-8 Currently both the import_export_framework.pl script outputs data with Perl's default encoding, ISO-8859. This patch properly sets the binmode to UTF-8 when exporting SQL and CSV files using the PerlIO layer (":encoding(UTF-8)") for STDOUT. To test: Export step test - Use some ASCII character(s) with DIACRITICS in some field description in a chosen framework. - Export the framework at Administration > MARC frameworks - Run this to check the file is ISO-8859 encoded: $ file export_XXX.csv export_XXX.csv: ISO-8859 text, with very long lines (Note: try SQL and other output formats too. But not ODS) - Apply the patch - Export the framework again (change the name), and test encoding: $ file export_XXX_2.csv export_XXX_2.csv: UTF-8 Unicode text Import step test I assume you have two files, export_XXX.csv (ISO-8859 encoded) and export_XXX_2.csv (XXX will depend on your framework's code) - Reset your testing branch to master - Import export_XXX.csv - The string with non-ASCII chars is truncated at the first non-ASCII char's position (Note: this is the current behaviour). - Import export_XXX_2.csv - The non-ASCII chars are broken, the logs show errors on non-UNICODE chars. (Note: even thou UTF-8 is the expected encoding it is treated as ISO-8859). - Apply the patch - Import the good (UTF-8 as expected) file and check everything worked as expected. No double encoding should occur with either combination of formats. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Magnus Enger I put some Norwegian and accented letters in a fremawork to test. Before the patch, the exported CSV came out as ISO-8859, after the patch it came out as UTF-8. ODS and XML (viewed in LibreOffice) both looked good, before and after the patch. Importing the ISO-8859 CSV cut off the strings at the first non-ASCII char. Importing the UTF-8 CSV worked as epected. Signed-off-by: Katrin Fischer Works as expected, passes tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: admin/import_export_framework.pl | 4 + .../prog/en/modules/cataloguing/addbiblio.tt | 108 ++++++++++++-------- .../prog/en/modules/help/circ/renew.tt | 2 +- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 8 +- .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 12 +-- .../prog/en/xslt/NORMARCslim2intranetResults.xsl | 8 +- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 8 +- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 12 +-- .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 12 +-- ...MARC21slim2OPACMARCdetail.xsl => plainMARC.xsl} | 0 .../prog/en/xslt/MARC21slim2OPACResults.xsl | 8 +- .../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 12 +-- .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 12 +-- ...MARC21slim2OPACMARCdetail.xsl => plainMARC.xsl} | 0 opac/opac-showmarc.pl | 2 +- serials/showpredictionpattern.pl | 7 +- 16 files changed, 122 insertions(+), 93 deletions(-) rename koha-tmpl/opac-tmpl/bootstrap/en/xslt/{MARC21slim2OPACMARCdetail.xsl => plainMARC.xsl} (100%) rename koha-tmpl/opac-tmpl/prog/en/xslt/{MARC21slim2OPACMARCdetail.xsl => plainMARC.xsl} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 17 16:03:50 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 17 Mar 2014 15:03:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-621-g657cd3c Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 657cd3c4c0a784e2d8e202b94d538c9229fb463a (commit) via 3a4607b5fc90ba982d43e8c2ce032ad7157bd0db (commit) from fac91e2ce1210ad202e321d1f4de2383ac693dd3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 657cd3c4c0a784e2d8e202b94d538c9229fb463a Author: Owen Leonard Date: Fri Mar 14 11:10:19 2014 -0400 Bug 11935: fix capitalization: OPAC prog theme, checkouts tab opac-user.tt in the prog theme contains 'Renew Selected' and 'Renew All'. These are incorrectly capitalized. This patch corrects. To test you must have OpacRenewalAllowed enabled. Apply the patch, switch to the prog theme, and log in to the OPAC as a patron who has checkouts. At the bottom of the table of checkouts you should see the renew buttons with correct capitalization. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer String change, all good. Signed-off-by: Galen Charlton commit 3a4607b5fc90ba982d43e8c2ce032ad7157bd0db Author: Owen Leonard Date: Fri Mar 14 11:18:19 2014 -0400 Bug 11938: fix capitalization: Serial prediction pattern preview - Publication Date During add or edit of a subscription when you test the prediction pattern, "Publication Date" in the displayed table has incorrect capitalization. This patch corrects. To test, apply the patch and create or edit a subscription. In step two click the "test prediction pattern" button to display the table. "Publication date" should be correctly capitalized. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer String change, all good. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 18 08:21:40 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 18 Mar 2014 07:21:40 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-6-gd8a0e92 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via d8a0e92c718e7c180a44b98fbe380c26667deacd (commit) from c8bc38a682d322378ef3a2d2e19d9aadab1d362d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d8a0e92c718e7c180a44b98fbe380c26667deacd Author: David Cook Date: Thu Jan 9 17:12:26 2014 +1100 Bug 11502: make library filter in "Holds To Pull" more precise This patch uses regex checking via the DataTables fnFilter API method to make the branch filter more precise on the "Holds to Pull" page. The ability to use regex is built into DataTables so this just adds the actual expression. _TEST PLAN_ Before applying: 1) Add library (branches) with codes of NM, NMH, and NB 2) Add items (that can be placed on hold) at all these branches 3) Place a hold on an item that is only available at NM 4) Place a hold on an item that is only available at NMH 5) Place a hold on an item that is only available at NM and NB 6) Go to "Holds to Pull" in the Circulation module 7) Filter by these three different values 8) Note that filtering by "NM" will incorrectly bring up all three holds, while "NMH" and "NB" will only pull up one (like they should). Apply the patch. 9) Shift+refresh the page so that your Javascript refreshes 10) Repeat step 7 (filtering by the different branch values) 11) Note that filtering by "NM" will now only bring up the hold for "NM" and the hold for "NM" and "NB", while the others still only bring up one hold. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit e96d73aa9f462fb653b8b67d7d5bff81dab94be7) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 18 08:35:33 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 18 Mar 2014 07:35:33 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-7-g18c295a Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 18c295a49ac2614d37ee6efdce774b65ea381617 (commit) from d8a0e92c718e7c180a44b98fbe380c26667deacd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 18c295a49ac2614d37ee6efdce774b65ea381617 Author: Sophie Meynieux Date: Tue Dec 4 18:05:36 2012 +0100 Bug 9210: wrap long lines in printed hold notices This commit adds wrapping styles to print-notices.tt template Test plan: * place a hold on a title with a very very long title or author * mark it as "waiting for pickup" by doing a checkin * go to command line interface, and run * misc/cronjobs/gather_print_notices.pl /tmp * misc/cronjobs/printoverdues.sh /tmp * if your title/author is long enough, it's split on 2 lines with this patch (it is not before this patch) Signed-off-by: Kyle M Hall Signed-off-by: Paul Poulain Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 06a8b6f314ded89fa6b4f94276e68e390b7afc3a) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 18 08:52:48 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 18 Mar 2014 07:52:48 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-8-ge25804b Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via e25804b7989038b8f26ccc669489ac95fab7c3be (commit) from 18c295a49ac2614d37ee6efdce774b65ea381617 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e25804b7989038b8f26ccc669489ac95fab7c3be Author: Francesca Moore Date: Wed Jan 15 11:43:00 2014 +1300 Bug 11522: improve formating of self-registration form 1. in prog theme, enable opac self-registration and inspect clear date with firebug; note that there are empty paragraph tags 2. add date of birth as a requirment in self-registration 3. apply patch 4. refresh page and notice that empty paragraph tags have been deleted, so that required lines up with clear date 5. repeat the above steps for bootstrap theme Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 42ec10670efb6e33fa23537c1037ff9087f55e30) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 18 08:57:36 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 18 Mar 2014 07:57:36 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-10-g7a2ba62 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 7a2ba627e1a863d0ef1be68a1bd669ac77ecc011 (commit) via 77e7a3ae45827b138ee9203f1013cc6df0a53e46 (commit) from e25804b7989038b8f26ccc669489ac95fab7c3be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7a2ba627e1a863d0ef1be68a1bd669ac77ecc011 Author: Galen Charlton Date: Thu Jan 16 15:30:43 2014 +0000 Bug 7143: add another name to the about page Signed-off-by: Galen Charlton (cherry picked from commit 4e4a33ef5deecc32711092d78d87f2eefe3fbcf5) Signed-off-by: Fridolin Somers commit 77e7a3ae45827b138ee9203f1013cc6df0a53e46 Author: Chris Cormack Date: Sun Jan 12 20:11:40 2014 +1300 Bug 7143: Updating about page and history Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit ef7480f362a0286b13e1ba1b99e58c6d2ca7ba72) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 44 ++++++++++++++++------ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 14 +++++++ 2 files changed, 47 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 18 09:08:54 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 18 Mar 2014 08:08:54 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-16-g4223df4 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 4223df421990086785a319e2ff2e68212813a133 (commit) via 5998ed2379b3459b28e76b79d181e789ffa00b4c (commit) via f6ad320c39053a13a7f4e30cd525e074d6c55ec1 (commit) via a1ff2fb562c0136eaed141832b208fd5d8831897 (commit) via 0cb747f65cd24d812e7b68f90dad98f8f7c0f35f (commit) via 5607d128d7ba16ad79296087d03ae7c12c66ed82 (commit) from 7a2ba627e1a863d0ef1be68a1bd669ac77ecc011 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4223df421990086785a319e2ff2e68212813a133 Author: Galen Charlton Date: Fri Jan 17 05:21:07 2014 +0000 Bug 9788: (follow-up) update the bootstrap theme This patch applies the change made in the QA follow-up to the Bootstrap theme. Signed-off-by: Galen Charlton (cherry picked from commit a776c7764050290d20ad4e5200aaed11a3983bf7) Signed-off-by: Fridolin Somers commit 5998ed2379b3459b28e76b79d181e789ffa00b4c Author: Marcel de Rooy Date: Thu Sep 26 12:22:51 2013 +0200 Bug 9788: (follow-up) Unit tests for changed routine GetReservesFromItemnumber Adds three tests to Reserves.t for GetReservesFromItemnumber. We test if this routine does not return a future next available hold, a future item level hold. And if it does return a future wait (that is: a confirmed future hold, using ConfirmFutureHolds). Note that Holds.t does also contains some basic tests for this routine, but the additional tests seem to better located in the direct context of tests for bug 9761 for ConfirmFutureHolds. Test plan: Run both t/db_dependent/Holds.t and t/db_dependent/Reserves.t. Verify if both tests do not fail. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit d211fa50ede180ed511cdf7f55be6c084abc1ff5) Signed-off-by: Fridolin Somers commit f6ad320c39053a13a7f4e30cd525e074d6c55ec1 Author: Jonathan Druart Date: Mon Nov 4 11:55:57 2013 +0100 Bug 9788: QA followup 1/ CURRENT_DATE() is a MySQLism and should be replaced with CAST(now() AS DATE). 2/ The date formatting should be done in the template (using the TT plugin). Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 38edd714c598322e81a32a0dfc5f2ce0da46826d) Signed-off-by: Fridolin Somers commit a1ff2fb562c0136eaed141832b208fd5d8831897 Author: Marcel de Rooy Date: Fri Jun 21 18:43:59 2013 +0200 Bug 9788: (follow-up) for expirationdate in Letter.pm Pasting comment from the Bugzilla report: Looking bit longer at this code, it is kind of strange to find it there in the first place. Adding maxpickupdelay in Letters.pm should not be there, but it is.. Also this date is not used normally in the default HOLD Available for Pickup notice (that we are generating in this case). And if it would be undef, the expiration date should imo be empty instead of today+0. (before adding maxreservespickupdelay, you should test the allowexpire pref first) So it is an (invisible) bug on its own. Test plan: See former patch. Kyle just discovered this bug, apparently by deleting the maxpickupdelay pref.. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit a23d4181b1e756a61a036059b8b909d4f0d30537) Signed-off-by: Fridolin Somers commit 0cb747f65cd24d812e7b68f90dad98f8f7c0f35f Author: Marcel de Rooy Date: Thu Sep 26 10:33:46 2013 +0200 Bug 9788: (follow-up) removing the alldates parameter from GetReservesFromItemnumber Before bug 9788 the alldates parameter of GetReservesFromItemnumber was actually not used in the codebase. The first patch of bug 9788 did change that and passed true by default. But a closer look revealed that we do not really need it. The parameter is removed by this patch; the SQL statement is slightly adjusted: if reservedate<=now or a waitingdate is filled for the requested itemnumber, GetReservesFromItemnumber will return the reserve. This includes so-called future waits: a future hold that has been confirmed ahead of time with pref ConfirmFutureHolds > 0 days. Note that future item-level holds are not really interesting to return; this just corresponds to original behavior. Future next-available holds are not in view at all; they do not contain an item number. Test plan: Actually, the test plan of the first patch is valid. But for completeness I repeat it here: [1] Enable future holds and set ConfirmFutureHolds to 2 days. [2] Place a future next-available hold for 2 days ahead. [3] Check item status on catalogue detail. Available? That is fine. [4] Confirm the future hold by checking it in. ('future wait') [5] Look at item status again on catalogue detail. Must be Waiting now. [6] Switch to OPAC and login as another opac user. Goto Place a hold. [7] Check item status with item level hold info. Is it waiting? [8] Try to place hold in staff, check item level status again. Waiting? [9] Make a transfer for the item. Switch branch. Check hold status on Transfers to receive. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 92be11bbcf20628dd7db8b83fc0b902ba578a28a) Signed-off-by: Fridolin Somers commit 5607d128d7ba16ad79296087d03ae7c12c66ed82 Author: Marcel de Rooy Date: Mon Mar 11 14:28:57 2013 +0100 Bug 9788: Improvements when calling GetReservesFromItemnumber This patch makes GetReservesFromItemnumber also returns the waiting date and removes some repeated code. Improves item status display on catalogue detail, when placing a hold at opac-reserve and in staff, and on transfers to receive form. This patch builds on work from reports 9367 and 9761. Test plan: Place a future next-av. hold (enable future holds prefs), say 2 days ahead. Check item status on catalogue detail. Nothing to see. Enable ConfirmFutureHolds by inserting a number of days, say 2. Confirm earlier hold by checking it in. Look at item status again on detail. Switch to other opac user. Try to place a hold again. Check item status with item level hold info. Try to place hold in staff, check item level status. Make a transfer for that item. Switch branch. Look at transfers to receive. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 1a9737be768aa1e585addc596e2fcb5a77482c38) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 10 ++++--- C4/Reserves.pm | 21 ++++++++------- catalogue/detail.pl | 14 ++++------ circ/transferstoreceive.pl | 2 +- .../prog/en/modules/catalogue/detail.tt | 3 ++- .../prog/en/modules/reserve/request.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 3 ++- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 3 ++- opac/opac-reserve.pl | 21 ++++++--------- reserve/request.pl | 11 ++------ t/db_dependent/Reserves.t | 28 +++++++++++++++++++- 11 files changed, 68 insertions(+), 50 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 18 12:54:20 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 18 Mar 2014 11:54:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-623-g7408fa5 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 7408fa5d7087fad5c8f15b742b9624cbfe652a61 (commit) via a31210efd34dc7e3c65f8491c26c2d8f8fc36dfb (commit) from 657cd3c4c0a784e2d8e202b94d538c9229fb463a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7408fa5d7087fad5c8f15b742b9624cbfe652a61 Author: Jonathan Druart Date: Fri Jan 24 12:49:39 2014 +0100 Bug 8168: (follow-up) Use semicolon as default CSV delimiter installer/data/mysql/sysprefs.sql has semicolon as default. This fixes both instances to use the same fallback value. It also prevents CSV header info from being included in non-CSV messages. Signed-off-by: wajasu Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit a31210efd34dc7e3c65f8491c26c2d8f8fc36dfb Author: Daniel Barker Date: Wed Jan 15 09:57:19 2014 +1300 Bug 8168: Fixing header of non CSV files for overdue notices This determines if the CSV header should be included or not and then generates it as needed using the delimiter specified in the delimiter system preference. TEST PLAN --------- 1. make some overdues books 2. run the overdue notices script without the -csv 3. check emails notice csv header is in the email 4. apply the patch 5. run the overdue notice again 6. check email notice CSV header is absent Signed-off-by: Mark Tompsett Signed-off-by: Chris Cormack Signed-off-by: wajasu Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/overdue_notices.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 22 13:19:05 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 22 Mar 2014 12:19:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-624-g9c7f137 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9c7f137f5e518187f0b3a0fd3b3e55b75d07e362 (commit) from 7408fa5d7087fad5c8f15b742b9624cbfe652a61 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9c7f137f5e518187f0b3a0fd3b3e55b75d07e362 Author: Jonathan Druart Date: Wed Mar 19 13:11:52 2014 +0100 Bug 11957: reomve disused sample_only_param_tables.sql This sql file tries to insert data into nonexistent tables. It is useless and can be removed. Test plan: git grep sample_only_param_tables should not return any result. NOTE: This is basically a git rm. Simple patch. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer File is not used by the installers and it wouldn't work with today's Koha for trying to insert data into non-existant tables and tables with different structure. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/sample_only_param_tables.sql | 152 --------------------- 1 file changed, 152 deletions(-) delete mode 100644 installer/data/mysql/sample_only_param_tables.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 22 13:35:03 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 22 Mar 2014 12:35:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-626-g42ba4d4 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 42ba4d42ff80bb77a69363c37c4a2252a104d41d (commit) via 8f8ce37e88e87b3286275f07f54832f82b9fce9e (commit) from 9c7f137f5e518187f0b3a0fd3b3e55b75d07e362 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 42ba4d42ff80bb77a69363c37c4a2252a104d41d Author: Galen Charlton Date: Sat Mar 22 12:57:30 2014 +0000 Bug 11973: DBRev 3.15.00.026 Signed-off-by: Galen Charlton commit 8f8ce37e88e87b3286275f07f54832f82b9fce9e Author: Bernardo Gonzalez Kriegel Date: Thu Mar 20 08:45:14 2014 -0300 Bug 11973 - Fix Armenian language description This patch fix Armenian language description To test: 1) Do a fake translation to Armenian, mkdir koha-tmpl/intranet-tmpl/prog/hy-Armn 2) Go to Administration > System preferences > I18N/L10N 3) Armenian description looks like the second string in Bug description 4) Apply the patch 5) Run updatedatabase.pl 6) Reload page, now description look as first string in Bug description (it's the sixth letter, similar to 't') Ammended patch, wrong column. Signed-off-by: Holger Mei?ner Signed-off-by: Katrin Fischer Patch fixes the English sample file for translations and includes a database update to correct the string in existing installations. Passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/en/mandatory/subtag_registry.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 +++++++++ kohaversion.pl | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Mar 22 14:33:21 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 22 Mar 2014 13:33:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-627-g69216d2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 69216d2217519cd6d8ad97710236251abdd89ae9 (commit) from 42ba4d42ff80bb77a69363c37c4a2252a104d41d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 69216d2217519cd6d8ad97710236251abdd89ae9 Author: Jacek Ablewicz Date: Mon Feb 24 17:37:43 2014 +0100 Bug 11352: fix unexpected data loss issues with batch patron deletion/anonymization Batch patron deletion/anonymization tool has some issues: 1) If 'dateformat' setting in I18N/L10N system preferences is set to anything other then 'iso' (eg. 'metric'), bulk deletion when using 'expiration date is before' criterion is not working properly. Date entered in this field will be efectivelly ignored (or possibly sometimes wrongly interpreted as different date, in other format) on the final patron deletion stage. This may result in deleting (or moving to trash) more borrower records then intended. 2) Bulk/batch patron deletion should skip borrowers with nonzero account balance (ones with oustanding fines or credits) 3) This tool shouldn't offer to choose as deletion criterion those patron categories which have category_type set to 'S' (= staff patron categories) This patch fixes above mentioned problems. It also adds an option to "test run" patron batch deletion, and makes this option the default choice in "warning" stage. Test plan: - prepare test database with some patron records (at least 2, the more the better) set up in such a way that they will be vulnerable to issues 1 & 2 - confirm issues 1,2 - restore test database - apply patch - ensure issues 1 & 2 are no longer present - first by using new "test run" option: for #1, record counts in "warning" stage and "final" stage should be now the same; for #2, observe that patron records with nonzero balance are now excluded from deletion - redo the tests, this time choosing "delete permanently" and "move to trash" instead of "test run" - test #3 by changing "Category type" to "S" in some test patron categories - after that, those categories should no longer be choosable as deletion criteria. Signed-off-by: Magnus Enger Tested with dateformat = dd/mm/yyyy. I tested with two expired patrons, one with fines and one without. Before the patch a lot of unexpected patrons were deleted along with the expected ones. After applying the patch only the expired patron was deleted, not the one with fines. The test run and the "real" run reported correct numbers. The patch also makes sure no patron categories with category_type = S are suggested for batch deletion. Note: The ergonomics of the "Batch delete/anonymize" tool is hardly optimal, but this patch fixes a real, data-loosing bug, so let's deal with the ergonomics later. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/cleanborrowers.tt | 27 ++++++++++------ tools/cleanborrowers.pl | 33 +++++++++++--------- 2 files changed, 36 insertions(+), 24 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 24 05:14:11 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 24 Mar 2014 04:14:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.11-1-g792e1b6 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 792e1b6259af8da6067a86263ecd4f197ffd5295 (commit) from a80918f76d83c548999c4726959d932a6452fc87 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 792e1b6259af8da6067a86263ecd4f197ffd5295 Author: Owen Leonard Date: Fri Jan 10 15:46:29 2014 -0500 Bug 11505: fix untranslatable table headers in Label batch manager The label batch manager script hard-codes the table header cell labels in order to pass them to an HTML-building function. This obviously isn't the best solution for internationalization, but picking the whole scheme apart would be very complicated. Instead this patch uses a SWITCH statement to check for each possible case and outputs the correct translatable string for each. To test, apply the patch and run "perl translate update" for any translation. Check the revised po file and confirm that the new strings are present. View the label batch edit page and confirm that the table headings look correct: Tools -> Labels -> Manage batches -> Edit batch. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described, passes all tests. Similar fixes are probably needed for other pages of the labels modules. Signed-off-by: Galen Charlton (cherry picked from commit e8f5ee9eef7a558ae1af8237493f8dc52e52945a) Signed-off-by: Fridolin Somers Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/labels/label-edit-batch.tt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 24 05:20:18 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 24 Mar 2014 04:20:18 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.11-3-gd46792c Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via d46792c0540275aad26b1279aa9b5e251dd7828d (commit) via 426fa8fa2d9f245107ec7d6f765c5e5e60306074 (commit) from 792e1b6259af8da6067a86263ecd4f197ffd5295 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d46792c0540275aad26b1279aa9b5e251dd7828d Author: Sophie Meynieux Date: Tue Dec 4 18:05:36 2012 +0100 Bug 9210: wrap long lines in printed hold notices This commit adds wrapping styles to print-notices.tt template Test plan: * place a hold on a title with a very very long title or author * mark it as "waiting for pickup" by doing a checkin * go to command line interface, and run * misc/cronjobs/gather_print_notices.pl /tmp * misc/cronjobs/printoverdues.sh /tmp * if your title/author is long enough, it's split on 2 lines with this patch (it is not before this patch) Signed-off-by: Kyle M Hall Signed-off-by: Paul Poulain Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 06a8b6f314ded89fa6b4f94276e68e390b7afc3a) Signed-off-by: Fridolin Somers (cherry picked from commit 18c295a49ac2614d37ee6efdce774b65ea381617) Signed-off-by: Chris Cormack commit 426fa8fa2d9f245107ec7d6f765c5e5e60306074 Author: David Cook Date: Thu Jan 9 17:12:26 2014 +1100 Bug 11502: make library filter in "Holds To Pull" more precise This patch uses regex checking via the DataTables fnFilter API method to make the branch filter more precise on the "Holds to Pull" page. The ability to use regex is built into DataTables so this just adds the actual expression. _TEST PLAN_ Before applying: 1) Add library (branches) with codes of NM, NMH, and NB 2) Add items (that can be placed on hold) at all these branches 3) Place a hold on an item that is only available at NM 4) Place a hold on an item that is only available at NMH 5) Place a hold on an item that is only available at NM and NB 6) Go to "Holds to Pull" in the Circulation module 7) Filter by these three different values 8) Note that filtering by "NM" will incorrectly bring up all three holds, while "NMH" and "NB" will only pull up one (like they should). Apply the patch. 9) Shift+refresh the page so that your Javascript refreshes 10) Repeat step 7 (filtering by the different branch values) 11) Note that filtering by "NM" will now only bring up the hold for "NM" and the hold for "NM" and "NB", while the others still only bring up one hold. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit e96d73aa9f462fb653b8b67d7d5bff81dab94be7) Signed-off-by: Fridolin Somers (cherry picked from commit d8a0e92c718e7c180a44b98fbe380c26667deacd) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 24 20:49:59 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 24 Mar 2014 19:49:59 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.11-4-ge4585d48 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via e4585d4853bfe1f709bd3066b67b26de9ac1f7a6 (commit) from d46792c0540275aad26b1279aa9b5e251dd7828d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e4585d4853bfe1f709bd3066b67b26de9ac1f7a6 Author: Chris Cormack Date: Tue Mar 25 09:11:54 2014 +1300 Bumping version number for release ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 6 ++++++ kohaversion.pl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 24 21:18:10 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 24 Mar 2014 20:18:10 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.11-5-g405670c Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 405670c9cefd359d15ad4ee63bc01da1b5b1175b (commit) from e4585d4853bfe1f709bd3066b67b26de9ac1f7a6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 405670c9cefd359d15ad4ee63bc01da1b5b1175b Author: Chris Cormack Date: Tue Mar 25 09:40:28 2014 +1300 3.12.12 release notes ----------------------------------------------------------------------- Summary of changes: ...notes_3_12_10.txt => release_notes_3_12_12.txt} | 132 ++++++++++---------- 1 file changed, 68 insertions(+), 64 deletions(-) copy misc/release_notes/{release_notes_3_12_10.txt => release_notes_3_12_12.txt} (53%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 24 21:26:55 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 24 Mar 2014 20:26:55 +0000 Subject: [koha-commits] main Koha release repository annotated tag v3.12.12 created. v3.12.12 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The annotated tag, v3.12.12 has been created at 7c92374effecac8b8559d67e79ed2a89d6468953 (tag) tagging 405670c9cefd359d15ad4ee63bc01da1b5b1175b (commit) replaces v3.12.11 tagged by Chris Cormack on Tue Mar 25 09:48:10 2014 +1300 - Log ----------------------------------------------------------------- Koha release 3.12.12 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iEYEABECAAYFAlMwmgoACgkQZgbcHEvgMLPjzgCgoSs1ooeSNnjm3tQ6cv4XBwxu b0IAnjrtQzi4I5vSeDtH1nsGizqs1cl0 =BHYd -----END PGP SIGNATURE----- Chris Cormack (2): Bumping version number for release 3.12.12 release notes David Cook (1): Bug 11502: make library filter in "Holds To Pull" more precise Owen Leonard (1): Bug 11505: fix untranslatable table headers in Label batch manager Sophie Meynieux (1): Bug 9210: wrap long lines in printed hold notices ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 09:14:03 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 08:14:03 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-17-g0853bfd Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 0853bfd32c840aedf13a5aa3327905c8c6b2067e (commit) from 4223df421990086785a319e2ff2e68212813a133 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0853bfd32c840aedf13a5aa3327905c8c6b2067e Author: Jacek Ablewicz Date: Mon Feb 24 17:37:43 2014 +0100 Bug 11352: fix unexpected data loss issues with batch patron deletion/anonymization Batch patron deletion/anonymization tool has some issues: 1) If 'dateformat' setting in I18N/L10N system preferences is set to anything other then 'iso' (eg. 'metric'), bulk deletion when using 'expiration date is before' criterion is not working properly. Date entered in this field will be efectivelly ignored (or possibly sometimes wrongly interpreted as different date, in other format) on the final patron deletion stage. This may result in deleting (or moving to trash) more borrower records then intended. 2) Bulk/batch patron deletion should skip borrowers with nonzero account balance (ones with oustanding fines or credits) 3) This tool shouldn't offer to choose as deletion criterion those patron categories which have category_type set to 'S' (= staff patron categories) This patch fixes above mentioned problems. It also adds an option to "test run" patron batch deletion, and makes this option the default choice in "warning" stage. Test plan: - prepare test database with some patron records (at least 2, the more the better) set up in such a way that they will be vulnerable to issues 1 & 2 - confirm issues 1,2 - restore test database - apply patch - ensure issues 1 & 2 are no longer present - first by using new "test run" option: for #1, record counts in "warning" stage and "final" stage should be now the same; for #2, observe that patron records with nonzero balance are now excluded from deletion - redo the tests, this time choosing "delete permanently" and "move to trash" instead of "test run" - test #3 by changing "Category type" to "S" in some test patron categories - after that, those categories should no longer be choosable as deletion criteria. Signed-off-by: Magnus Enger Tested with dateformat = dd/mm/yyyy. I tested with two expired patrons, one with fines and one without. Before the patch a lot of unexpected patrons were deleted along with the expected ones. After applying the patch only the expired patron was deleted, not the one with fines. The test run and the "real" run reported correct numbers. The patch also makes sure no patron categories with category_type = S are suggested for batch deletion. Note: The ergonomics of the "Batch delete/anonymize" tool is hardly optimal, but this patch fixes a real, data-loosing bug, so let's deal with the ergonomics later. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 69216d2217519cd6d8ad97710236251abdd89ae9) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/cleanborrowers.tt | 27 ++++++++++------ tools/cleanborrowers.pl | 33 +++++++++++--------- 2 files changed, 36 insertions(+), 24 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 09:20:16 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 08:20:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-18-g91fd91b Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 91fd91b0052f7ac4a5479ff26b3289a6dad96e8e (commit) from 0853bfd32c840aedf13a5aa3327905c8c6b2067e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 91fd91b0052f7ac4a5479ff26b3289a6dad96e8e Author: Jonathan Druart Date: Tue Oct 8 17:17:45 2013 +0200 Bug 11018: allow adding order from a reverted MARC batch Weird behavior: When an import is undone into catalog, the status is set to "reverted". But if you open the add orders from iso2709, the status is automatically set to "imported" and does not appear in the list. So it is not possible to import a reverted batch. [RM note: since a reverted batch is nonetheless a staged batch, and could be reused, allowing orders to be placed by taking bibs from a reverted batch is not as odd as it might sound. It *can* look odd for a staged or reverted batch to contain records that are imported, but that's a long-standing oddity.] Test plan: - verify you reproduce the weird behavior - apply this patch - import a file and the batch into the catalog - verify (in the your mysql/MariaDB cli) the status is "imported" - verify it does not appears in the add orders from iso2809 page - undo the import - verify (in the your mysql/MariaDB cli) the status is "reverted" - verify it appears in the add orders from iso2809 page and the status is always "reverted" - finish the order Signed-off-by: Pierre Angot Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 4bd730d4c24440c157801b68e248002b10ec0dd3) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/addorderiso2709.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 09:23:02 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 08:23:02 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-19-g74a6acb Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 74a6acb4205caedb3746df69bcfafad9a063b9d0 (commit) from 91fd91b0052f7ac4a5479ff26b3289a6dad96e8e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 74a6acb4205caedb3746df69bcfafad9a063b9d0 Author: Owen Leonard Date: Fri Jan 10 11:56:15 2014 -0500 Bug 11476: remove extra empty option from title pull-down in OPAC self-registration If you have patron titles enabled, the OPAC patron details form lists 2 empty spaces instead of 1. An empty option is passed by the script, so the template does not need to include one. To test you must have at least one patron title set in BorrowersTitles system preference and OPACPatronDetails must be set to "allow." 1. Apply the patch 2. Log in to the OPAC 3. Click the "personal details" tab. 4. Click the "salutation" dropdown. There should be only one blank line preceding the existing titles. Test in both prog and bootstrap. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described for existing and creating new accounts. Signed-off-by: Galen Charlton (cherry picked from commit a8aa6e8f7efd1ea29fdbd99cf3e573e72b424eb5) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 1 - koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt | 1 - 2 files changed, 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 11:38:29 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 10:38:29 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-24-g6c6a9ad Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 6c6a9ada72451f74d79cc458a081e23c3da07963 (commit) via 6ab253669060c71ab368b58418fcdc3bfe3e73b6 (commit) via c805997ac597faaf4985d7ff70431417a0cd7306 (commit) via 531ca79931286d0495b5accc1cd49985a96042c5 (commit) via 9024729131faf0eb77d294cff9450f1f160d0834 (commit) from 74a6acb4205caedb3746df69bcfafad9a063b9d0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6c6a9ada72451f74d79cc458a081e23c3da07963 Author: Galen Charlton Date: Fri Jan 17 06:04:37 2014 +0000 Bug 11473: (follow-up) ensure link to item is construct correctly This patch adjusts the check on action_logs.info to better detect if the event concerns an item. This fixes a problem where the links from log entries on item modifications would, if followed, result in internal server errors. Signed-off-by: Galen Charlton (cherry picked from commit 490e38069c0b9fcf71449d7812a0056b68318c64) Signed-off-by: Fridolin Somers commit 6ab253669060c71ab368b58418fcdc3bfe3e73b6 Author: David Cook Date: Mon Jan 6 15:01:10 2014 +1100 Bug 11473 - add 'biblio' and 'item' to cataloguing logging info This patch adds the words 'biblio' and 'item' to the 'info' of the cataloguing logs which were missing them (such as biblio delete, biblio mod, item mod, upload cover image). This patch also adds 'authority' for authority mod. _TEST PLAN_ Before applying: 1) Create/view mods for items, biblios, and authorities. 2) Create/view biblio deletion 3) Create/view upload cover image log 4) Note that none of these contain the words 'biblio','item',or 'authority' in their "Info" columns. Apply patch. 5) Repeat steps 1-3 6) Note that the new logs contain 'biblio','item', and 'authority' in their "Info" column, while the past ones don't. 7) Note also that 'biblio' and 'item' will have 'Biblio' and 'Item' appear in their "Object" column for the new logs Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 5885077fbbc97add0d077898c06726ef3106eee9) Signed-off-by: Fridolin Somers commit c805997ac597faaf4985d7ff70431417a0cd7306 Author: David Cook Date: Mon Jan 6 14:49:01 2014 +1100 Bug 11473 - Improve wording in log viewer template This patch capitalizes 'member' and 'biblio' as object labels in the log viewer. It also adds a "Subscription" label, and changes "auth" to "Authority". _TEST PLAN_ Before applying patch: 1) View logs for patrons, new biblio, serials, and authorities. Apply the patch: 1) Notice the capitalization and new/modified labels. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 8b386419c07413c810c56482cd4b505cdb5f43f2) Signed-off-by: Fridolin Somers commit 531ca79931286d0495b5accc1cd49985a96042c5 Author: David Cook Date: Mon Jan 6 14:43:53 2014 +1100 Bug 11473 - Remove boilerplate in log viewer template This patch eliminates unnecessary conditions and boilerplate. _TEST PLAN_ Apply the patch. 1) Try viewing logs for circulation, patrons, fines, cataloguines, serials, authorities, etc. 2) Note that everything should look exactly the same as before, with one exception: FINES 3) Fines will now show "member X" for the user associated with the fine. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 5b3535899acfdcd309d722dba39a8bdcdbdc54e4) Signed-off-by: Fridolin Somers commit 9024729131faf0eb77d294cff9450f1f160d0834 Author: David Cook Date: Mon Jan 6 14:32:31 2014 +1100 Bug 11473 - Fix log viewer template conditions This patch adds the 'loopro' key to the 'module' value, so that conditions are actually triggered in the template logic. (Note: loopro.CIRCULATION is valid, but I changed it for the sake of consistency across the different conditions.) This patch also adds substr checks to the 'info' column when using the cataloguing module. This will check for 'item' and 'biblio', so that the appropriate label qualifer can be shown in the log viewer. If either term is absent, the unqualified number will be shown instead (this will be the majority of action logs at this point). _TEST PLAN_ Before applying: 1) Access log viewer from Tools (or wherever really) 2) Look up logs for circulation, patrons, cataloguing, serial, authorities, etc. 3) Note that the "Object" will always just be a number without qualification. After applying the patch: 1) Look at those same logs 2) Note that the object number for borrowers will usually be prefaced by 'member' (notwithstanding FINES which aren't taken into account in this template yet); new bibs and new items should say 'Item X' or 'Biblio X'. Serials should have a link. Authorities should have a link and an 'auth' preface. Signed-off-by: Chris Cormack Works as advertised Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit ac6fb12c9aff29a652ee10c960ab10309d22adee) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 2 +- C4/Biblio.pm | 4 +-- C4/Items.pm | 2 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 34 +++++++------------- tools/upload-cover-image.pl | 2 +- tools/viewlog.pl | 2 +- 6 files changed, 18 insertions(+), 28 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 11:54:44 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 10:54:44 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-26-gce7cd56 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via ce7cd56c0b60031d6140a61e0f135db17deeba31 (commit) via 5d4a6bb712fe2d4b6179cc15eaf29cda2676b547 (commit) from 6c6a9ada72451f74d79cc458a081e23c3da07963 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ce7cd56c0b60031d6140a61e0f135db17deeba31 Author: Marcel de Rooy Date: Mon Dec 2 09:41:53 2013 +0100 Bug 11329: Check for MARC record existence in catalogue/showmarc Intranet counterpart patch. Same check as in opac/opac-showmarc. Test plan: [1] Run showmarc.pl with valid biblionumber in id parameter. [2] Remove id parameter from URL. You should get a 404 now. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Passes koha-qa.pl, works as advertised. Signed-off-by: Galen Charlton (cherry picked from commit d92dc91f778f5db3360f3070d0bb5d44a0d75024) Signed-off-by: Fridolin Somers commit 5d4a6bb712fe2d4b6179cc15eaf29cda2676b547 Author: Marcel de Rooy Date: Mon Dec 2 09:30:13 2013 +0100 Bug 11329: Check for MARC record existence in opac-showmarc Instead of just running as_formatted, check if GetMarcBiblio returned a reference. If you e.g. did not pass an id, return 404 instead of 500. Consistent with opac-export.pl Test plan: [1] Run opac-showmarc.pl with valid biblionumber in id parameter. [2] Remove id parameter from URL. You should get a 404 now. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 80bcbd798991eaa57bcc7b5ac8906b276fbed5bf) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: catalogue/showmarc.pl | 4 ++++ opac/opac-showmarc.pl | 4 ++++ 2 files changed, 8 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 15:25:20 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 14:25:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-630-g9b63f0d Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 9b63f0d018ecaa6377124175142826658cb4dd05 (commit) via 8205529683da0f934f4bdb26ccd54f05b8246d0a (commit) via fed353edbc375ae9813fe251ea103e18aacb0587 (commit) from 69216d2217519cd6d8ad97710236251abdd89ae9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9b63f0d018ecaa6377124175142826658cb4dd05 Author: Julian Maurice Date: Wed Nov 13 14:21:40 2013 +0100 Bug 11701: Fix C4::Context::Zconn When calling C4::Context::Zconn twice with different parameters, the same ZOOM::Connection object is returned twice (parameters of 2nd call are not used) This patch fixes that. This is in part because the connection cache is keyed on server name only. This patch corrects this by keying on all parameters. TEST PLAN --------- 1) apply patch 2) run koha qa test tools 3) prove -v t/Context.t The unit tests properly triggers the modified routine for testing. Additionally, in hunting for ways it could break, no nested synchronous or asynchronous Zconn's were found. And even if they were, the keying on all parameters should allow it to function properly without messing up the other connection. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 8205529683da0f934f4bdb26ccd54f05b8246d0a Author: Galen Charlton Date: Tue Mar 25 14:41:07 2014 +0000 Bug 11701: (follow-up) move unit tests to t/db_dependent The new tests will not function if there isn't a valid configuration (or mocking of preference()) so this patch moves them to t/db_dependent/Context.t. To test: [1] After applying the main patch for this bug, verify that prove -v t/db_dependent/Context.t passes. Signed-off-by: Galen Charlton commit fed353edbc375ae9813fe251ea103e18aacb0587 Author: Julian Maurice Date: Thu Feb 6 17:09:50 2014 +0100 Bug 11701: Unit tests for C4::Context::Zconn TEST PLAN --------- 1) apply patch 2) run koha qa test tool 3) prove -v t/Context.t Unit tests ran as expected. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Context.pm | 19 ++++++++----------- t/db_dependent/Context.t | 5 +++++ 2 files changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Mar 25 15:41:28 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 25 Mar 2014 14:41:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-632-ged10e52 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via ed10e5226cc8e9852dfee3f5520976695cb99412 (commit) via 6a5c2d51819c193580a2bc42856215a9b7d3b9f8 (commit) from 9b63f0d018ecaa6377124175142826658cb4dd05 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ed10e5226cc8e9852dfee3f5520976695cb99412 Author: Jonathan Druart Date: Mon Mar 17 17:21:09 2014 +0100 Bug 11939: set active currency for non-English sample data Revised Test Plan ----------------- The following SQL commands were used to test this. installer/data/mysql/en/optional/parameters.sql is part of the first patch and didn't really need testing again. installer/data/mysql/de-DE/optional/parameters.sql is not part of the patch, but since I was playing with the script, which is also attached here, it was included for good measure. use kohadata; SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/pl-PL/optional/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/es-ES/optional/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/ru-RU/optional/sample_currency.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/uk-UA/optional/sample_currency.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/it-IT/necessari/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/de-DE/optional/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql SET FOREIGN_KEY_CHECKS=0; TRUNCATE currency; source /home/mtompset/kohaclone/installer/data/mysql/en/optional/parameters.sql Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 6a5c2d51819c193580a2bc42856215a9b7d3b9f8 Author: Zeno Tajoli Date: Fri Mar 14 11:38:07 2014 +0100 Bug 11939: set active currency when using English sample data This patch offers a better default for currencies, with USA dollar as default active currency. To test the patch: 1)Install master without the patch, during web installation select 'parameters.sql' file 2)Finish install and go to Administration -Currencies & Exchange rates 3)No active currency 4)Install master with this patch, during web installation select 'parameters.sql' file 5)Finish install and go to Administration -Currencies & Exchange rates 6)Now USA dollar is the active currency NOTE: This does solve the problem of everything being NULL for active, and lacking an active value. It also corrects the description of the optional item to check related to currencies. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/en/optional/parameters.sql | 11 +++++------ installer/data/mysql/en/optional/parameters.txt | 2 +- installer/data/mysql/es-ES/optional/parameters.sql | 10 +++++----- installer/data/mysql/it-IT/necessari/parameters.sql | 8 ++++---- installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql | 10 +++++----- installer/data/mysql/pl-PL/optional/parameters.sql | 10 +++++----- installer/data/mysql/ru-RU/optional/sample_currency.sql | 12 ++++++------ installer/data/mysql/uk-UA/optional/sample_currency.sql | 12 ++++++------ 8 files changed, 37 insertions(+), 38 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 07:51:00 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 06:51:00 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.12-3-g9fb1be2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 9fb1be2b24bfb2f342292ff7e04aa38e3d80f484 (commit) via 3e9986ec181604509b3ef596932031c6980449b1 (commit) via 72a69633fc15458032153476dde47d0ed3204c1a (commit) from 405670c9cefd359d15ad4ee63bc01da1b5b1175b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9fb1be2b24bfb2f342292ff7e04aa38e3d80f484 Author: Marcel de Rooy Date: Mon Dec 2 09:41:53 2013 +0100 Bug 11329: Check for MARC record existence in catalogue/showmarc Intranet counterpart patch. Same check as in opac/opac-showmarc. Test plan: [1] Run showmarc.pl with valid biblionumber in id parameter. [2] Remove id parameter from URL. You should get a 404 now. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Passes koha-qa.pl, works as advertised. Signed-off-by: Galen Charlton (cherry picked from commit d92dc91f778f5db3360f3070d0bb5d44a0d75024) Signed-off-by: Fridolin Somers (cherry picked from commit ce7cd56c0b60031d6140a61e0f135db17deeba31) Signed-off-by: Chris Cormack commit 3e9986ec181604509b3ef596932031c6980449b1 Author: Marcel de Rooy Date: Mon Dec 2 09:30:13 2013 +0100 Bug 11329: Check for MARC record existence in opac-showmarc Instead of just running as_formatted, check if GetMarcBiblio returned a reference. If you e.g. did not pass an id, return 404 instead of 500. Consistent with opac-export.pl Test plan: [1] Run opac-showmarc.pl with valid biblionumber in id parameter. [2] Remove id parameter from URL. You should get a 404 now. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 80bcbd798991eaa57bcc7b5ac8906b276fbed5bf) Signed-off-by: Fridolin Somers (cherry picked from commit 5d4a6bb712fe2d4b6179cc15eaf29cda2676b547) Signed-off-by: Chris Cormack commit 72a69633fc15458032153476dde47d0ed3204c1a Author: Jacek Ablewicz Date: Mon Feb 24 17:37:43 2014 +0100 Bug 11352: fix unexpected data loss issues with batch patron deletion/anonymization Batch patron deletion/anonymization tool has some issues: 1) If 'dateformat' setting in I18N/L10N system preferences is set to anything other then 'iso' (eg. 'metric'), bulk deletion when using 'expiration date is before' criterion is not working properly. Date entered in this field will be efectivelly ignored (or possibly sometimes wrongly interpreted as different date, in other format) on the final patron deletion stage. This may result in deleting (or moving to trash) more borrower records then intended. 2) Bulk/batch patron deletion should skip borrowers with nonzero account balance (ones with oustanding fines or credits) 3) This tool shouldn't offer to choose as deletion criterion those patron categories which have category_type set to 'S' (= staff patron categories) This patch fixes above mentioned problems. It also adds an option to "test run" patron batch deletion, and makes this option the default choice in "warning" stage. Test plan: - prepare test database with some patron records (at least 2, the more the better) set up in such a way that they will be vulnerable to issues 1 & 2 - confirm issues 1,2 - restore test database - apply patch - ensure issues 1 & 2 are no longer present - first by using new "test run" option: for #1, record counts in "warning" stage and "final" stage should be now the same; for #2, observe that patron records with nonzero balance are now excluded from deletion - redo the tests, this time choosing "delete permanently" and "move to trash" instead of "test run" - test #3 by changing "Category type" to "S" in some test patron categories - after that, those categories should no longer be choosable as deletion criteria. Signed-off-by: Magnus Enger Tested with dateformat = dd/mm/yyyy. I tested with two expired patrons, one with fines and one without. Before the patch a lot of unexpected patrons were deleted along with the expected ones. After applying the patch only the expired patron was deleted, not the one with fines. The test run and the "real" run reported correct numbers. The patch also makes sure no patron categories with category_type = S are suggested for batch deletion. Note: The ergonomics of the "Batch delete/anonymize" tool is hardly optimal, but this patch fixes a real, data-loosing bug, so let's deal with the ergonomics later. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 69216d2217519cd6d8ad97710236251abdd89ae9) Signed-off-by: Fridolin Somers (cherry picked from commit 0853bfd32c840aedf13a5aa3327905c8c6b2067e) Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: catalogue/showmarc.pl | 4 +++ .../prog/en/modules/tools/cleanborrowers.tt | 27 ++++++++++------ opac/opac-showmarc.pl | 4 +++ tools/cleanborrowers.pl | 33 +++++++++++--------- 4 files changed, 44 insertions(+), 24 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 11:19:22 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 10:19:22 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.04-30-g22bd433 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 22bd433615b1d1cb52cb73f8c732cd62fc1ceed4 (commit) via 595253dceed1ab6f8b994fbfdc008a3eab636a45 (commit) via 91b2feb3449b99eb83418439815e7bc23b90bacd (commit) via 9e709735de46fb20a333945dd4bade05876f5197 (commit) from ce7cd56c0b60031d6140a61e0f135db17deeba31 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 22bd433615b1d1cb52cb73f8c732cd62fc1ceed4 Author: Fridolin Somers Date: Wed Mar 26 11:37:15 2014 +0100 Increment version for 3.14.5 release Signed-off-by: Fridolin Somers commit 595253dceed1ab6f8b994fbfdc008a3eab636a45 Merge: 91b2feb 9e70973 Author: Fridolin Somers Date: Wed Mar 26 11:32:43 2014 +0100 Merge remote-tracking branch 'translator/3.14.05-translate' into 3.14.x Signed-off-by: Fridolin Somers commit 91b2feb3449b99eb83418439815e7bc23b90bacd Author: Fridolin Somers Date: Wed Mar 26 11:31:35 2014 +0100 Update release notes for 3.14.5 release Signed-off-by: Fridolin Somers commit 9e709735de46fb20a333945dd4bade05876f5197 Author: Bernardo Gonzalez Kriegel Date: Tue Mar 25 09:35:56 2014 -0300 Tranlation updates for 3.14.05 release Two new languages: Belarusian and Faroese ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 6 + kohaversion.pl | 2 +- ...e_notes_3_14_4.txt => release_notes_3_14_5.txt} | 182 +- .../po/am-Ethi-i-opac-t-prog-v-3006000.po | 132 +- .../po/am-Ethi-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/am-Ethi-opac-bootstrap.po | 6 +- .../po/ar-Arab-i-opac-t-prog-v-3006000.po | 144 +- .../po/ar-Arab-i-staff-t-prog-v-3006000.po | 884 +- misc/translator/po/ar-Arab-opac-bootstrap.po | 7 +- .../translator/po/az-AZ-i-opac-t-prog-v-3006000.po | 132 +- .../po/az-AZ-i-staff-t-prog-v-3006000.po | 867 +- misc/translator/po/az-AZ-opac-bootstrap.po | 6 +- ...3006000.po => be-BY-i-opac-t-prog-v-3006000.po} | 368 +- ...006000.po => be-BY-i-staff-t-prog-v-3006000.po} | 1091 +- ...U-opac-bootstrap.po => be-BY-opac-bootstrap.po} | 43 +- .../po/{ru-RU-opac-ccsr.po => be-BY-opac-ccsr.po} | 66 +- .../translator/po/{ru-RU-pref.po => be-BY-pref.po} | 10 +- misc/translator/po/ben-i-opac-t-prog-v-3006000.po | 134 +- misc/translator/po/ben-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/ben-opac-bootstrap.po | 6 +- .../po/bg-Cyrl-i-opac-t-prog-v-3006000.po | 132 +- .../po/bg-Cyrl-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/bg-Cyrl-opac-bootstrap.po | 6 +- .../translator/po/ca-ES-i-opac-t-prog-v-3006000.po | 1009 +- .../po/ca-ES-i-staff-t-prog-v-3006000.po | 1469 +-- misc/translator/po/ca-ES-opac-bootstrap.po | 1746 ++-- misc/translator/po/ca-ES-opac-ccsr.po | 75 +- .../translator/po/cs-CZ-i-opac-t-prog-v-3006000.po | 136 +- .../po/cs-CZ-i-staff-t-prog-v-3006000.po | 929 +- misc/translator/po/cs-CZ-opac-bootstrap.po | 12 +- misc/translator/po/cs-CZ-pref.po | 26 +- .../translator/po/da-DK-i-opac-t-prog-v-3006000.po | 134 +- .../po/da-DK-i-staff-t-prog-v-3006000.po | 896 +- misc/translator/po/da-DK-opac-bootstrap.po | 7 +- .../translator/po/de-CH-i-opac-t-prog-v-3006000.po | 134 +- .../po/de-CH-i-staff-t-prog-v-3006000.po | 895 +- misc/translator/po/de-CH-opac-bootstrap.po | 7 +- .../translator/po/de-DE-i-opac-t-prog-v-3006000.po | 144 +- .../po/de-DE-i-staff-t-prog-v-3006000.po | 910 +- misc/translator/po/de-DE-opac-bootstrap.po | 12 +- .../translator/po/el-GR-i-opac-t-prog-v-3006000.po | 136 +- .../po/el-GR-i-staff-t-prog-v-3006000.po | 863 +- misc/translator/po/el-GR-opac-bootstrap.po | 6 +- .../translator/po/en-GB-i-opac-t-prog-v-3006000.po | 132 +- .../po/en-GB-i-staff-t-prog-v-3006000.po | 863 +- misc/translator/po/en-GB-opac-bootstrap.po | 6 +- .../translator/po/en-NZ-i-opac-t-prog-v-3006000.po | 134 +- .../po/en-NZ-i-staff-t-prog-v-3006000.po | 888 +- misc/translator/po/en-NZ-opac-bootstrap.po | 7 +- .../translator/po/es-ES-i-opac-t-prog-v-3006000.po | 138 +- .../po/es-ES-i-staff-t-prog-v-3006000.po |10971 ++++++++++---------- misc/translator/po/es-ES-opac-bootstrap.po | 11 +- misc/translator/po/eu-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/eu-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/eu-opac-bootstrap.po | 6 +- .../po/fa-Arab-i-opac-t-prog-v-3006000.po | 132 +- .../po/fa-Arab-i-staff-t-prog-v-3006000.po | 855 +- misc/translator/po/fa-Arab-opac-bootstrap.po | 6 +- .../translator/po/fi-FI-i-opac-t-prog-v-3006000.po | 134 +- .../po/fi-FI-i-staff-t-prog-v-3006000.po | 843 +- misc/translator/po/fi-FI-opac-bootstrap.po | 7 +- ...3006000.po => fo-FO-i-opac-t-prog-v-3006000.po} | 802 +- ...006000.po => fo-FO-i-staff-t-prog-v-3006000.po} | 1811 +++- ...I-opac-bootstrap.po => fo-FO-opac-bootstrap.po} | 146 +- .../po/{sw-SW-opac-ccsr.po => fo-FO-opac-ccsr.po} | 23 +- .../translator/po/{sw-SW-pref.po => fo-FO-pref.po} | 11 +- .../translator/po/fr-CA-i-opac-t-prog-v-3006000.po | 134 +- .../po/fr-CA-i-staff-t-prog-v-3006000.po | 897 +- misc/translator/po/fr-CA-opac-bootstrap.po | 7 +- .../translator/po/fr-FR-i-opac-t-prog-v-3006000.po | 161 +- .../po/fr-FR-i-staff-t-prog-v-3006000.po | 962 +- misc/translator/po/fr-FR-opac-bootstrap.po | 22 +- misc/translator/po/fr-FR-opac-ccsr.po | 8 +- misc/translator/po/gl-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/gl-i-staff-t-prog-v-3006000.po | 855 +- misc/translator/po/gl-opac-bootstrap.po | 6 +- .../po/he-Hebr-i-opac-t-prog-v-3006000.po | 132 +- .../po/he-Hebr-i-staff-t-prog-v-3006000.po | 845 +- misc/translator/po/he-Hebr-opac-bootstrap.po | 6 +- misc/translator/po/hi-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/hi-i-staff-t-prog-v-3006000.po | 866 +- misc/translator/po/hi-opac-bootstrap.po | 6 +- .../translator/po/hr-HR-i-opac-t-prog-v-3006000.po | 602 +- .../po/hr-HR-i-staff-t-prog-v-3006000.po | 1185 ++- misc/translator/po/hr-HR-opac-bootstrap.po | 200 +- misc/translator/po/hr-HR-opac-ccsr.po | 12 +- .../translator/po/hu-HU-i-opac-t-prog-v-3006000.po | 132 +- .../po/hu-HU-i-staff-t-prog-v-3006000.po | 851 +- misc/translator/po/hu-HU-opac-bootstrap.po | 6 +- .../po/hy-Armn-i-opac-t-prog-v-3006000.po | 140 +- .../po/hy-Armn-i-staff-t-prog-v-3006000.po | 948 +- misc/translator/po/hy-Armn-opac-bootstrap.po | 20 +- .../translator/po/id-ID-i-opac-t-prog-v-3006000.po | 134 +- .../po/id-ID-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/id-ID-opac-bootstrap.po | 6 +- .../translator/po/is-IS-i-opac-t-prog-v-3006000.po | 132 +- .../po/is-IS-i-staff-t-prog-v-3006000.po | 863 +- misc/translator/po/is-IS-opac-bootstrap.po | 6 +- .../translator/po/it-IT-i-opac-t-prog-v-3006000.po | 3912 ++++--- .../po/it-IT-i-staff-t-prog-v-3006000.po | 892 +- misc/translator/po/it-IT-opac-bootstrap.po | 16 +- .../po/ja-Jpan-JP-i-opac-t-prog-v-3006000.po | 132 +- .../po/ja-Jpan-JP-i-staff-t-prog-v-3006000.po | 851 +- misc/translator/po/ja-Jpan-JP-opac-bootstrap.po | 6 +- .../po/kn-Knda-i-opac-t-prog-v-3006000.po | 132 +- .../po/kn-Knda-i-staff-t-prog-v-3006000.po | 854 +- misc/translator/po/kn-Knda-opac-bootstrap.po | 6 +- .../po/ko-Kore-KP-i-opac-t-prog-v-3006000.po | 132 +- .../po/ko-Kore-KP-i-staff-t-prog-v-3006000.po | 851 +- misc/translator/po/ko-Kore-KP-opac-bootstrap.po | 6 +- misc/translator/po/ku-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/ku-i-staff-t-prog-v-3006000.po | 871 +- misc/translator/po/ku-opac-bootstrap.po | 5 +- .../po/lo-Laoo-i-opac-t-prog-v-3006000.po | 132 +- .../po/lo-Laoo-i-staff-t-prog-v-3006000.po | 838 +- misc/translator/po/lo-Laoo-opac-bootstrap.po | 6 +- .../translator/po/mi-NZ-i-opac-t-prog-v-3006000.po | 132 +- .../po/mi-NZ-i-staff-t-prog-v-3006000.po | 857 +- misc/translator/po/mi-NZ-opac-bootstrap.po | 6 +- misc/translator/po/mon-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/mon-i-staff-t-prog-v-3006000.po | 864 +- misc/translator/po/mon-opac-bootstrap.po | 6 +- misc/translator/po/mr-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/mr-i-staff-t-prog-v-3006000.po | 835 +- misc/translator/po/mr-opac-bootstrap.po | 6 +- .../translator/po/ms-MY-i-opac-t-prog-v-3006000.po | 132 +- .../po/ms-MY-i-staff-t-prog-v-3006000.po | 844 +- misc/translator/po/ms-MY-opac-bootstrap.po | 6 +- .../translator/po/nb-NO-i-opac-t-prog-v-3006000.po | 140 +- .../po/nb-NO-i-staff-t-prog-v-3006000.po | 858 +- misc/translator/po/nb-NO-opac-bootstrap.po | 12 +- .../translator/po/ne-NE-i-opac-t-prog-v-3006000.po | 132 +- .../po/ne-NE-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/ne-NE-opac-bootstrap.po | 6 +- .../translator/po/nl-BE-i-opac-t-prog-v-3006000.po | 154 +- .../po/nl-BE-i-staff-t-prog-v-3006000.po | 849 +- misc/translator/po/nl-BE-opac-bootstrap.po | 912 +- .../translator/po/nl-NL-i-opac-t-prog-v-3006000.po | 132 +- .../po/nl-NL-i-staff-t-prog-v-3006000.po | 835 +- misc/translator/po/nl-NL-opac-bootstrap.po | 6 +- .../translator/po/nn-NO-i-opac-t-prog-v-3006000.po | 132 +- .../po/nn-NO-i-staff-t-prog-v-3006000.po | 860 +- misc/translator/po/nn-NO-opac-bootstrap.po | 6 +- misc/translator/po/pbr-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/pbr-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/pbr-opac-bootstrap.po | 6 +- .../translator/po/pl-PL-i-opac-t-prog-v-3006000.po | 134 +- .../po/pl-PL-i-staff-t-prog-v-3006000.po | 884 +- misc/translator/po/pl-PL-opac-bootstrap.po | 6 +- misc/translator/po/pl-PL-pref.po | 169 +- misc/translator/po/prs-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/prs-i-staff-t-prog-v-3006000.po | 845 +- misc/translator/po/prs-opac-bootstrap.po | 6 +- .../translator/po/pt-BR-i-opac-t-prog-v-3006000.po | 134 +- .../po/pt-BR-i-staff-t-prog-v-3006000.po | 883 +- misc/translator/po/pt-BR-opac-bootstrap.po | 7 +- .../translator/po/pt-PT-i-opac-t-prog-v-3006000.po | 142 +- .../po/pt-PT-i-staff-t-prog-v-3006000.po | 1072 +- misc/translator/po/pt-PT-opac-bootstrap.po | 21 +- .../translator/po/ro-RO-i-opac-t-prog-v-3006000.po | 132 +- .../po/ro-RO-i-staff-t-prog-v-3006000.po | 846 +- misc/translator/po/ro-RO-opac-bootstrap.po | 6 +- .../translator/po/ru-RU-i-opac-t-prog-v-3006000.po | 174 +- .../po/ru-RU-i-staff-t-prog-v-3006000.po | 893 +- misc/translator/po/ru-RU-opac-bootstrap.po | 25 +- .../translator/po/sd-PK-i-opac-t-prog-v-3006000.po | 132 +- .../po/sd-PK-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/sd-PK-opac-bootstrap.po | 6 +- .../translator/po/sk-SK-i-opac-t-prog-v-3006000.po | 140 +- .../po/sk-SK-i-staff-t-prog-v-3006000.po | 993 +- misc/translator/po/sk-SK-opac-bootstrap.po | 23 +- .../translator/po/sl-SI-i-opac-t-prog-v-3006000.po | 132 +- .../po/sl-SI-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/sl-SI-opac-bootstrap.po | 4 +- .../translator/po/sq-AL-i-opac-t-prog-v-3006000.po | 2879 ++--- .../po/sq-AL-i-staff-t-prog-v-3006000.po | 834 +- misc/translator/po/sq-AL-opac-bootstrap.po | 16 +- misc/translator/po/sq-AL-pref.po | 100 +- .../po/sr-Cyrl-i-opac-t-prog-v-3006000.po | 132 +- .../po/sr-Cyrl-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/sr-Cyrl-opac-bootstrap.po | 6 +- .../translator/po/sv-SE-i-opac-t-prog-v-3006000.po | 134 +- .../po/sv-SE-i-staff-t-prog-v-3006000.po | 895 +- misc/translator/po/sv-SE-opac-bootstrap.po | 7 +- .../translator/po/sw-SW-i-opac-t-prog-v-3006000.po | 1257 ++- .../po/sw-SW-i-staff-t-prog-v-3006000.po | 8964 ++++++++++++---- misc/translator/po/sw-SW-opac-bootstrap.po | 860 +- misc/translator/po/sw-SW-pref.po | 1 + .../translator/po/ta-LK-i-opac-t-prog-v-3006000.po | 132 +- .../po/ta-LK-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/ta-LK-opac-bootstrap.po | 4 +- misc/translator/po/ta-i-opac-t-prog-v-3006000.po | 132 +- misc/translator/po/ta-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/ta-opac-bootstrap.po | 4 +- misc/translator/po/tet-i-opac-t-prog-v-3006000.po | 2035 ++-- misc/translator/po/tet-i-staff-t-prog-v-3006000.po | 1244 +-- misc/translator/po/tet-opac-bootstrap.po | 1497 ++- misc/translator/po/tet-opac-ccsr.po | 33 +- .../po/th-THA-i-opac-t-prog-v-3006000.po | 132 +- .../po/th-THA-i-staff-t-prog-v-3006000.po | 832 +- misc/translator/po/th-THA-opac-bootstrap.po | 6 +- .../translator/po/tl-PH-i-opac-t-prog-v-3006000.po | 132 +- .../po/tl-PH-i-staff-t-prog-v-3006000.po | 832 +- misc/translator/po/tl-PH-opac-bootstrap.po | 4 +- .../translator/po/tr-TR-i-opac-t-prog-v-3006000.po | 144 +- .../po/tr-TR-i-staff-t-prog-v-3006000.po | 939 +- misc/translator/po/tr-TR-opac-bootstrap.po | 24 +- .../translator/po/uk-UA-i-opac-t-prog-v-3006000.po | 146 +- .../po/uk-UA-i-staff-t-prog-v-3006000.po | 881 +- misc/translator/po/uk-UA-opac-bootstrap.po | 21 +- .../po/ur-Arab-i-opac-t-prog-v-3006000.po | 132 +- .../po/ur-Arab-i-staff-t-prog-v-3006000.po | 831 +- misc/translator/po/ur-Arab-opac-bootstrap.po | 6 +- .../translator/po/vi-VN-i-opac-t-prog-v-3006000.po | 132 +- .../po/vi-VN-i-staff-t-prog-v-3006000.po | 835 +- misc/translator/po/vi-VN-opac-bootstrap.po | 4 +- .../po/zh-Hans-CN-i-opac-t-prog-v-3006000.po | 134 +- .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po | 893 +- misc/translator/po/zh-Hans-CN-opac-bootstrap.po | 7 +- .../po/zh-Hans-TW-i-opac-t-prog-v-3006000.po | 146 +- .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po | 898 +- misc/translator/po/zh-Hans-TW-opac-bootstrap.po | 29 +- misc/translator/po/zh-Hans-TW-pref.po | 12 +- 223 files changed, 60148 insertions(+), 48217 deletions(-) copy misc/release_notes/{release_notes_3_14_4.txt => release_notes_3_14_5.txt} (57%) copy misc/translator/po/{ru-RU-i-opac-t-prog-v-3006000.po => be-BY-i-opac-t-prog-v-3006000.po} (98%) copy misc/translator/po/{ru-RU-i-staff-t-prog-v-3006000.po => be-BY-i-staff-t-prog-v-3006000.po} (99%) copy misc/translator/po/{ru-RU-opac-bootstrap.po => be-BY-opac-bootstrap.po} (99%) copy misc/translator/po/{ru-RU-opac-ccsr.po => be-BY-opac-ccsr.po} (92%) copy misc/translator/po/{ru-RU-pref.po => be-BY-pref.po} (99%) copy misc/translator/po/{ta-LK-i-opac-t-prog-v-3006000.po => fo-FO-i-opac-t-prog-v-3006000.po} (96%) copy misc/translator/po/{ne-NE-i-staff-t-prog-v-3006000.po => fo-FO-i-staff-t-prog-v-3006000.po} (96%) copy misc/translator/po/{sl-SI-opac-bootstrap.po => fo-FO-opac-bootstrap.po} (98%) copy misc/translator/po/{sw-SW-opac-ccsr.po => fo-FO-opac-ccsr.po} (96%) copy misc/translator/po/{sw-SW-pref.po => fo-FO-pref.po} (99%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 12:03:22 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 11:03:22 +0000 Subject: [koha-commits] main Koha release repository annotated tag v3.14.05 created. v3.14.05 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The annotated tag, v3.14.05 has been created at f86172483d5b8ff94a4728dfa562dd4aee3bcc5c (tag) tagging 22bd433615b1d1cb52cb73f8c732cd62fc1ceed4 (commit) replaces v3.14.04 tagged by Fridolin Somers on Wed Mar 26 11:39:28 2014 +0100 - Log ----------------------------------------------------------------- Koha release 3.14.05 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTMq5gAAoJECvJNkKAZAZu3GYH/1bnnVtMHtMpFMTuKTaxtRoA HzWFYErSWTmSSQ6DG72dfbiGINSpR36p0oNvNVmesYJU36hZGLJ0uZd0h46Kc9s5 9g+t4V7bAHHTYvAMRaCpCypc3AeTZ2vKCaNJu56EX4wv5klGCfel2qtaO4az3Z1H 4RXkMH5YirY3Q6ofd3idscTVDEyOGYc2Ch3Hp8vsvrHiTDadKOsXqf6j5ztgNVZ5 OZg7EpjHIs36v7vKDkubsRX0kzZSkfWJQ+Diwr+Wsj+Syq0ZDYuHm6T1YzQJZU2Z MhNwhUk+RYvnttw881GMDNw56ymOqrOS80H9jbnprCIB8bAEY0+eSHJwygLS8uY= =eKO8 -----END PGP SIGNATURE----- Bernardo Gonzalez Kriegel (1): Tranlation updates for 3.14.05 release Chris Cormack (1): Bug 7143: Updating about page and history David Cook (5): Bug 11502: make library filter in "Holds To Pull" more precise Bug 11473 - Fix log viewer template conditions Bug 11473 - Remove boilerplate in log viewer template Bug 11473 - Improve wording in log viewer template Bug 11473 - add 'biblio' and 'item' to cataloguing logging info Francesca Moore (1): Bug 11522: improve formating of self-registration form Fridolin Somers (3): Update release notes for 3.14.5 release Merge remote-tracking branch 'translator/3.14.05-translate' into 3.14.x Increment version for 3.14.5 release Galen Charlton (3): Bug 7143: add another name to the about page Bug 9788: (follow-up) update the bootstrap theme Bug 11473: (follow-up) ensure link to item is construct correctly Jacek Ablewicz (1): Bug 11352: fix unexpected data loss issues with batch patron deletion/anonymization Jonathan Druart (2): Bug 9788: QA followup Bug 11018: allow adding order from a reverted MARC batch Marcel de Rooy (6): Bug 9788: Improvements when calling GetReservesFromItemnumber Bug 9788: (follow-up) removing the alldates parameter from GetReservesFromItemnumber Bug 9788: (follow-up) for expirationdate in Letter.pm Bug 9788: (follow-up) Unit tests for changed routine GetReservesFromItemnumber Bug 11329: Check for MARC record existence in opac-showmarc Bug 11329: Check for MARC record existence in catalogue/showmarc Owen Leonard (5): Bug 11503: fix several typos Bug 11503: [Follow-up] fix another typo Bug 11381: improve styling of IDreamBooks content in bootstrap theme Bug 11505: fix untranslatable table headers in Label batch manager Bug 11476: remove extra empty option from title pull-down in OPAC self-registration Sophie Meynieux (1): Bug 9210: wrap long lines in printed hold notices Tomas Cohen Arazi (1): Bug 11509: (trivial rmaint followup) wrong parameter count ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 16:16:32 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 15:16:32 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.12-4-g297399b Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 297399b001cabe61176e0a5c718d012a9e9acd43 (commit) from 9fb1be2b24bfb2f342292ff7e04aa38e3d80f484 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 297399b001cabe61176e0a5c718d012a9e9acd43 Author: Chris Cormack Date: Thu Mar 27 04:39:22 2014 +1300 Fixing typo in updatedatabase ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 17:32:35 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 16:32:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-634-gcb62a47 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via cb62a47bbf6fde22ac3bc4e33481c403b8c2c193 (commit) via 17cf2657ef7fe0e293cdf4956b75f8e39c0aeeed (commit) from ed10e5226cc8e9852dfee3f5520976695cb99412 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit cb62a47bbf6fde22ac3bc4e33481c403b8c2c193 Author: Kyle M Hall Date: Thu Feb 27 08:40:55 2014 -0500 Bug 11694: [QA Followup] strip out time portion when setting suspension date for individual hold This patch fixes an issue originally reported by bug 11702. RM note: the patch is clear enough and doesn't break existing tests, but on the other hand, I have been completely unable to reproduce the original issue. To test: [1] Verify that prove -v t/db_dependent/Holds.t passes Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 17cf2657ef7fe0e293cdf4956b75f8e39c0aeeed Author: Owen Leonard Date: Wed Feb 5 16:11:29 2014 -0500 Bug 11694: Improve handling of individual hold suspension in Bootstrap OPAC This patch changes the way the controls to suspend and resume holds are displayed on the OPAC for a logged-in user when using the Bootstrap theme. Instead of showing all the suspend options in the table cell a link will trigger a modal with the controls. This makes the table more compact and readable. The patch adds a span and class to the dateformat include so that the dateformat hint can be hidden if JavaScript is enabled (and thus the datepicker will use the correct format automatically). A new class has been added to the CSS, ".js-show" to be used for elements which should be hidden if JavaScript is disabled and made visible by JavaScript if it is enabled. To test you must have RequestOnOpac, SuspendHoldsOpac, and the bootstrap theme enabled. Apply the patch and test with AutoResumeSuspendedHolds enabled: 1. Log in to the OPAC and place a hold. 2. View the list of your holds in the OPAC. 3. Click the "Suspend" link for your new hold. A modal window should appear allowing you to specify a suspend-until date. 4. Specify a suspend-until date. Test the "clear" link and confirm that it clears the date. 5. Specify a suspend-until date and submit. 6. Confirm that the hold has been suspended with the specified resumption date. 7. Click the "Resume" link on the suspended hold to resume. 8. Click the "Suspend" link again and submit without specifying a date. 9. Confirm that the hold has been suspended indefinitely. Follow the same steps above with JavaScript disabled. The "suspend until" options will appear inside the table as before and everything should work correctly. Test with AutoResumeSuspendedHolds disabled. No modal dialog should appear when the "Suspend" link is clicked. The hold should simply be suspended indefinitely. Test again with JavaScript disabled. There should be no change in functionality. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. Happy about the fallback for users without Javascript. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 8 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2741 +------------------- .../opac-tmpl/bootstrap/css/right-to-left.css | 2 +- .../bootstrap/en/includes/date-format.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 78 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 36 + 6 files changed, 99 insertions(+), 2768 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 19:56:55 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 18:56:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-635-g330e903 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 330e903e798c22d041a0378ce4a806c3cdebd2bd (commit) from cb62a47bbf6fde22ac3bc4e33481c403b8c2c193 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 330e903e798c22d041a0378ce4a806c3cdebd2bd Author: Owen Leonard Date: Fri Feb 28 14:48:36 2014 -0500 Bug 11877 - Eliminate use of deprecated jQuery .live() method As of jQuery 1.9 the .live() method has been removed. A few templates contain JavaScript which uses it. It can be easily replaced with .on(). This patch makes the correction. To test, apply the patch and test the following pages: - In the staff client, Administration -> OAI sets configuration: Define mappings for an existing set. You should be able to add rows by clicking the "OR" button. You should be able to delete or clear any line by clicking the "Delete" link. - In the staff client, view the details for any patron and click the "Change password" button: In the change password form click the link to fill the password fields with a random password. This link should work correctly. - If necessary enable OpacRenewalAllowed in system preferences. Log in to the OPAC as a patron who has checkouts. On the patron summary page (opac-user.pl) look for the "renew selected" and "renew all" links at the top of the table of checkouts. Both these links should work correctly. Test in prog and bootstrap themes. Followed test plan. Same behaviour as without patch, i.e. patch OK Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. No Javasript errors found. Note: The buttons on the form show up, even if no item shows the checkbox. In my case the problem was that I had 0 renewals allowed in the circulation rules. Maybe we could hide them, if no item can be renewed. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt | 9 +++++---- .../intranet-tmpl/prog/en/modules/members/member-password.tt | 7 ++++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 ++++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 4 files changed, 15 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 19:58:49 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 18:58:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-636-ge634a5a Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via e634a5ad82e9fa0aef96ae5a23bb5b389d1704e7 (commit) from 330e903e798c22d041a0378ce4a806c3cdebd2bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e634a5ad82e9fa0aef96ae5a23bb5b389d1704e7 Author: Owen Leonard Date: Thu Feb 20 16:08:02 2014 -0500 Bug 11806 - Use validation plugin when creating new OAI set The form for adding a new OAI indicates that two fields are required but does nothing to enforce this rule. This can be handled client-side with HTML5 validation attributes and Koha's built-in validation plugin. This patch implements this. To test, apply the patch and go to Administration -> OAI sets configuration -> New set. Try submitting the form without entering a setSpec and/or setName. Doing so should trigger a validation warning. Submission of the form with valid data should work correctly. Editing an existing set should also work correctly. Followed test plan. Patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 20:02:46 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 19:02:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-637-g06026a7 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 06026a7e297c8537c7a4a7cb9c7720b482f26eba (commit) from e634a5ad82e9fa0aef96ae5a23bb5b389d1704e7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 06026a7e297c8537c7a4a7cb9c7720b482f26eba Author: Owen Leonard Date: Tue Mar 4 08:19:57 2014 -0500 Bug 11878 - Eliminate use of deprecated jQuery .toggle() method usage jQuery's .toggle() method can no longer be used to trigger a pair of specified functions. .toggle() can only be used to change the visibility of an element. This patch fixes a few places in Koha where the deprecated functionality was used. To test, apply the patch and clear your browser cache. - View the system preferences page in the staff client. Clicking a heading ("Appearance" under OPAC preferences, for instance) should collapse that section. Clicking again should expand it. - View the MARC detail page for a record in the OPAC. Clicking the "view plain" link should display the plain MARC view. Clicking the "view labeled" view should return to the original view. Test in both prog and bootstrap themes. Signed-off-by: wajasu Followed test plan. Works fine. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. No Javascript errors found. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/js/pages/preferences.js | 14 ++++----- .../bootstrap/en/modules/opac-MARCdetail.tt | 33 +++++++++++--------- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 33 +++++++++++--------- 3 files changed, 43 insertions(+), 37 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 20:08:49 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 19:08:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-638-gac82cbb Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via ac82cbb3dc79b00f2a73bfce1b8a57c2f8e9e202 (commit) from 06026a7e297c8537c7a4a7cb9c7720b482f26eba (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ac82cbb3dc79b00f2a73bfce1b8a57c2f8e9e202 Author: Owen Leonard Date: Mon Feb 10 14:51:27 2014 -0500 Bug 11738: Use new DataTables include in batch patron modification template Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to the batch patron modification template. This patch modifies the template so that date columns are sorted using the "title-string" filter, based on the unformatted date. The DataTables configuration has also been modified to account for varying structure based on the page state. Other minor edits: Corrected capitalization. To test, go Tools -> Batch patron modification and submit a list of patrons for modification. The resulting page should be correctly sorted. Date columns should sort correctly for all dateformat system pref settings. Test with extended patron attributes enabled. Test adding and removing varying numbers of attributes to patrons in your batch. Submit a change to multiple borrowers. The results page should also be sorted correctly. Revision: Corrected error caused by the variable number of columns in the table corresponding to varying numbers of patron attributes. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes all tests and QA script, works as described. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/modborrowers.tt | 32 ++++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Mar 26 20:41:44 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 26 Mar 2014 19:41:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-639-g1b0dd7e Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 1b0dd7eedebc91fa7178d0d4e0768ebc64b41fd2 (commit) from ac82cbb3dc79b00f2a73bfce1b8a57c2f8e9e202 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1b0dd7eedebc91fa7178d0d4e0768ebc64b41fd2 Author: Owen Leonard Date: Mon Feb 3 13:59:34 2014 -0500 Bug 11671 - Restructure patron lists add form for improved usability Non-standard interface features have the potential to cause confusion. This patch brings various aspects of the patron lists add page into conformity with other staff client pages. - Add "select all/clear all" links for the checkboxes - Add a "remove selected" to the top of the table (see also Lists) - Split functionality of add from from delete form - Hide "Add patrons" button until at least one patron has been selected - Remove non-standard trash can icon from table's checkbox column - Exclude checkbox column from table sorting - Add confirmation to deletion actions - Improve breadcrumb specificity - Add title-string sorting to date column to accommodate sorting for all date format types To test, apply the patch and create a patron list. 1. Search for and select patrons for the list. Selecting a patron should trigger the display of an "Add patrons" button. 2. Click "Add patrons" and confirm that the add process completes correctly. 3. Search for and select a patron and also check the box next to an existing patron. Click "Add patrons" and confirm that no patron is removed. 4. Check that the "select all" and "clear all" links work correctly. 5. Select patrons on the list and click the "Remove selected" link. You should be prompted to confirm your choice. 4.a. Click cancel and confirm that the deletion process aborts. 4.b. Click OK and confirm that the deletion process completes. 6. Repeat step 4 with the "Remove selected patrons" at the bottom of the page. 7. Confirm that the page title and breadcrumbs correctly show the list name. 8. Switch between us and metric dateformat settings and confirm that table sorting by date is correct in both cases. Followed test plan. Patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Works as described, no regressions found. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/staff-global.css | 2 +- .../prog/en/modules/patron_lists/list.tt | 72 ++++++++++++++++---- 2 files changed, 61 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Mar 27 15:22:02 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 27 Mar 2014 14:22:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-641-g05a6beb Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 05a6beba9f023f87d3355b6e72f35b220cd691b0 (commit) via b21d16ca75bb40371773d3008fcb06c67200ab36 (commit) from 1b0dd7eedebc91fa7178d0d4e0768ebc64b41fd2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 05a6beba9f023f87d3355b6e72f35b220cd691b0 Author: Galen Charlton Date: Wed Mar 26 20:38:32 2014 +0000 Bug 11906: ensure that Koha::Database uses UTF8 mode when connecting to databases This patch fixes an issue whereby the DBIx::Class schema objects were not connecting to the underlying database in UTF8 mode. This most visibility manifested as patron list pages not displaying diacritics correctly. To test: [1] Create a patron list, and make sure that it contains at least one patron whose name or patron category description contains a non-ASCII character. [2] View the list contents; the diacritics should appear mangled. [3] Apply the patch. [4] View the patron list again. This time, the diacritics should be displayed correctly. Note that Apache will also log "list.pl: Wide character in print ...", but this is the lesser of two evils. [5] Verify that prove -v t/db_dependent/Koha_Database.t passes. [6] (extra credit) Verify that t/db_dependent/Koha_Database.t passes when connect to a PostgreSQL database. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit b21d16ca75bb40371773d3008fcb06c67200ab36 Author: Galen Charlton Date: Wed Mar 26 20:26:26 2014 +0000 Bug 11906: regression test for using DBIC to store & fetch UTF8 strings This patch adds a regression test for verifying that a DBIx::Class schema object initialized by Koha database sets up the database connection to correct store and retrieve UTF8 values as Perl utf8 strings. To test: [1] Apply this patch. [2] Run prove -v t/db_dependent/Koha_Database.t [3] The test should fail. [4] Apply the main patch for this bug, then do step 2 again. [5] The test should pass. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: Koha/Database.pm | 6 +++++- t/db_dependent/Koha_Database.t | 21 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 31 15:59:11 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 31 Mar 2014 13:59:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-642-g94d8055 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 94d80555489a2f07163bdb2e1b1a8104de9c410c (commit) from 05a6beba9f023f87d3355b6e72f35b220cd691b0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 94d80555489a2f07163bdb2e1b1a8104de9c410c Author: Owen Leonard Date: Fri Mar 21 15:50:18 2014 -0400 Bug 11946 - add table sorters to label batches When viewing batches of titles in the label creator module the table is not sortable. This patch adds table sorting. The patch also makes some corrections of invalid markup and moves informational/error messages to the top of the page rather than in a sidebar. This change lets the table and sorting controls expand into a wider space. To test, go to Tools -> Labels -> Manage label batches. View an existing batch or create a new batch and populate it with items. Table sorting controls should work correctly. Signed-off-by: Nicole C. Engard Solves 1/2 of this bug which is to add the sorters to labels, the original request was to add this to patron cards as well. Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Template could be improved forther by showing the itemtype description instead of the code in the table. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/labels/label-edit-batch.tt | 113 +++++++++++--------- 1 file changed, 61 insertions(+), 52 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Mar 31 16:03:53 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 31 Mar 2014 14:03:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-643-g7378d48 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, master has been updated via 7378d488414d1859c75f0d3b40e5ce99cde67cb7 (commit) from 94d80555489a2f07163bdb2e1b1a8104de9c410c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7378d488414d1859c75f0d3b40e5ce99cde67cb7 Author: Galen Charlton Date: Wed Mar 26 17:58:46 2014 +0000 Bug 12000: ensure that hold resumption dates can be set only to future dates This patch makes the datepickers for the hold resumption date (AKA the hold suspend until date) field only permit dates in the future to be selected in the staff interface checkout page and hold list pages. This makes these pages consistent with the OPAC and the patron details page in the staff interface. To test: [1] Ensure that AutoResumeSuspendedHolds and SuspendHoldsIntranet are enabled. [2] Go to the checkout page for a patron that has at least one hold request. [3] Verify that the datepicker for the hold suspend until date field only permits choosing a date in the future. [4] Go to the page listing hold requests for a title. [5] Verify that the datepicker for the hold suspend until date fields only permit choosing a date in the future. Signed-off-by: Galen Charlton Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository