From gitmaster at git.koha-community.org Sat Nov 1 14:44:07 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 01 Nov 2014 13:44:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-892-gc5a6a4f 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 c5a6a4f18a2c4eb2cb47bc302e539d3b05fcf9b1 (commit) via a4a2159aad6d7276fc7efb9abb24830f7f473102 (commit) from d4a7fa85807301ceb5268817d035235bdcf313a3 (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 c5a6a4f18a2c4eb2cb47bc302e539d3b05fcf9b1 Author: Jonathan Druart Date: Tue Sep 30 11:36:39 2014 +0200 Bug 13011: 0000-00-00 should not be considered as a valid date When parsing the letter content, the 0000-00-00 should not be replaced, it's not a valid date. Test plan: prove t/db_dependent/Suggestions.t should not return the following error: 0000-00-00 seems to be a date but an error occurs on generating it (The 'month' parameter ("0") to DateTime::new did not pass the 'an integer between 1 and 12' callback Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Adds another check for 0000-00-00. Passes tests and QA script. Signed-off-by: Tomas Cohen Arazi commit a4a2159aad6d7276fc7efb9abb24830f7f473102 Author: Tomas Cohen Arazi Date: Fri Oct 31 11:00:22 2014 -0300 Bug 13169: C4::Templates::themelanguage fails if the DB is not populated With the aim to remove hardcoded themes the C4::Templates::themelanguage got dependent on the DB being populated. This patch reintroduced the hardcoded defaults as a last resort. To test: - Do a fresh install, clean your browser's cache, empty DB - Open the staff interface => FAIL: A "Software error" screen shows "Template process failed: file error..." - Apply the patch - Reload => SUCCESS: The webinstaller prompts for login correctly. - Sign off :-D Regards Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 5 ++++- C4/Templates.pm | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 3 15:57:45 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Nov 2014 14:57:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-904-gb3b6f5a 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 b3b6f5afd0290b45109ca5b036e9296ced6e5acb (commit) via 3af8ac071c894242e6a9f28c456a571f7aaa301e (commit) via c2a44cb08e2587ee7bb45b2a012142cd67a83d09 (commit) via a72aa8ab3c2adde961bf0ed946587a2dce8db061 (commit) via 1f10ef44f8fee11b052b8eb23fc64ade2160f930 (commit) via 1334cd33b44f0b81fcf0c72365b625a07ee248ca (commit) via 0402e4e636605beacff69c3635218681d1d536e4 (commit) via 64eca4693c983c39b3058ac5377724a4d0628fdd (commit) via a72cdde31d4fa8cc252241bd0041eb9f32a7197f (commit) via 33d285599f843cf260d64f1bea3966aa8e97d8eb (commit) via ca138060731f89901f70a7c42ebbc8317dd58617 (commit) via 2e72eb888016f60ce15958ecb37e0ae64f0c8454 (commit) from c5a6a4f18a2c4eb2cb47bc302e539d3b05fcf9b1 (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 b3b6f5afd0290b45109ca5b036e9296ced6e5acb Author: Tomas Cohen Arazi Date: Mon Nov 3 11:53:33 2014 -0300 Bug 10860: (RM followup) checkout-related sysprefs belong to the checkouts section Signed-off-by: Tomas Cohen Arazi commit 3af8ac071c894242e6a9f28c456a571f7aaa301e Author: Owen Leonard Date: Fri Oct 31 14:00:23 2014 -0400 Bug 13184 - Circulation template problems if OnSiteCheckouts is off but OnSiteCheckoutsForce is on Checks in the circulation template for on-site checkouts preferences did not take into account the possibility that someone might have accidentally turned OnSiteCheckouts off but left OnSiteCheckoutsForce turned on. This patch amends the template logic so that it works correctly for various combinations of settings. To test, apply the patch and test the following combinations of circumstances. Testing using both a patron who is blocked (expired, restricted, etc) and a patron who is not blocked, test with... 1. OnSiteCheckouts is on, OnSiteCheckoutsForce is on 2. OnSiteCheckouts is off, OnSiteCheckoutsForce is on 3. OnSiteCheckouts is off, OnSiteCheckoutsForce is off 4. OnSiteCheckouts is on, OnSiteCheckoutsForce is off Confirm that the checkout form is shown or not shown correctly according to the preferences you have set. Confirm that the "Only on-site checkouts are allowed" message is only shown in case #1. Note: This patch includes whitespace changes, so please diff accordingly. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Tested on top of 10860 and 13179. Works as described, adding more checks in the templates. Signed-off-by: Tomas Cohen Arazi commit c2a44cb08e2587ee7bb45b2a012142cd67a83d09 Author: Owen Leonard Date: Fri Oct 31 11:50:35 2014 -0400 Bug 13179 - Circulation page layout problem when OnSiteCheckoutsForce is enabled The circulation page layout needs to work correctly for various combinations of restrictions, no restrictions, and restrictions with OnSiteCheckoutsForce enabled. This patch makes some minor accomodation for all. To test, load a patron for checkout under the following conditions: 1. OnSiteCheckoutsForce and patron is not blocked from checkout 2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for being expired or restricted). 3. OnSiteCheckoutsForce is on and patron is not blocked from checkout 4. OnSiteCheckoutsForce is on and patron is blocked from checkout The page layout should look correct for all these cases, with a clean two-column layout of [ checkout form | messages ] in all cases except Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer Applied on top of 10860. Works as described. Signed-off-by: Tomas Cohen Arazi commit a72aa8ab3c2adde961bf0ed946587a2dce8db061 Author: Tomas Cohen Arazi Date: Mon Nov 3 11:21:19 2014 -0300 Bug 10860: Update DBIx Signed-off-by: Tomas Cohen Arazi commit 1f10ef44f8fee11b052b8eb23fc64ade2160f930 Author: Tomas Cohen Arazi Date: Mon Nov 3 10:36:01 2014 -0300 Bug 10860: DBRev 3.17.00.044 Signed-off-by: Tomas Cohen Arazi commit 1334cd33b44f0b81fcf0c72365b625a07ee248ca Author: Kyle M Hall Date: Fri Oct 31 05:31:24 2014 -0400 Bug 10860 [QA Followup] - Use Koha.Preference Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 0402e4e636605beacff69c3635218681d1d536e4 Author: Katrin Fischer Date: Thu Oct 30 20:33:35 2014 +0100 Bug 10860: Follow-up - fix some template variable issues Fixing some simple display issues caused by missing/misnamed variables, probably consequence of the renaming before. Amended test plan: - Make sure that if OnSiteCheckoutsForce is set, you can still perform onsite checkouts and only those. - Check the detail page in staff says *currently in local use by* for an on-site checked out item - Check the detail page in OPAC with OPACShowCheckoutName active for the same. Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 64eca4693c983c39b3058ac5377724a4d0628fdd Author: Kyle M Hall Date: Thu Oct 30 11:07:50 2014 -0400 Bug 10860 [QA Followup] - Rename system preferences Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit a72cdde31d4fa8cc252241bd0041eb9f32a7197f Author: Katrin Fischer Date: Thu Oct 30 00:10:00 2014 +0100 Bug 10860: Follow-up - staff reading record - capitalization fix "Checked out" - display new tabs only when feature is activated - fixes a qa script complaint about POD in Items.pm Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 33d285599f843cf260d64f1bea3966aa8e97d8eb Author: Kyle M Hall Date: Wed Oct 22 02:18:03 2014 -0400 Bug 10860 [QA Followup] - Fix misc issues Signed-off-by: Tomas Cohen Arazi commit ca138060731f89901f70a7c42ebbc8317dd58617 Author: Kyle M Hall Date: Wed Oct 22 01:04:25 2014 -0400 Bug 10860 - Change "in-house use" to "on-site checkout" Signed-off-by: Tomas Cohen Arazi commit 2e72eb888016f60ce15958ecb37e0ae64f0c8454 Author: Jonathan Druart Date: Wed Sep 18 14:16:49 2013 +0200 Bug 10860: In-House Use This patch implements the In-House Use feature for Koha. It adds: - 2 new sysprefs: 'In-House Use' to enable/disable this feature 'In-House Use Forced' to enable/disable the feature for *all* users. - 2 new columns issues.inhouse_use and old_issues.inhouse_use - Datatable on the circulation history pages (readingrec) at the OPAC and the intranet. A new checkbox in the Circulation tab. If checked, the issue become a in-house use (in the statistics and issues tables). When you check it, the due date changes to the today date. The syspref "In-House Use Force" allows to force the in-house use to permit the checkout even if the borrower is debarred or others problems. In the issue table, a new string (in red) marks the issue as "in-house use". The circulation history contains 3 tabs : "all", "checkout" and "in-house use" (OPAC and intranet). The cronjob script: If AutomaticItemReturn if off, a library would like not to do a transit operation manually. This script (to launch each night) do returns for a specific branches. Test plan: 1/ Execute the updatedatabase entry 2/ Enable the 'In-House Use' pref. 3/ Checkout a biblio for a patron and check the 'in-house use' checkbox. 4/ Check that the due date is the today date (with 23:59) and is not modifiable. 5/ Click on the check out button and check that the new check out appears in the table bellow with the "(In-house use)" string. 6/ Go on the circulation history pages (readingrec and opac-readingrec) and try the 3 tabs. In the last one, your last checkout should appear. 7/ Check in. 8/ Check readingrec pages. 9/ Choose a debarred patron and check that you cannot checkout a biblio for him. 10/ Switch on the 'In-House Use Forced' pref 11/ You are now allowed to checkout a biblio for the debarred patron. Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 15 +- C4/Items.pm | 11 +- C4/Stats.pm | 2 +- Koha/Schema/Result/Issue.pm | 12 +- Koha/Schema/Result/OldIssue.pm | 12 +- circ/circulation.pl | 25 ++- installer/data/mysql/kohastructure.sql | 2 + installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 22 +++ .../intranet-tmpl/prog/en/css/staff-global.css | 14 ++ .../intranet-tmpl/prog/en/includes/strings.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 25 ++- .../intranet-tmpl/prog/en/js/pages/circulation.js | 4 + .../en/modules/admin/preferences/circulation.pref | 12 ++ .../prog/en/modules/catalogue/detail.tt | 8 + .../prog/en/modules/circ/circulation.tt | 70 +++++-- .../prog/en/modules/members/readingrec.tt | 129 ++++++++----- koha-tmpl/opac-tmpl/bootstrap/css/datatables.css | 194 ++++++++++---------- .../bootstrap/en/includes/item-status.inc | 8 + koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 2 +- kohaversion.pl | 2 +- svc/checkouts | 3 + t/db_dependent/Circulation.t | 2 +- 23 files changed, 380 insertions(+), 197 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 5 12:31:04 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Nov 2014 11:31:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-922-ga86e69c 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 a86e69c86bd99e463e6702ee487e18af7a9cb79a (commit) via fe1461bcd8e60cd056f869b22bcfd7c2ba3c475f (commit) via 612769c3e73ef834ab24480746ca8da352611245 (commit) via 6cfe36ee650f35d0e6162bc56a06272425b4d176 (commit) via dc85139da272689e3aaaa9b4b5a29a6634b6656e (commit) via 643a9cd0caca6048741fd4d9d7a75343d05e085c (commit) via 4e896da9cab2daba2cb925fc2a8bf61a70c6ea10 (commit) via 2f2ff6729ddc7fe630382a376165955503033220 (commit) via 3e3717a86112b17e2b2e5bb7a0215e46b388a632 (commit) via 5a5682bd599ea93a7b380f0bc7ec32b893641568 (commit) via 62aa8aeb92cb5269a03b5c69fe02042f6202c8e2 (commit) via 7c2ff7940e0b579f6d882abd03c75c4fd191bcb1 (commit) via 8a26171b903f52fb6c81fa891b8e2abc9d00856a (commit) via e0d20059e697f886e0f99cb54a5ded35df68d241 (commit) via 659f7cd097fd563cea8eeb49189c4d99dc8b89cf (commit) via 3463dd244928e50e2a5e8b90f06dd072d7a93241 (commit) via 6b2d2abb1945af5fb2f9d5d0d824e08ef3b7865e (commit) via 3cbf7547023a36166a0dd51d2a778623fc4b6aa0 (commit) from b3b6f5afd0290b45109ca5b036e9296ced6e5acb (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 a86e69c86bd99e463e6702ee487e18af7a9cb79a Author: Tomas Cohen Arazi Date: Wed Nov 5 08:32:14 2014 -0300 Bug 11425: Update DBIx Signed-off-by: Tomas Cohen Arazi commit fe1461bcd8e60cd056f869b22bcfd7c2ba3c475f Author: Tomas Cohen Arazi Date: Tue Nov 4 19:22:07 2014 -0300 Bug 11425: (maniac followup) remove diag from tests Signed-off-by: Tomas Cohen Arazi commit 612769c3e73ef834ab24480746ca8da352611245 Author: Tomas Cohen Arazi Date: Tue Nov 4 19:20:34 2014 -0300 Bug 11425: (followup) fix number of tests Signed-off-by: Tomas Cohen Arazi commit 6cfe36ee650f35d0e6162bc56a06272425b4d176 Author: Tomas Cohen Arazi Date: Tue Nov 4 19:19:02 2014 -0300 Bug 11425: DBRev 3.17.00.046 Signed-off-by: Tomas Cohen Arazi commit dc85139da272689e3aaaa9b4b5a29a6634b6656e Author: Owen Leonard Date: Wed Oct 29 09:48:39 2014 -0400 Bug 11425 [Template follow-up] Search form for items This template followup makes several changes to markup and text: - Replace "Bibliographic reference" with "Title" - Replace "Callnumber" with "Call number" - Replace "Home branch" with "Home library" - Replace "Holding branch" with "Current location" - Replace "Location" with "Shelving location" - Replace "Issues" with "Checkouts" - Replace "Indifferent" with "Ignore" - Replace "&" with "&" where necessary - Correct page title and breadcrumbs - Remove label "for" attribute from labels which do not directly target a form field - Correct label "for" attribute on labels which should target a form field - Correct date format hint This patch also makes one change to the way the page display works: The search results section is now in a separate div which uses a different grid rule, allowing it to take up the full width of the screen. To keep the page headers from looking weird I've changed the markup so that each section has its own header. To test, perform a variety of searches and confirm that the output in both Screen and CSV views looks correct. Confirm that search results which are output to the screen are formatted nicely and that the "edit search" links work correctly to show the search form. Submitting a new search after editing a search should hide the form and redisplay the search results table. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Works as described, improves display. commit 643a9cd0caca6048741fd4d9d7a75343d05e085c Author: Kyle M Hall Date: Fri Oct 24 09:17:15 2014 -0400 Bug 11425 [QA Followup] - Fix number of unit tests Signed-off-by: Kyle M Hall commit 4e896da9cab2daba2cb925fc2a8bf61a70c6ea10 Author: Julian Maurice Date: Wed Jul 23 10:49:01 2014 +0200 Bug 11425: Display location label instead of code Signed-off-by: Bernardo Gonzalez Kriegel Minor conflicts solved Last three patches signed No koha-qa errors. Signed-off-by: Kyle M Hall commit 2f2ff6729ddc7fe630382a376165955503033220 Author: Julian Maurice Date: Tue May 6 16:34:38 2014 +0200 Bug 11425: QA fixes - Reword 'joker' to 'wildcard' - Explain what wildcards do - Reword 'Modify' to 'Edit' Also fix jQuery plugin columnFilter path Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Kyle M Hall commit 3e3717a86112b17e2b2e5bb7a0215e46b388a632 Author: Jonathan Druart Date: Wed Apr 16 12:25:23 2014 +0200 Bug 11425: Get column names using DBIX Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Kyle M Hall commit 5a5682bd599ea93a7b380f0bc7ec32b893641568 Author: Julian Maurice Date: Tue Mar 25 11:26:26 2014 +0100 Bug 11425: Add filter on items.notforloan column and display the 'Processing ...' box when datatables is loading new data. Signed-off-by: Bernardo Gonzalez Kriegel Nice box Signed-off-by: Kyle M Hall commit 62aa8aeb92cb5269a03b5c69fe02042f6202c8e2 Author: Julian Maurice Date: Fri Nov 29 11:34:46 2013 +0100 Bug 11425: Add unit tests package Koha::Item::Search::Field function C4::SQLHelper::GetColumns function C4::Items::SearchItems Signed-off-by: Bernardo Gonzalez Kriegel Tests run without error Signed-off-by: Kyle M Hall commit 7c2ff7940e0b579f6d882abd03c75c4fd191bcb1 Author: Julian Maurice Date: Thu Jul 4 16:52:58 2013 +0200 Bug 11425: Add item search form in staff interface Item search is available at catalogue/itemsearch.pl (link is in catalogue/search.pl) It only uses SQL (not Zebra) * Use DataTables and server-side processing to be able to filter on individual columns after the first search is done. * Allow to export results in CSV * With Javascript disabled, search form still works (and CSV export too) There is the possibility to define "Custom search fields" in a new admin page admin/items_search_fields.pl (link is in admin/admin-home.pl) A custom item search field is defined by: * a name: its unique identifier * a label: the text displayed to the user * a MARC field/subfield: the field/subfield to query (it uses ExtractValue) * an authorised values list (optional): if defined the list is displayed in the search form New Perl dependency: Template::Plugin::JSON::Escape Test plan: 1/ Apply the patch and run updatedatabase.pl 2/ Go to advanced search (staff interface), then click on "Go to item search" 3/ Play with the search form! :) In the 3rd fieldset you can add as many fields as you want and combine them with boolean operators (AND, OR). You can use SQL jokers characters (%, _) You can output to screen (in a DataTables table) or to a CSV file. 4/ In the DataTables table, play with filters and try sorting columns. 5/ Disable Javascript (with Firefox: extensions NoScript or YesScript, or in about:config 'javascript.enabled' = false 6/ Reload the search page and do some searches on screen output. (there is no sorting or filtering features, but there is still pagination) 7/ Try again CSV output. 8/ You can re-enable Javascript. 9/ Go to Administration > Items search fields 10/ Add a new field. Example for title (in UNIMARC): Name: title Label: Title MARC field: 200 MARC subfield: a Authorised values category: None (add another field with an authorised values category to see the difference). 11/ As you are there try to update and delete some fields. 12/ Go back to items search form. You can see in the 3rd fieldset that your fields have appeared in the selects. 13/ Try searching on them. 14/ I think you're done :) Signed-off-by: Bernardo Gonzalez Kriegel Work as described. Good new option. No koha-qa errors Signed-off-by: Kyle M Hall commit 8a26171b903f52fb6c81fa891b8e2abc9d00856a Author: Tomas Cohen Arazi Date: Tue Nov 4 19:00:54 2014 -0300 Bug 11126: DBRev 3.17.00.045 Signed-off-by: Tomas Cohen Arazi commit e0d20059e697f886e0f99cb54a5ded35df68d241 Author: Tomas Cohen Arazi Date: Tue Nov 4 18:59:42 2014 -0300 Bug 11126: (RM followup) remove diags from tests Signed-off-by: Tomas Cohen Arazi commit 659f7cd097fd563cea8eeb49189c4d99dc8b89cf Author: Jonathan Druart Date: Fri Oct 10 20:53:50 2014 +0200 Bug 11126: qa follow-up - use Modern::Perl; - fix a typo - remove an old comment Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 3463dd244928e50e2a5e8b90f06dd072d7a93241 Author: Kyle M Hall Date: Mon Feb 24 11:32:39 2014 -0500 Bug 11126 [QA Followup] - Make reserves returned by _Findgroupreserve sorted by priority Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 6b2d2abb1945af5fb2f9d5d0d824e08ef3b7865e Author: Kyle M Hall Date: Wed Oct 23 11:58:34 2013 -0400 Bug 11126 - Make the holds system optionally give precedence to local holds This feature will allow libraries to specify that, when an item is returned, a local hold may be given priority for fulfillment even though it is of lower priority in the list of unfilled holds. This feature has three settings: * LocalHoldsPriority, which enables the feature * LocalHoldsPriorityPatronControl, which selects for either tha patron's home library, or the patron's pickup library for the hold * LocalHoldsPriorityItemControl, which selects for either the item's holding library, or home library. So, this feature can "give priority for filling holds to patrons whose (home library|pickup library) matches the item's (home library|holding library)" Test Plan: 1) Apply this patch 2) Run t/db_dependent/Holds/LocalHoldsPriority.t Signed-off-by: Joel Sasse Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 3cbf7547023a36166a0dd51d2a778623fc4b6aa0 Author: Fr?d?ric Demians Date: Sun Nov 2 08:59:30 2014 +0100 Bug 13170 Remove of prog theme broke the OPAC's "view plain" option for MARC details In the OPAC if you view the MARC details for a title (and have OPACXSLTDetailsDisplay enabled) there is a "view plain" link which displays the output of opac-showmarc.pl. This is broken in master: fixed by this patch. Test plan: (1) Set OPACXSLTDetailsDisplay to default (2) Do a search on OPAC, then display a specific biblio record (3) Click on MARC view tab. Then click on 'view plain' link. Nothing is displayed. (4) Apply the patch. And refresh the MARC detail page. (5) Click on 'view plain' link. Check that a plain text MARC record is displayed. Signed-off-by: Chris Note: This makes a small change to C4::Templates::themelanguage so that it works with .xsl files too (They live in the xslt dir) Signed-off-by: Katrin Fischer Works as described, passes tests and QA script. Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 5 + C4/Items.pm | 207 +++++++++- C4/Reserves.pm | 47 ++- C4/Templates.pm | 5 +- Koha/Item/Search/Field.pm | 111 +++++ Koha/Schema/Result/AuthorisedValue.pm | 19 +- Koha/Schema/Result/ItemsSearchField.pm | 112 +++++ acqui/check_uniqueness.pl | 2 +- admin/items_search_field.pl | 63 +++ admin/items_search_fields.pl | 81 ++++ catalogue/itemsearch.pl | 309 ++++++++++++++ installer/data/mysql/kohastructure.sql | 17 + installer/data/mysql/sysprefs.sql | 3 + installer/data/mysql/updatedatabase.pl | 31 ++ .../intranet-tmpl/prog/en/css/itemsearchform.css | 44 ++ .../en/includes/admin-items-search-field-form.inc | 58 +++ .../intranet-tmpl/prog/en/includes/admin-menu.inc | 1 + .../en/includes/catalogue/itemsearch_item.csv.inc | 4 + .../prog/en/includes/catalogue/itemsearch_item.inc | 23 ++ .../en/includes/catalogue/itemsearch_item.json.inc | 18 + .../en/includes/catalogue/itemsearch_items.inc | 49 +++ .../prog/en/modules/admin/admin-home.tt | 2 + .../prog/en/modules/admin/items_search_field.tt | 41 ++ .../prog/en/modules/admin/items_search_fields.tt | 95 +++++ .../en/modules/admin/preferences/circulation.pref | 15 + .../prog/en/modules/catalogue/advsearch.tt | 1 + .../prog/en/modules/catalogue/itemsearch.csv.tt | 4 + .../prog/en/modules/catalogue/itemsearch.json.tt | 12 + .../prog/en/modules/catalogue/itemsearch.tt | 436 ++++++++++++++++++++ kohaversion.pl | 2 +- opac/opac-showmarc.pl | 28 +- t/db_dependent/Holds/LocalHoldsPriority.t | 112 +++++ t/db_dependent/Items.t | 124 +++++- t/db_dependent/Koha/Item/Search/Field.t | 39 ++ t/db_dependent/SQLHelper.t | 1 + 35 files changed, 2067 insertions(+), 54 deletions(-) create mode 100644 Koha/Item/Search/Field.pm create mode 100644 Koha/Schema/Result/ItemsSearchField.pm create mode 100755 admin/items_search_field.pl create mode 100755 admin/items_search_fields.pl create mode 100755 catalogue/itemsearch.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/itemsearchform.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/admin-items-search-field-form.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.csv.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_item.json.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalogue/itemsearch_items.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.csv.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.json.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt create mode 100755 t/db_dependent/Holds/LocalHoldsPriority.t create mode 100755 t/db_dependent/Koha/Item/Search/Field.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Nov 6 14:15:57 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Nov 2014 13:15:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-928-g4235326 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 4235326c5fad21be82922eb3f0fe2cd85e7a00da (commit) via 0bfcb079a1a789cec9f2ad04f50d85fbbff9a529 (commit) via 2aebc84cc880048c559aa4d19e66cb35a37f42ea (commit) via 47e2331bd0b233185f8ca9924d141a8b38a82ad5 (commit) via 75ab7ea5e189e5e13ba8fa322863a62959b972b2 (commit) via f4bd79217c16ccaf487f6dafbe0730516bf116e1 (commit) from a86e69c86bd99e463e6702ee487e18af7a9cb79a (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 4235326c5fad21be82922eb3f0fe2cd85e7a00da Author: Rafal Kopaczka Date: Fri Oct 17 15:20:41 2014 +0200 Bug 13103: No checkouts count on member details page On member details page, number of issues are not shown. It's caused by, old variable name for issue count in Moremember.tt template. To test: Apply patch go to member details page and check if there's number alongside "Checkout(s)" tab. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Small template change for more consistency. Works nicely. Signed-off-by: Tomas Cohen Arazi commit 0bfcb079a1a789cec9f2ad04f50d85fbbff9a529 Author: Magnus Enger Date: Tue Nov 4 14:03:16 2014 +0100 Bug 13194: Fix typo in SetMessagingPreferencesFromDefaults POD The example usage for C4::Members::Messaging::SetMessagingPreferencesFromDefaults calls the subroutine SetMessagingPreferenceFromDefaults, not SetMessagingPreferencesFromDefaults (missing the 's' at the end of 'Preferences'). To test: - Apply the patch - Check that the POD now refers to the actual name of the subroutine (perldoc C4::Members::Messaging) http://bugs.koha-community.org/show_bug.cgi?id=13194 Adding 's' is the correct doc change to make it match with the function definition. Comfirmable with less. perldoc C4::Members::Messaging proves the doc is still nice. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi commit 2aebc84cc880048c559aa4d19e66cb35a37f42ea Author: Jonathan Druart Date: Tue Nov 4 09:34:32 2014 +0100 Bug 13190: Refactor the checkouts table template code This code is duplicated and should be centralised. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 47e2331bd0b233185f8ca9924d141a8b38a82ad5 Author: Jonathan Druart Date: Mon Nov 3 17:23:22 2014 +0100 Bug 13190: Reintroduce the checkouts export feature Bug 11703 breaks the checkouts export feature. To reproduce: Fill the ExportWithCsvProfile pref and go on the circ/circulation.pl page. The export column appears, but not the export button. Test plan: Go on the checkout list (circ/circulation.pl and members/moremember.pl) and verify the export column and the export button appears. If you click on the button, a file should be generated. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 75ab7ea5e189e5e13ba8fa322863a62959b972b2 Author: Chris Cormack Date: Wed Nov 5 20:00:39 2014 +1300 Bug 12892 : Alternate fix to restore the deleted code This doesn't depend on anything other patch. 1. Create a reservation for a Borrower with pickup branch 2. Check-in the corresponding Item in the pickup branch and confirm the hold for the Borrower 3. Go to circ/circulation.pl for the Borrower and verify that the reservation is "Waiting for pickup" 4. In the Borrower -> Check Out -tab (circ/circulation.pl) on the right of the big "Checking out to borrowername" should be a notification about holds ready for pickup. Signed-off-by: Martin Renvoize Signed-off-by: Rafal Kopaczka Signed-off-by: Katrin Fischer Passes all tests and QA script, restores the old code and behaviour. Signed-off-by: Tomas Cohen Arazi commit f4bd79217c16ccaf487f6dafbe0730516bf116e1 Author: Amit Gupta Date: Tue Nov 4 21:33:36 2014 +0530 Bug 13144: Google transliteration does not work on bootstrap To Test: Use Google Indic Transliteration API to allow users to transliterate english typed words into Indic languages. http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=6ae7b60962e7d07aa00a45a7af692939a4ce7aa6 Signed-off-by: Frederic Demians I had been able to reproduce the bug (a regression), and I can confirm that this patch fix it. But I had to create manualy GoogleIndicTransliteration system preference, which doesn't exist in standard .pref file. It may be necessary to add it. In my opinion, it shouldn't prevent to include this patch. Signed-off-by: Katrin Fischer Fixes a somewhat 'hidden' feature, no problems found. Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Members/Messaging.pm | 2 +- C4/Record.pm | 3 +- circ/circulation.pl | 31 +++++++- .../prog/en/includes/checkouts-table.inc | 70 +++++++++++++++++ .../intranet-tmpl/prog/en/js/pages/circulation.js | 11 +-- .../prog/en/modules/circ/circulation.tt | 75 ++++-------------- .../prog/en/modules/members/moremember.tt | 83 +++----------------- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 4 +- .../bootstrap/js/googleindictransliteration.js | 4 +- tools/export.pl | 2 +- 10 files changed, 134 insertions(+), 151 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Nov 6 17:49:15 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Nov 2014 16:49:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-931-g5a82616 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 5a82616ab7fcaee9764d340756c6a2afe851658f (commit) via bba3306d45aba8626c3ef460de06a4e76abafaf9 (commit) via e82f6117c1d83f27a6ff10821a0b936a99c8b279 (commit) from 4235326c5fad21be82922eb3f0fe2cd85e7a00da (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 5a82616ab7fcaee9764d340756c6a2afe851658f Author: Tomas Cohen Arazi Date: Fri Oct 31 12:50:37 2014 -0300 Bug 10582: Koha OPAC URL shows Perl error message before web installer was run This patch makes opac/maintenance.pl run smoothly when the DB hasn't been populated yet. It does so, by using C4::Templates::gettemplate instead of C4::Auth::get_user_and_template as the maintenance page doesn't need authentication checks at all, it should happen *before* any attempt to check credentials. To test: - Backup and DROP your database - Point your browser to the OPAC page => FAIL: An error is shown: "Cant's use an undefined value as an ARRAY..." - Apply the patch - Relad the page => SUCCESS: The maintenance page correctly shows. We should now check the rest of the script's behaviour remains untouched: - Reload your backed up DB - Change your DB version number by hand to one version lower, like in: > UPDATE systempreferences SET value="3.1700042" WHERE variable LIKE '%version%'; - Go to the OPAC => SUCCESS: Maintenance page shows as expected - Recover the right version number, like in: > UPDATE systempreferences SET value="3.1700043" WHERE variable LIKE '%version%'; - Set OpacMaintenance to Show on the staff client - Reload the OPAC => SUCCESS: Maintenance page shows as expected - Set OpacMaintenance to 'Don't show' on the staff client - Reload the OPAC => SUCCESS: Normal OPAC shows - Sign off :-D Regards Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Katrin Fischer Works as described, fixes long existing bug. Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi commit bba3306d45aba8626c3ef460de06a4e76abafaf9 Author: Owen Leonard Date: Fri Oct 31 12:31:46 2014 -0400 Bug 13183 - Improve visibility of automatic on-site checkout rule when OnSiteCheckoutsForce is on This patch addresses the case where OnSiteCheckoutsForce is enabled and the user is checking out to a patron who is blocked from checking out. Instead of showing the 'specify due date' form (which is disabled) this patch hides it and highlights the on-site checkout controls. This patch adds some CSS and consolidates some redundant CSS. To test, load a patron for checkout under the following conditions: 1. OnSiteCheckoutsForce is off and patron is not blocked from checkout 2. OnSiteCheckoutsForce is off, patron is blocked from checkout (for being expired or restricted). 3. OnSiteCheckoutsForce is on and patron is not blocked from checkout 4. OnSiteCheckoutsForce is on and patron is blocked from checkout Signed-off-by: Liz Rea Checked these 4 conditions, plus that if a specified due date was allowed, that it was enforced. I noted that the on-site checkouts seemed to take longer to process, but this probably isn't the place for that sort of complaint. Signed-off-by: Katrin Fischer Small visual improvment for a new feature. No problems found. Signed-off-by: Tomas Cohen Arazi commit e82f6117c1d83f27a6ff10821a0b936a99c8b279 Author: Owen Leonard Date: Wed Oct 8 13:45:43 2014 -0400 Bug 13043 - Remove incorrect link to unused DataTables columnFilter plugin on staff client search history page The staff client search history page does not required the DataTables columnFilter plugin, so the link (which pointed to the wrong location anyway) can be removed. To test, apply the patch and view your search history in the staff client. Table sorter functions (sorting, paging, and searching) should work correctly for current and previous sessions of catalog and authority searches. Signed-off-by: Frederic Demians This patch just affects the staff search history page which is still fully functionnal after applying the patch. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/staff-global.css | 15 +++--- .../prog/en/modules/catalogue/search-history.tt | 1 - .../prog/en/modules/circ/circulation.tt | 50 ++++++++++++-------- opac/maintenance.pl | 37 ++++++--------- 4 files changed, 53 insertions(+), 50 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 7 15:20:55 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Nov 2014 14:20:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-944-g1cabaa3 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 1cabaa32b40f225dedfc969db02af596d7d22994 (commit) via c96ab7d19dfe0733f924ba6bb4026c62a53e2a75 (commit) via f12d7e6792fc9e3f44daf6c361f4c4b792ca34b6 (commit) via f73add3d48d33eaf6d932068f8968d7eede34632 (commit) via a503474346182f0cfdd35557fabefddee5ec80bb (commit) via e26c8efbdbd4e240dc43f453a86277e55ae184f3 (commit) via 1d7622a90ff73280e5e8bfa720963526c4ab2c0a (commit) via 45eb7e6d4f55f66c7d0e1550d5d668844be8f4d4 (commit) via 938ec10a4ae9ae8218e4a0bd88ede3e77b6f8ecd (commit) via bb505d77f4acfde0d26974473d0099f31c2decc2 (commit) via c4d3f572794704441ca4f42ac99887e1d0d4fd74 (commit) via 4aa0e21f864ce0acd2895eddf127a133b9ae4d54 (commit) via d14a0cf5be3f6d31a9d5d23748285d077426c300 (commit) from 5a82616ab7fcaee9764d340756c6a2afe851658f (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 1cabaa32b40f225dedfc969db02af596d7d22994 Author: Tomas Cohen Arazi Date: Fri Nov 7 11:09:14 2014 -0300 Bug 8836: (RM followup) unit tests should use the new API Signed-off-by: Tomas Cohen Arazi commit c96ab7d19dfe0733f924ba6bb4026c62a53e2a75 Author: Tomas Cohen Arazi Date: Thu Nov 6 15:28:19 2014 -0300 Bug 8836: Update DBIx Signed-off-by: Tomas Cohen Arazi commit f12d7e6792fc9e3f44daf6c361f4c4b792ca34b6 Author: Tomas Cohen Arazi Date: Thu Nov 6 15:25:12 2014 -0300 Bug 8836: DBRev 3.17.00.047 Signed-off-by: Tomas Cohen Arazi commit f73add3d48d33eaf6d932068f8968d7eede34632 Author: Tomas Cohen Arazi Date: Thu Nov 6 15:13:18 2014 -0300 Bug 8836: (RM followup) fix updatedatabase.pl rebase problem Signed-off-by: Tomas Cohen Arazi commit a503474346182f0cfdd35557fabefddee5ec80bb Author: Kyle M Hall Date: Fri Oct 31 06:46:53 2014 -0400 Bug 8836 [QA Followup] - Prevent multiple collections from having the same title Signed-off-by: Owen Leonard This works, and so I'll sign off, but I'm not crazy about the workflow. Having the error message display on an otherwise empty page is not user friendly. The entry form should be redisplayed so that the user can modify the data they submitted. That really should be changed in a follow-up. Signed-off-by: Katrin Fischer commit e26c8efbdbd4e240dc43f453a86277e55ae184f3 Author: Owen Leonard Date: Fri Oct 31 09:04:43 2014 -0400 Bug 8836 [Alt QA Followup] - Add confirmation dialog for deleting collections The previous patch for adding a confirmation dialog didn't work to make the confirmation message translatable. This alternate patch uses a progressive-enhancement method recycled from Guided Reports to trigger a warning and highlight the row which was clicked. To test, apply the patch and try to delete an existing rotating collection. You should get a confirmation dialog, and the corresponding row in the table should be highlighted red. Clicking cancel should cancel the deletion. Clicking OK should complete the deletion. To test the translatability of the confirmation message: Run perl translate update [a language code, e.g. 'en-GB'] Search [lang]-i-staff-t-prog-v-3006000.po for the message string Signed-off-by: Katrin Fischer commit 1d7622a90ff73280e5e8bfa720963526c4ab2c0a Author: Kyle M Hall Date: Fri Oct 31 08:18:28 2014 -0400 Bug 8836 [QA Followup] - Don't transfer in items already in transit Signed-off-by: Katrin Fischer commit 45eb7e6d4f55f66c7d0e1550d5d668844be8f4d4 Author: Kyle M Hall Date: Fri Oct 31 06:50:41 2014 -0400 Bug 8836 [QA Followup] - Sort transfer branches alphabetically Signed-off-by: Owen Leonard Libraries sort correctly now. Signed-off-by: Katrin Fischer commit 938ec10a4ae9ae8218e4a0bd88ede3e77b6f8ecd Author: Kyle M Hall Date: Fri Oct 31 06:24:20 2014 -0400 Bug 8836 [QA Followup] - Allow collection description to be optional Signed-off-by: Owen Leonard Description is no longer made required by the template and an empty description is saved correctly. Signed-off-by: Katrin Fischer commit bb505d77f4acfde0d26974473d0099f31c2decc2 Author: Owen Leonard Date: Thu Oct 30 12:42:07 2014 -0400 Bug 8836 [Template follow-up] Resurrect Rotating Collections This follow-up makes drastic changes to the templates in order to bring them into compliance with established patterns and markup guidelines. Only minor changes are made to perl scripts. Changes: - Add a toolbar include for displaying new, edit, transfer, and delete buttons. - Improve title and breadcrumbs with collection titles and better specificity. - Correct page structure which was inconsistent with the markup of similarly-structured pages. - Correct styling of error and informational messages. - Added detailed error messages for a couple of conditions which were not defined in the template. - Add link to the detail page of titles which are in a collection using the view defined in the IntranetBiblioDefaultView preference. - Add a link to remove an item from a collection directly without having to scan the barcode. - Add client-side validation to collection creation form. - In RotatingCollections.pm, add biblionumber to the list of columns returned by GetItemsInCollection. - In rotating_collections/*.pl, remove obsolete declaration of system preference variables. To test, perform all the operations associated with Rotating Collections: - Add a new collection - Edit an existing collection - Add items to a collection - Remove items from a collection (via barcode and link) - Test the behavior of all new toolbar buttons - Verify that titles and breadcrumbs look correct and links work correctly. Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer commit c4d3f572794704441ca4f42ac99887e1d0d4fd74 Author: Kyle M Hall Date: Thu Oct 30 06:58:42 2014 -0400 Bug 8836 [QA Followup 2] Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer commit 4aa0e21f864ce0acd2895eddf127a133b9ae4d54 Author: Kyle M Hall Date: Wed Oct 15 10:46:28 2014 -0400 Bug 8836 [QA Followup] - Fix koha-qa.pl errors reported Signed-off-by: Chris Cormack Trusting the sign off on the other page, I only tested the QA changes Signed-off-by: Cindy Murdock Ames Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer commit d14a0cf5be3f6d31a9d5d23748285d077426c300 Author: Kyle M Hall Date: Fri Aug 15 16:46:03 2014 +0300 Bug 8836 - Resurrect Rotating Collections Test Plan: In "Tools" -> "Rotating Collections" -> "Add/Remove items": When adding item barcodes to the collection, the input field should become active automatically so it is easy to add multiple barcodes rapidly without touching the mouse or keyboard. Enter-press is dealt by the barcode reader so automatic form submittal should be handled by the barcode reader. In "Rotating collections" -> "Transfer Collection": When the collection is initially transferred, items are set to trasfer correctly. When the collection is transferred while items are still being transferred, the transfer destination library doesn't change from the original one. The holding library changes for all items in the collection to the destination library on retransfers as well. This is tricky if a user accidentally places the wrong destination. When I try to checkin these items to their new retransfer location, I get the following messages: -"This item is part of a rotating collection and needs to be transferred to " -"Please return Valkoinen ihmissyj / to " -"Print slip or Cancel transfer" When I checkin a Item to a arbitrary branch, I get the following messages: "This item is part of a rotating collection and needs to be transferred to " "Please return Valkoinen ihmissyj / to " Bug 8836 - Resurrect Rotating Collections - QA Followup Bug 8836 - Resurrect Rotating Collections - Followup 2 - Perltidy rotating collections scripts Bug 8836 - Resurrect Rotating Collections - Followup 3 * Fix bad TT Tag * Fix bad sql query * Fix capitalization ( HTML4 ) * Allow a rotating collection's location to keep AutomaticItemReturn from sending it back to the branch of origin * Fix bad query Bug 8836 - Resurrect Rotating Collections - Followup 4 - Autofocus on barcode field Bug 8836 - Resurrect Rotating Collections - Followup 5 - Don't transfer issued and waiting items Items in a rotating collection are automatcially transferred when a collection is transferred. This is a problem for currently checked out items and items on hold marked as "Waiting". This patch resolves this issue by skipping the transfer for those items. When the items are then returned, the librarian will be alerted to transfer the item to the library currently holding that rotating collection. Bug 8836 - Resurrect Rotating Collections - Followup 5 - Link collections.colBranchcode to branches.branchcode Signed-off-by: jmbroust Signed-off-by: Cindy Murdock Ames http://bugs.koha-community.org/show_bug.cgi?id=8835 Signed-off-by: Brendan Gallagher Signed-off-by: Katrin Fischer ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 5 +- C4/RotatingCollections.pm | 477 +++++++++++--------- Koha/Schema/Result/Branch.pm | 19 +- Koha/Schema/Result/Collection.pm | 34 +- circ/returns.pl | 32 +- installer/data/mysql/kohastructure.sql | 8 +- installer/data/mysql/updatedatabase.pl | 84 ++-- .../intranet-tmpl/prog/en/css/staff-global.css | 4 +- .../en/includes/rotating-collections-toolbar.inc | 17 + .../intranet-tmpl/prog/en/includes/tools-menu.inc | 2 - .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../en/modules/rotating_collections/addItems.tt | 180 +++++--- .../rotating_collections/editCollections.tt | 229 +++++----- .../rotating_collections/rotatingCollections.tt | 92 ++-- .../rotating_collections/transferCollection.tt | 88 ++-- .../prog/en/modules/tools/tools-home.tt | 4 +- kohaversion.pl | 2 +- rotating_collections/addItems.pl | 127 +++--- rotating_collections/editCollections.pl | 154 ++++--- rotating_collections/rotatingCollections.pl | 33 +- rotating_collections/transferCollection.pl | 80 ++-- t/db_dependent/RotatingCollections.t | 130 ++++-- 22 files changed, 1008 insertions(+), 795 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 7 15:42:15 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Nov 2014 14:42:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-957-gaef500f 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 aef500f6a3168be665d2a38e9aa2c745c6e24c78 (commit) via 4824ddba418be2e3d41412e7cbe740c12005c712 (commit) via 1aab0ff3e39a7be8855c70ba984520a56a121a85 (commit) via 71c0b8226e8fd4633831b81c9f9f6f1d1c84bbbb (commit) via 301b96e66de444fb4c03a76ef59842185489e2bc (commit) via 5f58431380c2ec753f4e69628c4edce82223ae9d (commit) via 81445f9e889c5f87a922fbfd7e7156d220a62cd7 (commit) via 499745460604cde6bf7f7afe4b4a8f2459c5aa4e (commit) via 6f17c68a24eb56976b684472ffdae2ce77e6955c (commit) via 694b56a9cef96095f21bcf9435cd05e8fa415b89 (commit) via 696c9feee25bf6ce15d850dc80dd0da034288471 (commit) via 1fc8916e2e944af608970ea418ac3fe9db92f0aa (commit) via 3fb57f34ea5644683e18262186dbba09e51a6c92 (commit) from 1cabaa32b40f225dedfc969db02af596d7d22994 (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 aef500f6a3168be665d2a38e9aa2c745c6e24c78 Author: Tomas Cohen Arazi Date: Fri Nov 7 11:37:27 2014 -0300 Bug 12448: DBRev 3.17.00.048 Signed-off-by: Tomas Cohen Arazi commit 4824ddba418be2e3d41412e7cbe740c12005c712 Author: Katrin Fischer Date: Fri Aug 15 21:35:45 2014 +0200 Bug 12448: Follow-up: Only ask confirmation when rental charge > 0 To test: - Check out an item with no rental charge - Verify no confirmation message appears - Check out an item with rental charge - Verify rental charge shows Signed-off-by: Tomas Cohen Arazi commit 1aab0ff3e39a7be8855c70ba984520a56a121a85 Author: mbeaulieu Date: Tue Jul 29 16:20:39 2014 -0400 Bug 12448: Ask for confirmation when checking out an item with rental fees Sponsored-by: Ville de Victoriaville, QC Confirmation box contents: "Please confirm checkout" "-Rental charge for this item: n" [Yes, check out (Y)] [No, Don't Check Out (N)] Test case A: Confirm checkout 1) Go to checkout user "X"'s checkout page. 2) Enter barcode for an item with rental fees. 3) Click the "Check out" button. 4) Confirmation box appears. 5) Click on the "Yes" button. 6) Item is added to checkout list. 7) Fees are added to the patron's account. Test case B: Decline checkout 1) Go to checkout user "X"'s checkout page. 2) Enter barcode for an item with rental fees. 3) Click the "Check out" button. 4) Confirmation box appears. 5) Click the "No" button. 6) Checkout page goes back to its initial state. 7) Patron has no item checked out and no fees to pay. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer With the system preference RentalFeesCheckoutConfirmation set to "don't ask" there is no change in behaviour. Signed-off-by: Tomas Cohen Arazi commit 71c0b8226e8fd4633831b81c9f9f6f1d1c84bbbb Author: Fridolin Somers Date: Thu Aug 14 15:39:07 2014 +0200 Bug 12760 - add restrictions purge to cleanup_database.pl (followup 2) Formatting : perltidy use q{} for SQL queries add use Modern::Perl Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 301b96e66de444fb4c03a76ef59842185489e2bc Author: Fridolin Somers Date: Thu Aug 14 15:15:48 2014 +0200 Bug 12760 - add restrictions purge to cleanup_database.pl (followup 1) Remove unused $query var Correct redefined $count var Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 5f58431380c2ec753f4e69628c4edce82223ae9d Author: Fridolin Somers Date: Thu Aug 14 14:56:26 2014 +0200 Bug 12760 - add restrictions purge to cleanup_database.pl This patch adds to the database cleanup script an option to purge expired patron restrictions (debarments in code). Test plan : - Select a borrower - Create a restriction with expiration date in the futur - Create a restriction expired since 7 days - Create a restriction expired since 14 days - run "misc/cronjobs/cleanup_database.pl -v --restrictions 14" => no restriction is removed for this borrower - run "misc/cronjobs/cleanup_database.pl -v --restrictions 13" => restriction expired since 14 days is removed - run "misc/cronjobs/cleanup_database.pl -v --restrictions 6" => restriction expired since 7 days is removed - run without argument "misc/cronjobs/cleanup_database.pl" => You see help text for restrictions option - run without days "misc/cronjobs/cleanup_database.pl -v --restrictions" => You get a purge on 30 days Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi commit 81445f9e889c5f87a922fbfd7e7156d220a62cd7 Author: Mark Tompsett Date: Sun Oct 26 22:43:08 2014 -0400 Bug 9312: Resolve error triggered by mutli-type return value. $results is 1 upon success or a hash on failure. Rather than check %$results || %error, I changed it to $results!=1 || %error. Strangely, this works without messy warnings. I believe this resolves the problem Katrin mentions in comment #43. TEST PLAN --------- 0) Make sure the system preference patronimages is set to Allow. 1) Apply all the patches 2) Login to staff client 3) Tools -> Upload patron images (it's in the bottom left) 4) Choose an image file, browse for a photo, enter a patron #. 5) Click Upload 6) Click the card number link -- the uploaded photo should be visible on the left side of the screen. 7) Run koha qa test tools. Signed-off-by: Bernardo Gonzalez Kriegel Image uploaded without problems No koha-qa errors Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 499745460604cde6bf7f7afe4b4a8f2459c5aa4e Author: Marcel de Rooy Date: Thu Aug 22 14:26:45 2013 +0200 Bug 9312: Followup for one tab character To satisfy qa tools, removing one tab somewhere.. Signed-off-by: Marcel de Rooy Signed-off-by: Chris Cormack Sometimes our QA tools are pretty annoying, in cases like this, when its a tab in a comment, .. I don't think we really need to hold up a patch set for it Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 6f17c68a24eb56976b684472ffdae2ce77e6955c Author: Galen Charlton Date: Wed Jan 16 08:12:31 2013 -0800 Bug 9312: fix a couple more uninitialized variable warnings Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 694b56a9cef96095f21bcf9435cd05e8fa415b89 Author: Fridolyn SOMERS Date: Wed Jun 12 15:29:26 2013 +0200 Bug 9312: Perltidying picture-upload.pl Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 696c9feee25bf6ce15d850dc80dd0da034288471 Author: Fridolyn SOMERS Date: Fri Dec 21 14:31:52 2012 +0100 Bug 9312: strict perl for picture-upload.pl Testing - this is a code-cleanup patch, so the purpose of testing is to ensure that patron image upload functionality still works. To test: - Turn on the patronimages system preference - Go to Tools | Upload patron images and import a suitable image for a test patron. - Bring up the test patron and verify that the image is attached. - From the patron details page, upload a replacement image. - Create a patron image ZIP file containing at least two images ( per the documentation of the patron image feature) and load it via the patron image import tool. - Verfiy that the test patrons now have images. - Verify that tools/picture-upload.pl didn't report any errors in the Apache error log. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 1fc8916e2e944af608970ea418ac3fe9db92f0aa Author: Katrin Fischer Date: Wed Nov 5 22:13:48 2014 +0100 Bug 12829: Follow-up - fix small display issue in UNIMARC UNIMARC XSLT uses
  • instead of . Signed-off-by: Tomas Cohen Arazi commit 3fb57f34ea5644683e18262186dbba09e51a6c92 Author: Tomas Cohen Arazi Date: Wed Oct 29 15:16:57 2014 -0300 Bug 12829: properly skip invalid ISBN when rendering for normal record display Currently, 020$z (and 010$z fr UNIMARC) occurences are not shown, but the XSLT logic used introduces punctuation characters for those $z occurences. This patch adds a check for the existence of subfield a, and only loops on $a subfields. To test: - Create/have a record with 020$z (or 010$z on UNIMARC) but no 020$a (no 010$a on UNIMARC). - Open the detail page for the record (on both OPAC and staff). => FAIL: the ISBN label and ';' and '.' characters incorrectly shown. - Repeat mixing with 020$a occurences to notice the bug. - Apply the patch, reload => SUCCES: ISBN label shows only on the presence of a $a, and $z are skipped. no matter how many ISBN fields you add. - Sign off :-D Regards To+ http://bugs.koha-community.org/show_bug.cgi?id=12901 Signed-off-by: Nicole C. Engard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 15 +- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 11 +- .../en/modules/admin/preferences/circulation.pref | 9 +- .../prog/en/modules/circ/circulation.tt | 6 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 25 +- .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 25 +- .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 26 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 26 +- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 25 +- .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 26 +- kohaversion.pl | 2 +- misc/cronjobs/cleanup_database.pl | 209 +++++---- tools/picture-upload.pl | 458 ++++++++++++-------- 14 files changed, 538 insertions(+), 326 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 7 19:18:27 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Nov 2014 18:18:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-971-g1e5097d 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 1e5097d0fa62037ab9fad093f42629064f97b610 (commit) via d7de9609ca9023900f03f368e174152f95862b38 (commit) via 3eb293e9dac6267065f7cd8279ffded3a95e1b88 (commit) via a71b96295fb07084e4f87ac1a471e89355f3c5a4 (commit) via d536bb46f72b3c2479c5fa6fae242e3531fdae7b (commit) via 8dfc4326e8cd63e41726d3a162286cd1f9736011 (commit) via 81ff0a449dc9404d87b6324df362900f642bbef2 (commit) via fed11629e79fbb30beabe65dbed11155ac848f9a (commit) via 1c2744a83f99027386f9409ad43e725707ae45f8 (commit) via 9e977e85c54efe176526b9638991801dfd64d74e (commit) via f9e3891050cc07761c6781658dd1c25dba70d6d1 (commit) via ba3c3df6f951a363412d171f3a995d48a4f3b096 (commit) via b27c2e6026cb16d8a77f0b8aa90a9d9e121b1784 (commit) via 5afb6a30cac4b7df33e0123348734bb493e8d0a3 (commit) from aef500f6a3168be665d2a38e9aa2c745c6e24c78 (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 1e5097d0fa62037ab9fad093f42629064f97b610 Author: Katrin Fischer Date: Thu Aug 28 13:32:35 2014 +0200 Bug 12334: Make it easy to hide parts of material type and format information in results With the system preferences DisplayIconsXSLT and DisplayOPACiconsXSLT we control the visibility of the material type, format and audience information in staff and OPAC. Sometimes a library might only want to hide a part of that information - for example, hide audience but keep the material type icon. This patch adds CSS classes to make it easier to style this section of the page and hide parts of the information. To test: - Verify that OPAC and staff result lists for various types of materials still display nicely. - Take a look at the HTML and verify, that label and text are now wrapped into a new span with a results_* class. - Try hiding a part of the information, for example in OpacUserCSS: .results_material_type { display none; } Signed-off-by: Bernardo Gonzalez Kriegel Works as described... but for a missing colon on example CSS .results_material_type { display: none; } No koha-qa errors Signed-off-by: Brendan Gallagher Signed-off-by: Tomas Cohen Arazi commit d7de9609ca9023900f03f368e174152f95862b38 Author: Tomas Cohen Arazi Date: Fri Nov 7 15:19:30 2014 -0300 Bug 12250: DBRev 3.17.00.049 Signed-off-by: Tomas Cohen Arazi commit 3eb293e9dac6267065f7cd8279ffded3a95e1b88 Author: Bernardo Gonzalez Kriegel Date: Sat Nov 1 20:04:49 2014 -0300 Bug 12250: Update descriptions for languages, scripts and regions This patch adds/updates languages, scripts and regions to reflect what we currently have on translation server. Languages, scripts and regions are ordered by respective code To test: 1. Apply the patch 2. run updatedatabase.pl, must run without errors 3. Go to advanced search (opac/staff), more options, and check language pulldown (verify you have an empty AdvancedSearchLanguages syspref) 4. Remove contents from language_descriptions, language_rfc4646_to_iso639, language_script_bidi, language_script_mappin and language_subtag_registry 5. Load installer/data/mysql/mandatory/subtag_registry.sql, must load without errors 6. Repeat 3 Signed-off-by: Tomas Cohen Arazi Signed-off-by: Katrin Fischer Tested the SQL, no problems found. Signed-off-by: Tomas Cohen Arazi commit a71b96295fb07084e4f87ac1a471e89355f3c5a4 Author: Jonathan Druart Date: Tue Sep 30 12:19:21 2014 +0200 Bug 12627: Fix default values The default value for *by and *date fields is NULL. But without this patch, the values are 0 or 0000-00-00. It comes from the fact that the form set to an empty string the values and DBIX::Class does not consider them as undefined. This patch is very ugly, not sure how we can fix that. Signed-off-by: Katrin Fischer No regressions found, adding and editing suggestions from OPAC and staff. Passes tests and QA script. Signed-off-by: Tomas Cohen Arazi commit d536bb46f72b3c2479c5fa6fae242e3531fdae7b Author: Jonathan Druart Date: Tue Sep 30 12:56:35 2014 +0200 Bug 12627: Bug 12627: Fix default values - TT changes Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 8dfc4326e8cd63e41726d3a162286cd1f9736011 Author: Jonathan Druart Date: Tue Sep 30 11:25:27 2014 +0200 Bug 12627: Fix date management C4::Dates->today returns a string formatted depending on the dateformat syspref. Before the original patch, SQLHelper managed both format (string formatted and DateTime. Now DBIX::Class only manages DateTime, so the call to NewSuggestion and ModSuggestion should pass a DateTime object Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 81ff0a449dc9404d87b6324df362900f642bbef2 Author: Jonathan Druart Date: Mon Sep 29 15:24:36 2014 +0200 Bug 12627: Remove warnings suggestion.pl: keys on reference is experimental Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit fed11629e79fbb30beabe65dbed11155ac848f9a Author: Jonathan Druart Date: Mon Sep 29 15:18:31 2014 +0200 Bug 12627: DBIx::Class is case sensitive for column names STATUS should be "STATUS", not "status". Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 1c2744a83f99027386f9409ad43e725707ae45f8 Author: Yohann Dufour Date: Fri Aug 8 15:11:18 2014 +0200 Bug 12627: SQLHelper replacement - C4::Suggestions With this patch, the subroutines NewSuggestion and ModSuggestion use DBIx::Class instead of C4::SQLHelper. Moreover, the tests and the .pl have been adapted. Test plan: 1) Apply the patch. 2) Execute the unit tests by launching : prove t/db_dependent/Suggestions.t 3) The result has to be a success without error or warning : t/db_dependent/Suggestions.t .. ok All tests successful. Files=1, Tests=91, 2 wallclock secs ( 0.05 usr 0.01 sys + 1.65 cusr 0.09 csys = 1.80 CPU) Result: PASS 4) Log in the intranet, create a suggestion and verify the created suggestion. 5) Edit a suggestion from the intranet and verify the suggestion is correctly modified. 6) Log in the OPAC and verify you can add a suggestion. Signed-off-by: Bernardo Gonzalez Kriegel Test pass, suggestion created on staff and opac, suggestion edited without problems, no koha-qa errors. Signed-off-by: Katrin Fischer Passes tests and QA script: Also tested: - adding suggestion from staff and OPAC - edit suggestion from staff - deleting suggestion from OPAC - changing to a normal status (email got created) - changing to a custom status (SUGGEST_STATUS) - display of custom status in OPAC No problems found. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 9e977e85c54efe176526b9638991801dfd64d74e Author: Owen Leonard Date: Tue Oct 21 14:31:25 2014 -0400 Bug 13123 - Duplicate label ids for language and opaclanguages When enabling or disabling a OPAC language choice clicking the label triggers the checkbox under the language preference instead. This is because both