From gitmaster at git.koha-community.org Wed Aug 1 17:33:08 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Aug 2018 15:33:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-380-gce96080 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 ce96080f3005be5a63c9f2cab8d4b6c81e9b5b27 (commit) from 96f253d5ed2f1770b42f06554ebb4c4e14b3afdf (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 ce96080f3005be5a63c9f2cab8d4b6c81e9b5b27 Author: Jonathan Druart Date: Tue Jul 31 15:24:10 2018 -0300 Bug 21133: Fix use statements order Basically the idea is: 1. Undefined subroutine &C4::Items::ModZebra called at /home/vagrant/kohaclone/C4/Items.pm line 302. => Then use C4::Items before C4::Biblio 2. Undefined subroutine &C4::Circulation::GetItem called at /home/vagrant/kohaclone/C4/Circulation.pm line 1290 => Then use C4::Circulation before C4::Items And sometimes these 2 rules do not work... Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/Branch.t | 2 +- t/db_dependent/Circulation/Chargelostitem.t | 2 +- t/db_dependent/Circulation/CheckIfIssuedToPatron.t | 9 +++------ t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t | 2 +- t/db_dependent/Circulation/IsItemIssued.t | 2 +- .../Circulation/IssuingRules/maxsuspensiondays.t | 2 +- t/db_dependent/Circulation/Returns.t | 4 ++-- t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 4 ++-- t/db_dependent/Circulation/TooMany.t | 4 ++-- t/db_dependent/Circulation/issue.t | 4 ++-- t/db_dependent/Circulation/transfers.t | 4 ++-- t/db_dependent/CourseReserves.t | 4 ++-- t/db_dependent/Holds.t | 9 +++++---- t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t | 2 +- t/db_dependent/Holds/LocalHoldsPriority.t | 3 ++- t/db_dependent/Holds/RevertWaitingStatus.t | 12 +++++------- t/db_dependent/Items.t | 9 +++------ t/db_dependent/Items/AutomaticItemModificationByAge.t | 2 +- t/db_dependent/Items/DelItem.t | 7 ++----- t/db_dependent/Koha/Biblios.t | 2 +- t/db_dependent/Koha/Object.t | 3 ++- t/db_dependent/Koha/Patrons.t | 4 +--- t/db_dependent/Labels/t_Batch.t | 2 +- t/db_dependent/Members/GetAllIssues.t | 2 +- t/db_dependent/Members/IssueSlip.t | 2 +- t/db_dependent/Patron/Borrower_Discharge.t | 4 ++-- t/db_dependent/Reserves.t | 2 +- t/db_dependent/RotatingCollections.t | 4 ++-- t/db_dependent/ShelfBrowser.t | 2 +- t/db_dependent/api/v1/holds.t | 2 +- 30 files changed, 53 insertions(+), 63 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 14:45:05 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 12:45:05 +0000 Subject: [koha-commits] main Koha release repository branch 17.11.x updated. v17.11.08-27-g60ee36a 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, 17.11.x has been updated via 60ee36a1e025bd1f075957b7875b8fa5111fc2cf (commit) via 1ea32136b526c92b1d4f6a7d0db849786692514e (commit) via d397a1b66743f5714a3d87275b89330304906faf (commit) from 0865b082d2e2f37722fdd06dfca052f5a7866faf (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 60ee36a1e025bd1f075957b7875b8fa5111fc2cf Author: Victor Grousset Date: Fri May 11 17:43:33 2018 +0200 Bug 20623: (QA follow-up) avoid fetch() calls in some cases Signed-off-by: Jonathan Druart (cherry picked from commit 35d887fece0634eb92d030b959aeb991f10a0239) Signed-off-by: Fridolin Somers commit 1ea32136b526c92b1d4f6a7d0db849786692514e Author: Marcel de Rooy Date: Fri May 11 11:33:32 2018 +0200 Bug 20623: (QA follow-up) Remove one find call Imo these somewhat weird lines ask for improvement, but I don't want to change the exact conditions here. Just removing the need to call find twice. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 1bc3bbfdc78bfd559fec841c6ca47ddcbeb0f179) Signed-off-by: Fridolin Somers commit d397a1b66743f5714a3d87275b89330304906faf Author: Victor Grousset Date: Fri Apr 20 11:17:26 2018 +0200 Bug 20623: Fix basket group PDF when itemtype not itemtype table When an item has an itemtype not in the itemtype table. Trying to fetch it's description lead to an error. Using authorized values like ccode to populate the itemtypes of the biblioitems (instead of the itemtype table) can lead to such data. Or importing records with invalid itemtype codes. Koha doesn't do enough checks at import to at least warn about these issues. == Test plan == 1. first we need an item with an itype not in the item_types table 1. download a record as MARCXML 2. find it's item type in administration; and the related code 3. open the MARCXML file and search for occurences of the code and replace them by some non-existing value like "FOOBAR" 4. also change the barcode so it won't be ignored because it's a duplicate 5. also change the title to easily find it later in the search 6. tools ? "Stage MARC records for import" 7. upload your file 8. "stage for import" 9. click "Manage staged records" You should end on the page related to your staged record 10. "Import this batch into the catalog" 2. now we need it in a basket group 1. have/create a active budget 2. have/create a fund 3. have/create a vendor with minimal info 4. create a basket with minimal info 5. add our imported item to the basket for example search it by name 6. go to the basket. URL should be /cgi-bin/koha/acqui/basket.pl?basketno=XXXXX 7. close this basket and tick "Attach this basket to a new basket group with the same name" 8. you will end up in the basket groups lists 9. go to the "closed" tab 11. go to the basket group your vendor page => Basket groups => Closed 3. export as PDF, it should fail (internal server error) this is the bug (no kidding ^_^) 4. apply this patch 5. reexport the basket as PDF 6. it should work 7. create an item type (in administration) that has the same code as the one that you put in the MARCXML 8. reexport the basket as PDF 9. check that in the PDF that the description is here: table at the bottom of the document ? "Document" column Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart (cherry picked from commit 3811985c3a55b72900ba005c6867059776ee9281) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: acqui/basketgroup.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 15:23:14 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 13:23:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-383-gb7fa3b9 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 b7fa3b9b43bce1bae3d7fcdc76775cc84b83433d (commit) via d65ab39699c0406f7438e2c7f1d0d36e233f2d7b (commit) via 336c54860531253d860165dc9a6d406892b1600a (commit) from ce96080f3005be5a63c9f2cab8d4b6c81e9b5b27 (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 b7fa3b9b43bce1bae3d7fcdc76775cc84b83433d Author: Jonathan Druart Date: Wed Aug 1 09:59:01 2018 -0300 Bug 21136: Fix add/edit patron when cities are defined Same as bug 21085. When cities are defined, there is a select with name="select_city" added to the DOM and its value will be passed to memberentry.pl We must remove it from the attribute list before creating the Koha::Patron object No property select_city for Koha::Patron at /usr/share/perl5/Exception/Class/Base.pm line 73 Test plan: Define cities Add or edit a patron, save Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit d65ab39699c0406f7438e2c7f1d0d36e233f2d7b Author: Jonathan Druart Date: Tue Jul 31 10:09:40 2018 -0300 Bug 21129: Fix typo created vs created_by Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi commit 336c54860531253d860165dc9a6d406892b1600a Author: Blou Date: Fri Jul 27 11:41:16 2018 -0400 Bug 21129: New ALTER IGNORE TABLE entries need correction in updatedatabase.pl Bug 17234 made an effort to remove the ALTER IGNORE from updatedatabase.pl so that it could work with Mysql 5.7. But new entries have since been added to it: Bug 12395 - 18.06.00.005 Bug 19524 - 18.06.00.006 Bug 13560 - 18.06.00.008 This is corrected using column_exists to validate the existence of the new columns before ALTER Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 16 +++++++++++----- members/memberentry.pl | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 15:29:55 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 13:29:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-385-g6e0548c 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 6e0548cc1a7a924731bd414fec2f7917f044040a (commit) via 0b89cbf6a473e71597bc051d88c2152531648ad8 (commit) from b7fa3b9b43bce1bae3d7fcdc76775cc84b83433d (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 6e0548cc1a7a924731bd414fec2f7917f044040a Author: Owen Leonard Date: Thu Jul 19 16:57:42 2018 +0000 Bug 21094: Syndetics: always use https instead of http This patch removes the 'using_https' check in OPAC templates in calls to Syndetics resources. Instead, https is always used. To test, apply the patch and enable Syndetics-related preferences. View the following pages in the OPAC: - Bibliographic detail page - Browse shelf section of the bibliographic detail page - Search results - List contents - Recent comments - Recent comments RSS - User summary page - Circulation history NOTE: I tested with made-up Syndetics credentials. This means my changes didn't make the template explode, but it doesn't confirm conclusively that the resources work. Signed-off-by: John Doe Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 0b89cbf6a473e71597bc051d88c2152531648ad8 Author: Katrin Fischer Date: Sun Jul 15 19:27:03 2018 +0200 Bug 21077: Fix database documentation for statistics.type There's a typo for 'locause', this should be 'localuse'. Also, 'Credit*' is never used. Signed-off-by: Maryse Simard Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/kohastructure.sql | 2 +- .../bootstrap/en/includes/shelfbrowser.inc | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 44 ++++---------------- .../bootstrap/en/modules/opac-readingrecord.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 6 +-- .../bootstrap/en/modules/opac-showreviews-rss.tt | 6 +-- .../bootstrap/en/modules/opac-showreviews.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 +----- 9 files changed, 17 insertions(+), 77 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 15:35:36 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 13:35:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-388-gc6b50f0 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 c6b50f0bac092779f93033c8a3f002cb8722d7d4 (commit) via 552873f7d466abee6919414b8d2f5e6c99f9a44f (commit) via 10720d2a5c50b82d565cab9ad70c8498164d81b2 (commit) from 6e0548cc1a7a924731bd414fec2f7917f044040a (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 c6b50f0bac092779f93033c8a3f002cb8722d7d4 Author: David Cook Date: Tue Jul 3 19:04:50 2018 +1000 Bug 21031: Apache Rewrite rules don't work for API when using anything but Debian package Plack configuration The Rewrite rules for Apache don't work unless you're using debian/templates/apache-shared-opac-plack.conf or debian/templates/apache-shared-intranet-plack.conf. This patch fixes the Rewrite rules for the non-Plack Debian Apache configuration templates as well as the standard Apache configuration file that comes with Koha. __BEFORE APPLYING__ 1. Visit /api/v1/app.pl/api/v1/spec on your git dev install 2. This should display a large page of JSON 3. Visit /api/v1/spec on your git dev install 4. This should generate a 404 error __APPLY PATCH__ __AFTER APPLYING__ 5. Visit /api/v1/app.pl/api/v1/spec on your git dev install 6. This should display a large page of JSON 7. Visit /api/v1/spec on your git dev install 8. This should display a large page of JSON (identical to the one from earlier steps) Signed-off-by: Ere Maijala Signed-off-by: Marcel de Rooy Passed QA with few notes posted separately to Bugzilla. Signed-off-by: Tomas Cohen Arazi commit 552873f7d466abee6919414b8d2f5e6c99f9a44f Author: Andrew Isherwood Date: Tue May 15 16:00:02 2018 +0100 Bug 20770: ILL loans OPAC form notes field allow arbitrary input This patch addresses the lack of sanitization of the "notes" field on the OPAC "View Interlibrary loan request" page. To test: - Apply the patch - As an OPAC user, create an ILL request - Navigate to the request's "View Interlibrary loan request" page - Add the following note: Hello

TESTING

- Click "Submit modifications" - TEST: Observe, when the page reloads, only the following is preserved in the "Notes" textarea: Hello TESTING - As a staff user, naviate to the ILL requests table - Select "Manage request" for the request you created - TEST: Observe that the Notes field only contains: Hello TESTING - TEST: Observe that no Javascript alert is displayed Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 10720d2a5c50b82d565cab9ad70c8498164d81b2 Author: Liz Rea Date: Thu Jul 26 16:26:15 2018 +1200 Bug 21122: Fix check-url-quick when utf8 characters in URL's To test: Make a record with a URL that has a UTF8 character, such as: http://some.nonexistent.tld/M?oriWomenAotearoa.pdf Run the check-url-quick.pl job, notice it dies at that URL Apply this patch Test again, it should work. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: debian/templates/apache-shared-intranet.conf | 6 ++---- debian/templates/apache-shared-opac.conf | 6 ++---- etc/koha-httpd.conf | 13 +++++-------- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++++ .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 4 ++-- misc/cronjobs/check-url-quick.pl | 2 ++ 7 files changed, 19 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 15:55:08 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 13:55:08 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-14-g50f4e86 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, 18.05.x has been updated via 50f4e8635056d7b664b846db91d48bf282fef949 (commit) via 1d9ae5ecc60a875e82f861ed9267d76c09f9335b (commit) via af2c813745657e5c367bad776beb6c956e6e16db (commit) via 15040308a44d8ac8e48f13146bf97befd3294bb4 (commit) via f9f270efd6f40afdd3be861d7bd77e29bff769ec (commit) via a332214dd3880856c3577476ad45018896faf113 (commit) via 9f52475eadb530ffc7be959444503c4d9d9ab26b (commit) via 585a10e070136b231d88b8ff4099b4085a2b656c (commit) via 9d025f422b372c3cb0383dd6cced89d7d15f088e (commit) via a9237380b51b297d4be2f9f9eb7c9bd6fda0ec26 (commit) via 9b61f7e664d5a6dfb00d39b9ca6030e622df5313 (commit) via 19f1352794665620dfd4f698a6b6f15e52afd91e (commit) via 12e8634c00453a6ee072e7988b2ffdc7a8936991 (commit) via 781b254ee1885cf7019ab7f635cfc91ffa3e3b3e (commit) from 581957844182e4970b39401ae8cf2757dc335a04 (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 50f4e8635056d7b664b846db91d48bf282fef949 Author: Nick Clemens Date: Fri Jul 13 17:49:14 2018 +0000 Bug 21076: Don't call autocomplete code after patron found To test: 1 - Enable article requests 2 - Search on staff client 3 - Click 'Request article' 4 - Find a patron 5 - View error in console 6 - Apply patch 7 - Reload 8 - Not error is gone Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 5a9bad787458411c790d26b3b115fe3e7e2e0ab2) Signed-off-by: Martin Renvoize commit 1d9ae5ecc60a875e82f861ed9267d76c09f9335b Author: Katrin Fischer Date: Sun Jul 15 20:00:44 2018 +0200 Bug 16575: (follow-up) Compiled CSS This patch contains the compiled CSS for the OPAC print stylesheet. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit c02543baaab99841405ba9a47d894e54e7a8a27a) Signed-off-by: Martin Renvoize commit af2c813745657e5c367bad776beb6c956e6e16db Author: Owen Leonard Date: Wed May 30 14:15:19 2018 +0000 Bug 16575: Irregular behaviour using window.print() followed by window.location.href This patch updates the OPAC and staff client carts to use CSS to control print output, removing a print parameter which was passed to the script. Currently, when you click "Print" on the OPAC basket, it navigates to a new page and initiates window.print() followed by a window.location.href change again. Unfortunately, due to differences in IE, Chrome, and FF, it will either show the print options, navigate away without showing them, or refuse to navigate away after printing. By changing to using print CSS, we don't navigate away from the basket in the first place, so we prevent this irregular behavior. TEST PLAN 1) Apply the patch 2) Create an OPAC basket by clicking "Add to cart" on multiple items 3) Using Chrome, IE, and Firefox (of any version), click the "Print" button 4) You should see the relevant print menu without the OPAC basket re-loading in any way. 5) After printing is complete, you should still be on the OPAC basket pop-up 6) Perform the same tests in the staff client Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit a9836864dcbe4c11d370c245511ee4b9d6bd33f3) Signed-off-by: Martin Renvoize commit 15040308a44d8ac8e48f13146bf97befd3294bb4 Author: Jonathan Druart Date: Fri Jun 29 17:36:51 2018 -0300 Bug 20806: Surround string by span tag to help translation Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit eac802b712bd60c8307da7b6f709d347ffa4ffe3) Signed-off-by: Martin Renvoize commit f9f270efd6f40afdd3be861d7bd77e29bff769ec Author: Jonathan Druart Date: Fri Jun 29 17:30:39 2018 -0300 Bug 20806: Do not rely on column position It is not the first time we have this splice call, it seems safer to rely on the column's name instead of the column's position Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 2a369663fd37c41fb3ac810a8f42d84d69fa6f02) Signed-off-by: Martin Renvoize commit a332214dd3880856c3577476ad45018896faf113 Author: Josef Moravec Date: Tue May 29 09:15:09 2018 +0000 Bug 20806: Add item type description holds history page Test plan: 0) Do not apply the patch 1) Set AllowHoldItemTypeSelection to Allow 2) Place some hold for a patron, some with specific item type and some without item type 3) On holds history page you should see blank or item type code in item type column 4) Apply the patch 5) Now you should see description in item type column 6) Set AllowHoldItemTypeSelection to Don't Allow 7) You shold not see the item type column, but column visibility settings should continue working ;) Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 0c1490ec7111fb6160458463d98ccda333f347b3) Signed-off-by: Martin Renvoize commit 9f52475eadb530ffc7be959444503c4d9d9ab26b Author: Jonathan Druart Date: Tue Jan 23 15:54:41 2018 -0300 Bug 20079: Display stack trace for development installations """The default value is development, which causes plackup to load the middleware components: AccessLog, StackTrace, and Lint unless --no-default-middleware is set.""" Test plan: Confirm that the stack trace is displayed when something is wrong (die somewhere to test) for dev installations (inside a devbox) The -E flag must remain deployment for non-dev installs Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 8520d508a3154c6b30f1e710e518fe3b697a3194) Signed-off-by: Martin Renvoize commit 585a10e070136b231d88b8ff4099b4085a2b656c Author: Owen Leonard Date: Mon Jul 16 18:41:13 2018 +0000 Bug 21038: Reserves should be holds This patch corrects the text of the warning about discharges cancelling holds. To test, apply the patch and view the discharge for a patron who has holds: - "Borrower" is changed to "patron" - "reserves" is changed to "holds" - "canceled" (18 instances in the templates) is changed to "cancelled" (51 instances). Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 8202f95ad7001a5046f9f40e6322406b253ba3ed) Signed-off-by: Martin Renvoize commit 9d025f422b372c3cb0383dd6cced89d7d15f088e Author: Tomas Cohen Arazi Date: Mon Jul 2 16:18:33 2018 -0300 Bug 20942: (QA follow-up) Use $lines->total_outstanding This patch makes the controller code use $lines->total_outstanding instead of expecting ->outstanding_debits and ->outstanding_credits return the total. Tests should pass as before. No behaviour change is expected. To test: - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: Tests still pass, no behaviour change. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 6672b26d16065d877d6d7300830fc3d619b09898) Signed-off-by: Martin Renvoize commit a9237380b51b297d4be2f9f9eb7c9bd6fda0ec26 Author: Tomas Cohen Arazi Date: Mon Jun 25 14:55:30 2018 -0300 Bug 20942: Split debit and credit lines This patch splits the balance to match this object schema: { balance => #, outstanding_credits => { total => #, lines => [ credit_line_1, ..., credit_line_n ] }, outstanding_debits => { total => #, lines => [ debit_line_1, ..., debit_line_m ] } } This change is made to ease usage from the UI. Also because the outstanding credits need to be applied to outstanding debits in order to the balance value to make sense. So we still need to have each total. Tests are added for this change, and the schema files are adjusted as well. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: Tests pass! - Sign off :-D staff_id is changed into user_id as voted on the dev meeting the RFC got approved. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit bb7c908dc06697a4ebbf8633897d24e26798cb6d) Signed-off-by: Martin Renvoize commit 9b61f7e664d5a6dfb00d39b9ca6030e622df5313 Author: Tomas Cohen Arazi Date: Wed Jun 13 14:02:44 2018 -0300 Bug 20942: Add route to get patron's account balance This patch implements the /patrons/{patron_id}/account endpoint. It can be used to get the patron's balance information, including outstanding lines. To test: - Apply this patchset - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: tests pass! - Make your favourite REST testing tool (RESTer on Firefox?) do: GET /api/v1/patrons/{patron_id}/account to a valid patron_id. Play with Koha's UI to add credits/payments and notice the endpoint returns the right info following the voted RFC. [1] - Sign off :-D [1] https://wiki.koha-community.org/wiki/Patrons_account_lines_endpoint_RFC Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit d079c80b05b36a177c80d8f585ae1515092e6ddb) Signed-off-by: Martin Renvoize commit 19f1352794665620dfd4f698a6b6f15e52afd91e Author: Tomas Cohen Arazi Date: Wed Jun 13 14:02:30 2018 -0300 Bug 20942: Unit tests for /patrons/{patron_id}/account This patch adds tests for the /patrons/{patron_id}/account endpoint. To test: - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => FAIL: Tests should fail because the endpoint is not implemented. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 7cbff1bce1608016e8b8ceded7633678189b75cc) Signed-off-by: Martin Renvoize commit 12e8634c00453a6ee072e7988b2ffdc7a8936991 Author: Tomas Cohen Arazi Date: Fri Jun 1 16:04:35 2018 -0300 Bug 20942: OpenAPI spec for /patrons/{patron_id}/account This patch adds the OpenAPI spec for the following paths: - /patrons/{patron_id}/account It also adds object definitions for: - balance - account line Account line is to be used on both /account/lines (when implemented) and for embeding the outstanding lines in the balance endpoint (/patrons/{patron_id}/account). Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit d383b49987b8e5471cb9f30ed879e1311e762b26) Signed-off-by: Martin Renvoize commit 781b254ee1885cf7019ab7f635cfc91ffa3e3b3e Author: Martin Renvoize Date: Wed Aug 1 09:01:44 2018 +0100 Bug 6647: Revert - Label item search should use standard pagination routine" This reverts commit 35fb1fe67cef029201eef6fd53c2d0e4af82195c which depends on a bug not being backported to the 18.05.x branch. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/REST/V1/Patrons/Account.pm | 165 ++++++++++++++++++ api/v1/swagger/definitions.json | 7 +- api/v1/swagger/definitions/account_line.json | 81 +++++++++ api/v1/swagger/definitions/patron_balance.json | 40 +++++ api/v1/swagger/paths.json | 3 + api/v1/swagger/paths/patrons_account.json | 65 +++++++ basket/basket.pl | 2 - debian/scripts/koha-plack | 5 + koha-tmpl/intranet-tmpl/prog/css/print.css | 30 +++- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 5 + .../intranet-tmpl/prog/en/modules/basket/basket.tt | 55 ++---- .../prog/en/modules/circ/request-article.tt | 38 +++-- .../intranet-tmpl/prog/en/modules/labels/result.tt | 53 +++--- .../prog/en/modules/members/discharge.tt | 2 +- .../prog/en/modules/members/holdshistory.tt | 21 ++- koha-tmpl/intranet-tmpl/prog/js/basket.js | 3 +- koha-tmpl/opac-tmpl/bootstrap/css/print.css | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 4 +- koha-tmpl/opac-tmpl/bootstrap/less/print.less | 17 +- t/db_dependent/api/v1/patrons_accounts.t | 178 ++++++++++++++++++++ 20 files changed, 683 insertions(+), 93 deletions(-) create mode 100644 Koha/REST/V1/Patrons/Account.pm create mode 100644 api/v1/swagger/definitions/account_line.json create mode 100644 api/v1/swagger/definitions/patron_balance.json create mode 100644 api/v1/swagger/paths/patrons_account.json create mode 100644 t/db_dependent/api/v1/patrons_accounts.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 16:32:19 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 14:32:19 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-22-g8817812 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, 18.05.x has been updated via 881781240cf0c1a487da1d05732dab300d6e1be7 (commit) via b1a07f712c23e62c830117d4c0ca1390044dc25c (commit) via 8191625667162ac240a5d0e4d180632bcf100884 (commit) via 5094909140081b02c9688faa07fc630feab91f24 (commit) via c76d5b4b4a531e408fbaa5a9a7a523a749638764 (commit) via 517827fb9c2e69d58d8e9345ba2d259de08efded (commit) via f60c611972fe0442ee66f6ebf3a40f00bd11efcc (commit) via 512ee5d57617c63da90be09268a77a0317c9e886 (commit) from 50f4e8635056d7b664b846db91d48bf282fef949 (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 881781240cf0c1a487da1d05732dab300d6e1be7 Author: David Cook Date: Fri Jul 20 18:13:49 2018 +1000 Bug 21097: Missing optgroup closing tag in orderreceive.tt There is a missing optgroup closing tag in orderreceive.tt. It doesn't actually cause any display issues (at least in modern browsers), but it's invalid markup, so this patch fixes it. _TEST PLAN_ 0. Add a budget and add a fund 1. Add a vendor 2. Add a basket 3. Add an order to a basket 4. Close the basket 5. Receive the order 6. Make sure the budget and fund both display when selecting the fund Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 12e18f91be2a26501fba502d5f1106d66b06caee) Signed-off-by: Martin Renvoize commit b1a07f712c23e62c830117d4c0ca1390044dc25c Author: Nick Clemens Date: Mon Jul 23 12:23:07 2018 +0000 Bug 20811: (RM follow-up) fix check for matching Notice should only be triggered if both settings are false Signed-off-by: Nick Clemens (cherry picked from commit 12b505f2b797d77e800a17830f71a9c054cd076b) Signed-off-by: Martin Renvoize commit 8191625667162ac240a5d0e4d180632bcf100884 Author: Marcel de Rooy Date: Fri Jul 20 11:46:58 2018 +0200 Bug 20811: (QA follow-up) Prevent calling AddItemBatchFromMarc and ModBiblioMarc without biblionumber If you use -update but do not find matches (or did not want to match), you should not call those routines. We should warn and skip this record. Adding a warn at the start that the choice of options may not be smart. Note that this needs further attention somewhere else. You could mix -update with -insert for instance and still see some problems. (May depend on items with unique barcode etc.) Test plan: Run -update without match or isbn. Or run -update -isbn with a non-matching ISBN. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 15b865c6ee558ef278f911ba3693c38c024c7f11) Signed-off-by: Martin Renvoize commit 5094909140081b02c9688faa07fc630feab91f24 Author: Marcel de Rooy Date: Fri Jul 20 11:21:11 2018 +0200 Bug 20811: (QA follow-up) Make the isbn check work The following code was never reached, since $isbn was not filled. if (!$biblionumber && $isbn_check && $isbn) { $sth_isbn->execute($isbn); ($biblionumber,$biblioitemnumber) = $sth_isbn->fetchrow; } Solution: Fix the code with two $isbn declarations. Move the checkisbn condition a level deeper. Test plan: Run misc/migration_tools/bulkmarcimport.pl -file bib726.utf8 --update -isbn Since you do not match on biblionumber, the ISBN should match. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit a49a7f08d6dbaf992d70420dae744c75c2ad8aae) Signed-off-by: Martin Renvoize commit c76d5b4b4a531e408fbaa5a9a7a523a749638764 Author: Jonathan Druart Date: Mon May 28 15:19:09 2018 -0300 Bug 20811: Fix wrong usage of ModBiblio Since commit cefa7c21e28b88351ee8ae0dfefb80a515323df9 Bug 5635: bulkmarcimport new parameters & features AddBiblio call has been replaced with ModBiblio, but the return values are different. We should not replace the value of $biblionumber with what returns this subroutine. Test plan: If you are familiar with bulkmarcimport.pl you should know what to test, I am not. Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit d15185025a146656a1ad0d7d5a8eb261581c0f1e) Signed-off-by: Martin Renvoize commit 517827fb9c2e69d58d8e9345ba2d259de08efded Author: Owen Leonard Date: Thu Jun 21 13:37:35 2018 +0000 Bug 20974: Remove files left behind after removing Solr Some files were left behind when Bug 12538 removed support for Solr. This patch removes them. To test, apply the patch and fail to observe the existence of these files: koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc Perform a search in the OPAC to confirm that nothing broke. Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit ad34ef74cdee0f204c03cdf88b1db775768a44fe) Signed-off-by: Martin Renvoize commit f60c611972fe0442ee66f6ebf3a40f00bd11efcc Author: Nick Clemens Date: Thu Jul 12 10:18:10 2018 +0000 Bug 21064: Use undefined instead of undef To test: 1 - Load the advanced cataloging editor 2 - Refresh the page several times 3 - Check the JS console, you shoudl see an error: 'undef is not defined' 4 - Apply patch 5 - Try again, should be no error Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 367f47c416fa9164ccb8d9e5f50772e5a516d6b7) Signed-off-by: Martin Renvoize commit 512ee5d57617c63da90be09268a77a0317c9e886 Author: Jonathan Druart Date: Wed Jul 11 18:55:06 2018 -0300 Bug 21053: Encode URI characters in plugin 008 A # (or &) at any position in 008 field of a bib record causes all subsequent data in field to be overwritten with default values when record is saved. These characters need to be correctly encoded before being passed as parameters of the url To reproduce: 1. Find and edit a bib record which has an 008 which differs from the default values for the MARC framework 2. Choose 008 helper 3. Add # in any position before the end of the field noting the current values of the data 4. Save record 5. Edit record and select 008 helper 6. Review characters after # Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit bfdf896111849454ade806bf49f48f1de5f626be) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: cataloguing/value_builder/marc21_field_008.pl | 2 +- .../prog/en/includes/cateditor-ui.inc | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 1 + .../bootstrap/en/includes/search/facets.inc | 56 -------------------- .../bootstrap/en/includes/search/page-numbers.inc | 18 ------- .../bootstrap/en/includes/search/resort_form.inc | 23 -------- misc/migration_tools/bulkmarcimport.pl | 13 +++-- 7 files changed, 12 insertions(+), 103 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 17:35:31 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 15:35:31 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-24-g9bbc1fc 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, 18.05.x has been updated via 9bbc1fc7b10000e65ba68b51781b01c9bba4ec7d (commit) via 97825af008ba57f7d7229ddb6ce9318e67e22e18 (commit) from 881781240cf0c1a487da1d05732dab300d6e1be7 (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 9bbc1fc7b10000e65ba68b51781b01c9bba4ec7d Author: Martin Renvoize Date: Thu Aug 2 16:20:51 2018 +0100 Bug 20942: Revert - Too many missing dependancies Signed-off-by: Martin Renvoize commit 97825af008ba57f7d7229ddb6ce9318e67e22e18 Author: Chris Nighswonger Date: Wed Jul 4 11:23:11 2018 -0400 Bug 8604: Patron cards made for patrons which don't have patron images use preceding card's image This patch corrects referential problems which caused the script to "re-use" images as well as other sorts of bad image behaviour. To test: 1. Ensure that you can reproduce the original bug or some variation thereof using the steps described in either of these two comments: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8604#c0 https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8604#c6 NOTE: This is not an easy bug to reproduce. 2. Once you can reproduce the bug, apply this patch and follow the same steps used to reproduce the bug. 3. Observe that the symptoms are corrected. Signed-off-by: Chris Nighswonger Signed-off-by: Christian Stelzenm?ller Signed-off-by: Marcel de Rooy Reproduced the bug and resolved it with this patch. Code is hard to read; exact cause of the problem was not fully uncovered. Fixed spelling 'Destory' => 'Destroy' Signed-off-by: Nick Clemens (cherry picked from commit b5e60f15478a998f945ebc59b2c13ce9d37b8818) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/REST/V1/Patrons/Account.pm | 165 ---------------------- api/v1/swagger/definitions.json | 7 +- api/v1/swagger/definitions/account_line.json | 81 ----------- api/v1/swagger/definitions/patron_balance.json | 40 ------ api/v1/swagger/paths.json | 3 - api/v1/swagger/paths/patrons_account.json | 65 --------- patroncards/create-pdf.pl | 57 ++++---- t/db_dependent/api/v1/patrons_accounts.t | 178 ------------------------ 8 files changed, 34 insertions(+), 562 deletions(-) delete mode 100644 Koha/REST/V1/Patrons/Account.pm delete mode 100644 api/v1/swagger/definitions/account_line.json delete mode 100644 api/v1/swagger/definitions/patron_balance.json delete mode 100644 api/v1/swagger/paths/patrons_account.json delete mode 100644 t/db_dependent/api/v1/patrons_accounts.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 2 19:18:42 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Aug 2018 17:18:42 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-40-ga73d455 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, 18.05.x has been updated via a73d45534fe578ab3b425506aa5701ecb36065d9 (commit) via 66faf4dd1c0397e7873985a446f536e36694716f (commit) via 477cee1ae93307a0257001514d8f2d693fe2dcdd (commit) via 2dd7b408b3844d4b6a3d808c69f0a5d520132e29 (commit) via ac321e17d9e0f106eebdc809e1b790da56326949 (commit) via 6ee9d8a888fa32a737116c15e9e5e5cae2f6653d (commit) via d5ab20c1c9a6feaba592700ed4b4be87ae6f8ff2 (commit) via 1739fbf44b659d7a3891f2d3aea740552cd9b0a2 (commit) via 3e1519beccd65550763f664ce5c734a39610ccac (commit) via 266f6f55bf4ba26c287d2258825463861456bf86 (commit) via 2105982b1a1c2b4e5ebbb8968679fd47b43f5670 (commit) via 8063bec2a87ecab7e5bd6d58ea7b1add9a5986f3 (commit) via 450a2e75927d2aff4b7ad2d4643dd253972c9f1c (commit) via 3572fd14045ddf0d5025c932c23380671d623569 (commit) via 665faa45e7178d0fe916125246986f81bc8e1103 (commit) via 359a045cfc331cf2a928fbe0cff11792c8a6959c (commit) from 9bbc1fc7b10000e65ba68b51781b01c9bba4ec7d (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 a73d45534fe578ab3b425506aa5701ecb36065d9 Author: Tomas Cohen Arazi Date: Mon Jul 2 16:18:33 2018 -0300 Bug 20942: (QA follow-up) Use $lines->total_outstanding This patch makes the controller code use $lines->total_outstanding instead of expecting ->outstanding_debits and ->outstanding_credits return the total. Tests should pass as before. No behaviour change is expected. To test: - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: Tests still pass, no behaviour change. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 6672b26d16065d877d6d7300830fc3d619b09898) Signed-off-by: Martin Renvoize commit 66faf4dd1c0397e7873985a446f536e36694716f Author: Tomas Cohen Arazi Date: Mon Jun 25 14:55:30 2018 -0300 Bug 20942: Split debit and credit lines This patch splits the balance to match this object schema: { balance => #, outstanding_credits => { total => #, lines => [ credit_line_1, ..., credit_line_n ] }, outstanding_debits => { total => #, lines => [ debit_line_1, ..., debit_line_m ] } } This change is made to ease usage from the UI. Also because the outstanding credits need to be applied to outstanding debits in order to the balance value to make sense. So we still need to have each total. Tests are added for this change, and the schema files are adjusted as well. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: Tests pass! - Sign off :-D staff_id is changed into user_id as voted on the dev meeting the RFC got approved. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit bb7c908dc06697a4ebbf8633897d24e26798cb6d) Signed-off-by: Martin Renvoize commit 477cee1ae93307a0257001514d8f2d693fe2dcdd Author: Tomas Cohen Arazi Date: Wed Jun 13 14:02:44 2018 -0300 Bug 20942: Add route to get patron's account balance This patch implements the /patrons/{patron_id}/account endpoint. It can be used to get the patron's balance information, including outstanding lines. To test: - Apply this patchset - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => SUCCESS: tests pass! - Make your favourite REST testing tool (RESTer on Firefox?) do: GET /api/v1/patrons/{patron_id}/account to a valid patron_id. Play with Koha's UI to add credits/payments and notice the endpoint returns the right info following the voted RFC. [1] - Sign off :-D [1] https://wiki.koha-community.org/wiki/Patrons_account_lines_endpoint_RFC Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit d079c80b05b36a177c80d8f585ae1515092e6ddb) Signed-off-by: Martin Renvoize commit 2dd7b408b3844d4b6a3d808c69f0a5d520132e29 Author: Tomas Cohen Arazi Date: Wed Jun 13 14:02:30 2018 -0300 Bug 20942: Unit tests for /patrons/{patron_id}/account This patch adds tests for the /patrons/{patron_id}/account endpoint. To test: - Run: $ kshell k$ prove t/db_dependent/api/v1/patrons_accounts.t => FAIL: Tests should fail because the endpoint is not implemented. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 7cbff1bce1608016e8b8ceded7633678189b75cc) Signed-off-by: Martin Renvoize commit ac321e17d9e0f106eebdc809e1b790da56326949 Author: Tomas Cohen Arazi Date: Fri Jun 1 16:04:35 2018 -0300 Bug 20942: OpenAPI spec for /patrons/{patron_id}/account This patch adds the OpenAPI spec for the following paths: - /patrons/{patron_id}/account It also adds object definitions for: - balance - account line Account line is to be used on both /account/lines (when implemented) and for embeding the outstanding lines in the balance endpoint (/patrons/{patron_id}/account). Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit d383b49987b8e5471cb9f30ed879e1311e762b26) Signed-off-by: Martin Renvoize commit 6ee9d8a888fa32a737116c15e9e5e5cae2f6653d Author: Tomas Cohen Arazi Date: Mon Jul 2 15:59:54 2018 -0300 Bug 20990: (QA follow-up) make outstanding_credits return the account lines only This patch was discussed with Jonathan on a QA conversation. It is better to keep this simpler and more reusable. And is the right approach in this case. This patch makes Koha::Account::outstanding_credits return the account lines, code that used the $total value, will just use $lines->total_outstanding; Tests are adjusted accordingly. To test: - Run: $ kshell k$ prove t/db_dependent/Koha/Account.t => SUCCESS: Test pass. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 9bfb3bc3782dd6b516d0144074b57e55cbefae2e) Signed-off-by: Martin Renvoize commit d5ab20c1c9a6feaba592700ed4b4be87ae6f8ff2 Author: Kyle M Hall Date: Tue Jun 26 14:31:40 2018 +0000 Bug 20990: Make same changes that were made to outstanding_debits Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 3e0aa0f3191a570dceb834e4036932d9af3c820e) Signed-off-by: Martin Renvoize commit 1739fbf44b659d7a3891f2d3aea740552cd9b0a2 Author: Josef Moravec Date: Mon Jun 25 18:57:20 2018 +0000 Bug 20990: (follow-up) Fix test description Test plan: prove -v t/db_dependent/Koha/Account.t --> Test message of first test of subtest outtanding_credits correctly says "Outstanding credits total..." Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 9d596553369b2500d0e629aec1b085aa3836190a) Signed-off-by: Martin Renvoize commit 3e1519beccd65550763f664ce5c734a39610ccac Author: Tomas Cohen Arazi Date: Mon Jun 25 11:15:14 2018 -0300 Bug 20990: Add Koha::Account->outstanding_credits This patch adds a method that retrieves (for a patron's account) the outstanding credits (i.e. those that haven't been applied to any debit. To test: - Apply this patches - Run: $ kshell k$ prove t/db_dependent/Koha/Account.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 4ee390cbb7ce0726c4d80c4581ef1a387abb47ce) Signed-off-by: Martin Renvoize commit 266f6f55bf4ba26c287d2258825463861456bf86 Author: Tomas Cohen Arazi Date: Mon Jun 25 11:15:08 2018 -0300 Bug 20990: Unit tests for Koha::Account->outstanding_credits Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 0fb5019b7142396f0cd2cec1132dba767b0c64b2) Signed-off-by: Martin Renvoize commit 2105982b1a1c2b4e5ebbb8968679fd47b43f5670 Author: Nick Clemens Date: Fri Jul 6 12:56:54 2018 +0000 Bug 20980: DBRev 18.05.02.001 Signed-off-by: Nick Clemens (cherry picked from commit 64761e56ccfbf98844d2fc8c7aa68ee608a2b162) Signed-off-by: Martin Renvoize commit 8063bec2a87ecab7e5bd6d58ea7b1add9a5986f3 Author: Tomas Cohen Arazi Date: Fri Jul 6 09:22:29 2018 -0300 Bug 20980: (QA follow-up) Do not delete existing data on tests fix Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit 8a83f1e1a975368c006c698f94357975333fd2d6) Signed-off-by: Martin Renvoize commit 450a2e75927d2aff4b7ad2d4643dd253972c9f1c Author: Tomas Cohen Arazi Date: Sat Jun 23 07:41:15 2018 -0300 Bug 20980: (follow-up) Offset name consistency This patch makes 'credit' account types generate 'Manual Credit' offset. The original patch used 'Payment' but I think the code wants to distinguish between payments and manually added credits (otherwise they would've picked the same accounttype value, and they don't. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 65aacc1b1ded569a259f45c3abd5d1a73c3f37e6) Signed-off-by: Martin Renvoize commit 3572fd14045ddf0d5025c932c23380671d623569 Author: Tomas Cohen Arazi Date: Fri Jun 22 12:24:33 2018 -0300 Bug 20980: (follow-up) Only use UpdateStats for 'payment' and 'writeoff' This patch makes Koha::Account::add_credit record statistics logs (through C4::Stats::UpdateStats) only for the 'payment' and 'writeoff' credit types. Both credit types are whitelisted in UpdateStats, so we keep the current behaviour. Another option would've been to add new account types to the white list, but with the account offsets it seems that using the statistics table for account changes won't be useful for too long, as offsets contain the same (and more) information. To test: - Apply the patch - Run: $ kshell k$ prove t/db_dependent/Koha/Account.t => SUCCESS: Tests pass! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit 7b6c242d972e3edf5b4d75d6023a0ae1dc9d1f9d) Signed-off-by: Martin Renvoize commit 665faa45e7178d0fe916125246986f81bc8e1103 Author: Tomas Cohen Arazi Date: Fri Jun 22 12:23:47 2018 -0300 Bug 20980: Make mancredit.pl use Koha::Account::add_credit This patch makes creating a manual credit from the UI record the account offset as 'Manual Credit', and properly set account_offsets.credit_id instead of account_offsets.debit_id. To test: - Create a manual credit (of 'Credit' type) for a known patron (acevedo?) - Run: $ sudo koha-mysql kohadev > SELECT * FROM account_offsets; => FAIL: The account offset for the manual credit has type=Manual Debit, credit_id=NULL and debit_id=accountlines_id - Run the atomic update: $ updatedatabase - Run: $ sudo koha-mysql kohadev > SELECT * FROM account_offsets; => SUCCESS: The account offset has been corrected and now has type=Manual Credit, credit_id=accountlines_id and debit_id=NULL - Create a new manual credit (of 'Forgiven' type) for a known patron - Run: $ sudo koha-mysql kohadev > SELECT * FROM account_offsets; => SUCCESS: The account offset has been stored correctly as a credit! - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit cc30dc39bf3c8f627865c1a4891fac534266dc03) Signed-off-by: Martin Renvoize commit 359a045cfc331cf2a928fbe0cff11792c8a6959c Author: Tomas Cohen Arazi Date: Thu Jun 21 14:43:34 2018 -0300 Bug 20980: Add 'Manual Credit' and fix existing offsets This patch adds a new offset type 'Manual Credit'. And adds an atomic update for fixing existing offsets. Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Nick Clemens (cherry picked from commit f7ed22d25372bb7a68dcbf1a744b81aeb8657b0a) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Account.pm | 160 ++++++++++++++++++ Koha/REST/V1/Patrons/Account.pm | 165 ++++++++++++++++++ api/v1/swagger/definitions.json | 7 +- api/v1/swagger/definitions/account_line.json | 81 +++++++++ api/v1/swagger/definitions/patron_balance.json | 40 +++++ api/v1/swagger/paths.json | 3 + api/v1/swagger/paths/patrons_account.json | 65 +++++++ installer/data/mysql/account_offset_types.sql | 1 + installer/data/mysql/updatedatabase.pl | 40 +++++ .../prog/en/includes/account_offset_type.inc | 1 + .../prog/en/modules/members/mancredit.tt | 4 +- members/mancredit.pl | 32 ++-- t/db_dependent/Koha/Account.t | 112 +++++++++++- t/db_dependent/api/v1/patrons_accounts.t | 178 ++++++++++++++++++++ 15 files changed, 875 insertions(+), 16 deletions(-) create mode 100644 Koha/REST/V1/Patrons/Account.pm create mode 100644 api/v1/swagger/definitions/account_line.json create mode 100644 api/v1/swagger/definitions/patron_balance.json create mode 100644 api/v1/swagger/paths/patrons_account.json create mode 100644 t/db_dependent/api/v1/patrons_accounts.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 3 15:24:18 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Aug 2018 13:24:18 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-41-g803eb52 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, 18.05.x has been updated via 803eb524c69183957fd30865a6af54e2a513fcb5 (commit) from a73d45534fe578ab3b425506aa5701ecb36065d9 (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 803eb524c69183957fd30865a6af54e2a513fcb5 Author: Martin Renvoize Date: Fri Aug 3 14:09:58 2018 +0100 Bug 20980: (RMaint follow-up) - Fix for missing use after merge Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Koha/Account.t | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 3 15:45:58 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Aug 2018 13:45:58 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-43-g24e4e44 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, 18.05.x has been updated via 24e4e44c749dc7b4d550028ba966023e1145d484 (commit) via eb2a2e4de3e26511b0d38aa05358b75d544f2524 (commit) from 803eb524c69183957fd30865a6af54e2a513fcb5 (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 24e4e44c749dc7b4d550028ba966023e1145d484 Author: Jonathan Druart Date: Mon Jul 23 11:02:02 2018 -0300 Bug 20757: Add pod for ->capture Signed-off-by: Nick Clemens (cherry picked from commit 9eec98d31853737cbb755636c0acb2888e2b2f74) Signed-off-by: Martin Renvoize commit eb2a2e4de3e26511b0d38aa05358b75d544f2524 Author: Jonathan Druart Date: Fri May 11 16:58:07 2018 -0300 Bug 20757: Capture and upload screenshot on selenium errors It is a real pain to debug selenium errors, especially when it is not reproducible locally. This patch capture a screenshot when an error occurred and upload it using the excellent lut.im service provided by framasoft (We could host our own later). Test plan: Modify a selenium script to make it fails (search for find_element) You will see a stack trace followed by a link to framapic.org Signed-off-by: Mark Tompsett Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens (cherry picked from commit 2898b580891e271c102d592c5040122007ee7a73) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/lib/Selenium.pm | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 3 16:37:14 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Aug 2018 14:37:14 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-50-g11b6ad1 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, 18.05.x has been updated via 11b6ad197ab279aca89944001a9751a492bdb573 (commit) via cc81442349cb07afe242607f2c40acb62e4e76fb (commit) via 1c988ed7fb3ca7d018c9c7e7cea5f22415b95836 (commit) via 40cf253a0df46613340b301a8ce600de2e680a1c (commit) via dc490f7d86c182047a55f875d0db9081fe974996 (commit) via 8cfacd7e164178828b0e75743e78d1740ab414b9 (commit) via c6133753ed661902a9ec3cce14190c7d3d683ef0 (commit) from 24e4e44c749dc7b4d550028ba966023e1145d484 (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 11b6ad197ab279aca89944001a9751a492bdb573 Author: David Cook Date: Tue Jul 3 19:04:50 2018 +1000 Bug 21031: Apache Rewrite rules don't work for API when using anything but Debian package Plack configuration The Rewrite rules for Apache don't work unless you're using debian/templates/apache-shared-opac-plack.conf or debian/templates/apache-shared-intranet-plack.conf. This patch fixes the Rewrite rules for the non-Plack Debian Apache configuration templates as well as the standard Apache configuration file that comes with Koha. __BEFORE APPLYING__ 1. Visit /api/v1/app.pl/api/v1/spec on your git dev install 2. This should display a large page of JSON 3. Visit /api/v1/spec on your git dev install 4. This should generate a 404 error __APPLY PATCH__ __AFTER APPLYING__ 5. Visit /api/v1/app.pl/api/v1/spec on your git dev install 6. This should display a large page of JSON 7. Visit /api/v1/spec on your git dev install 8. This should display a large page of JSON (identical to the one from earlier steps) Signed-off-by: Ere Maijala Signed-off-by: Marcel de Rooy Passed QA with few notes posted separately to Bugzilla. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit c6b50f0bac092779f93033c8a3f002cb8722d7d4) Signed-off-by: Martin Renvoize commit cc81442349cb07afe242607f2c40acb62e4e76fb Author: Andrew Isherwood Date: Tue May 15 16:00:02 2018 +0100 Bug 20770: ILL loans OPAC form notes field allow arbitrary input This patch addresses the lack of sanitization of the "notes" field on the OPAC "View Interlibrary loan request" page. To test: - Apply the patch - As an OPAC user, create an ILL request - Navigate to the request's "View Interlibrary loan request" page - Add the following note: Hello

TESTING

- Click "Submit modifications" - TEST: Observe, when the page reloads, only the following is preserved in the "Notes" textarea: Hello TESTING - As a staff user, naviate to the ILL requests table - Select "Manage request" for the request you created - TEST: Observe that the Notes field only contains: Hello TESTING - TEST: Observe that no Javascript alert is displayed Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 552873f7d466abee6919414b8d2f5e6c99f9a44f) Signed-off-by: Martin Renvoize commit 1c988ed7fb3ca7d018c9c7e7cea5f22415b95836 Author: Liz Rea Date: Thu Jul 26 16:26:15 2018 +1200 Bug 21122: Fix check-url-quick when utf8 characters in URL's To test: Make a record with a URL that has a UTF8 character, such as: http://some.nonexistent.tld/M?oriWomenAotearoa.pdf Run the check-url-quick.pl job, notice it dies at that URL Apply this patch Test again, it should work. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 10720d2a5c50b82d565cab9ad70c8498164d81b2) Signed-off-by: Martin Renvoize commit 40cf253a0df46613340b301a8ce600de2e680a1c Author: Owen Leonard Date: Thu Jul 19 16:57:42 2018 +0000 Bug 21094: Syndetics: always use https instead of http This patch removes the 'using_https' check in OPAC templates in calls to Syndetics resources. Instead, https is always used. To test, apply the patch and enable Syndetics-related preferences. View the following pages in the OPAC: - Bibliographic detail page - Browse shelf section of the bibliographic detail page - Search results - List contents - Recent comments - Recent comments RSS - User summary page - Circulation history NOTE: I tested with made-up Syndetics credentials. This means my changes didn't make the template explode, but it doesn't confirm conclusively that the resources work. Signed-off-by: John Doe Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6e0548cc1a7a924731bd414fec2f7917f044040a) Signed-off-by: Martin Renvoize commit dc490f7d86c182047a55f875d0db9081fe974996 Author: Katrin Fischer Date: Sun Jul 15 19:27:03 2018 +0200 Bug 21077: Fix database documentation for statistics.type There's a typo for 'locause', this should be 'localuse'. Also, 'Credit*' is never used. Signed-off-by: Maryse Simard Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 0b89cbf6a473e71597bc051d88c2152531648ad8) Signed-off-by: Martin Renvoize commit 8cfacd7e164178828b0e75743e78d1740ab414b9 Author: Alex Arnaud Date: Tue Jul 3 13:57:00 2018 +0000 Bug 21032: Fix using facet for searches made on specific index Test plan: - Try a simple search (OPAC or staff) like "title:foo", - click on a facet: badaboum! - apply this patch, - retry Signed-off-by: S?verine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 96f253d5ed2f1770b42f06554ebb4c4e14b3afdf) Signed-off-by: Martin Renvoize commit c6133753ed661902a9ec3cce14190c7d3d683ef0 Author: Jonathan Druart Date: Tue Jul 31 12:43:54 2018 -0300 Bug 21134: Correctly throw the exception in Koha::Patron::Modification->approve koha_1 | # Looks like you planned 20 tests but ran 9. koha_1 | koha_1 | # Failed test 'approve tests' koha_1 | # at t/db_dependent/Koha/Patron/Modifications.t line 259. koha_1 | [Something went wrong]# Looks like your test exited with 255 just after 5. koha_1 | [21:13:47] t/db_dependent/Koha/Patron/Modifications.t ..................... "Something went wrong" should never been thrown, Koha::Patron::Modification->approve raises $@, but it's not defined, it should raise $_ instead Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6e99cfbca7e904b7664163838a334c487c94e462) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Patron/Modification.pm | 2 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 2 +- debian/templates/apache-shared-intranet.conf | 6 +-- debian/templates/apache-shared-opac.conf | 6 +-- etc/koha-httpd.conf | 13 +++--- installer/data/mysql/kohastructure.sql | 2 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++ .../prog/en/modules/ill/ill-requests.tt | 4 +- .../bootstrap/en/includes/shelfbrowser.inc | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 44 ++++---------------- .../bootstrap/en/modules/opac-illrequests.tt | 4 +- .../bootstrap/en/modules/opac-readingrecord.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 6 +-- .../bootstrap/en/modules/opac-showreviews-rss.tt | 6 +-- .../bootstrap/en/modules/opac-showreviews.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 12 +----- misc/cronjobs/check-url-quick.pl | 2 + .../Koha_SearchEngine_Elasticsearch_Search.t | 6 ++- 19 files changed, 42 insertions(+), 101 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 6 15:14:30 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 06 Aug 2018 13:14:30 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-55-gbe781fc 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, 18.05.x has been updated via be781fc30c34b9aa6d685ada075e8419b7a93b98 (commit) via 3a55fe35d37040b77da3f3e6ebab2361e0920cbc (commit) via 866806997f4cbb018062c0b1eb12381940d44962 (commit) via 7b8ea20bce5e1e2329536677dba049a768f19a83 (commit) via 9529ddd29baa9946d577ba1b9cb4d02a08450c0f (commit) from 11b6ad197ab279aca89944001a9751a492bdb573 (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 be781fc30c34b9aa6d685ada075e8419b7a93b98 Author: Alex Arnaud Date: Thu May 3 09:38:19 2018 +0000 Bug 20273: (follow-up) Autocomplete use start instead of contains Signed-off-by: S?verine QUEUNE Signed-off-by: Nick Clemens (cherry picked from commit 1abee30bb8bd786d9523bf75594f3aae9a37d3d5) Signed-off-by: Martin Renvoize commit 3a55fe35d37040b77da3f3e6ebab2361e0920cbc Author: Martin Renvoize Date: Mon Aug 6 14:00:54 2018 +0100 Bug 20273: Use compat routines for autocomplete in auth_finder.pl Test plan: - Context: Koha working with elasticsearch, - Apply BZ 19582 (that make auth_finder.pl works again), - apply this patch, - go to cgi-bin/koha/authorities/auth_finder.pl, - type at least 3 chararcters in a search field and check that the autocomplete returns results Signed-off-by: S?verine QUEUNE Signed-off-by: Nick Clemens (cherry picked from commit 96e768eb43a1555ae2f03b098edddbd051e8ae80) Signed-off-by: Martin Renvoize commit 866806997f4cbb018062c0b1eb12381940d44962 Author: Jonathan Druart Date: Tue Jul 31 08:21:00 2018 -0300 Bug 19604: Fix perlcritic "Loop iterator is not lexical" Loop iterator is not lexical at line 318, column 13. See page 108 of PBP. (Severity: 5) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 4d45bd575569880676a212655d3d747f368697e4) Signed-off-by: Martin Renvoize commit 7b8ea20bce5e1e2329536677dba049a768f19a83 Author: Nick Clemens Date: Thu Nov 9 16:23:57 2017 +0000 Bug 19604: Elasticsearch Fixes for build_authorities_query for auth searching To test: 1 - Do some authority searches in Zebra 2 - Switch to ES and repeat, results will vary and some may fail 3 - Apply patch and dependencies 4 - Reindex ES 5 - Repeat searches, they should suceed and results should be similar to Zebra 6 - Slight differences are okay, but results should (mostly) meet expectations A few notes: We add a 'normalizer' to ensure we get a single token from the heading indexes, this makes 'starts with' work as expcted We switch to 'AND' for fields searched from cataloging editor - this matches Zebra results We force the '__sort' fields for sorting - if sorting looks wrong try reducing the heading field to a single subfield - this will need to be addressed on a future bug (multiple subfields create an array, ES sorts those randomly) Signed-off-by: Nicolas Legrand Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit f983c1e3f7404c60143d595ba5824f5324829723) Signed-off-by: Martin Renvoize commit 9529ddd29baa9946d577ba1b9cb4d02a08450c0f Author: Nick Clemens Date: Fri Nov 17 14:07:41 2017 +0000 Bug 19604: Unit tests 1 - Apply previous patches 2 - prove t/db_dependent/Koha/SearchEngine/Elasticsearch/QueryBuilder.t 3 - Should be green 4 - high fives! Signed-off-by: Nicolas Legrand Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 7eceade7daf2943f6112291a8bfd6aa754ffaa5c) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/SearchEngine/Elasticsearch.pm | 10 ++++ Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 55 +++++++++---------- Koha/SearchEngine/Elasticsearch/Search.pm | 1 + authorities/ysearch.pl | 16 +++++- .../intranet-tmpl/prog/js/auth-finder-search.js | 8 +-- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 56 ++++++++++++++++---- 6 files changed, 101 insertions(+), 45 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 8 23:43:11 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 08 Aug 2018 21:43:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-406-g70bfac5 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 70bfac5ce5ee8e806015861d6cb473dfe1ee80b6 (commit) via c0eb67a5572294c33e3f82c928e1cad709cb1c3a (commit) via 6e5865ee4feaca3ca5575ce45d11fc88d88dc43d (commit) via c0f7aed84d663029b2f1b37ce0391b5a40b10b97 (commit) via 68e735b10151d7b70187fa7f9d4ecb2b94b34e6a (commit) via b1e8193a84a8df6d70ad8de16dadb8c4301a706b (commit) via b25c063f950076234cf7bb4a496921983a7cc23f (commit) via 4b9021895a46bda5234cd6c852f339ba7cd4d882 (commit) via 039d10044ce16f5a45ab35b79ea69d0526a1a519 (commit) via 838c8ea5ff3c6ae399c4e23018aaf83fb10f96ab (commit) via 15088c67d6c1960e98c216321985d667ccf26706 (commit) via 7baa452a6a1609fae801802889dffe9ece32c20d (commit) via 76603cc6b077cc9bc45bdc3688a94d290680777b (commit) via 1d888c8d0e9ee2eda9c793cf75fd73a7afeaef16 (commit) via d14ed73744fa23d4ed649da6d847f4b37cdfce92 (commit) via 038e4011d4e4c1270592d476479062467a7a9be8 (commit) via 003a4439802bc4053ed9e5db7719434256788b29 (commit) via d463a1b3473106a0b501d6247afdc0f7f84a4ff4 (commit) from c6b50f0bac092779f93033c8a3f002cb8722d7d4 (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 70bfac5ce5ee8e806015861d6cb473dfe1ee80b6 Author: Nick Clemens Date: Wed Aug 8 21:24:56 2018 +0000 Bug 7143: Update timeline (2 new devs) Signed-off-by: Nick Clemens commit c0eb67a5572294c33e3f82c928e1cad709cb1c3a Author: Josef Moravec Date: Thu Aug 2 06:45:26 2018 +0000 Bug 21145: Do not show buttons for datatables on opac detail page Test plan: 0) Do not apply the patch 1) Go to opac detail page 2) There are up to three datatables - items - items from other branches (only if there are any and the OpacSeparateHoldings preference is set) - subscriptions 3) try to find record with all three tables and confirm, there is button "Columns visibility" above the table 4) Apply the patch 5) Repeat 1-3 and confirm the button is no more here Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 6e5865ee4feaca3ca5575ce45d11fc88d88dc43d Author: Nick Clemens Date: Fri Jul 13 15:13:31 2018 +0000 Bug 21075: Unit tests prove -v t/db_dependent/Reserves/AutoUnsuspendReserves.t Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c0f7aed84d663029b2f1b37ce0391b5a40b10b97 Author: Nick Clemens Date: Fri Jul 13 14:45:55 2018 +0000 Bug 21075: AutoUnsuspendHolds should unsuspend holds <= today To recreate: 1 - Place a hold in your system 2 - Set that hold (or all holds) to expire today update reserves set suspend_until=CONCAT( CURDATE()," 00:00:00"); 3 - Run misc/cronjobs/holds/auto_unsuspend_holds.p 4 - Note the hold is sitll suspended 5 - Visit /cgi-bin/koha/reserve/request.pl for the book with the hold 6 - Note the suspend date is tomorrow (and cannot be set to today] 7 - Click update holds - the date in db is now set to tomorrow 8 - Reset to today 9 - Apply patch 10 - Run the cron again 11 - Visit the page and note hold is unsuspended Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 68e735b10151d7b70187fa7f9d4ecb2b94b34e6a Author: Jonathan Druart Date: Fri Jul 20 12:59:16 2018 -0300 Bug 21099: Reposition floating toolbars earlier To recreate: - Go to the advanced search form - scrolldown to position the toolbar on top of the window - scrollup https://screenshots.firefox.com/NnkFg3iOXqLPxfkd/pro.kohadev.org The toolbar should have been repositioned earlier Test plan: Edit a patron - scrolldown - scrollup - unfold the form in the header (tab "Search patrons", link "[+]") - scrolldown - scrollup Advanced search scrolldown scrollup You should notice the difference with and without this patch Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit b1e8193a84a8df6d70ad8de16dadb8c4301a706b Author: Marcel de Rooy Date: Fri Jul 27 09:42:06 2018 +0200 Bug 21048: (QA follow-up) Fix authorized value statuses in filter If you select an authorized value status in the filter, you want to keep it too just like normal statuses as CHECKED. The variable selected_status was not filled. The minimal fix is adding that template variable in the script. Note that suggestion.STATUS is out of scope within a loop using suggestion as loop var. Note: Adding a regular status like CHECKED as an authorized value with same code but another description works, but is kind of confusing ;) Not in the scope of this report though. Test plan: Select an authval status in the filter. Apply the filter and verify again that it is still selected under Suggestion information. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit b25c063f950076234cf7bb4a496921983a7cc23f Author: Jonathan Druart Date: Wed Jul 11 18:23:49 2018 -0300 Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS) When a suggestion's status is set to a customized value (AV SUGGEST_STATUS), the description is not always displayed correctly. Test plan: - Create different values for the AV SUGGEST_STATUS - Create several suggestions - Change the status using the SUGGEST_STATUS values - Edit the suggestion and change again the status - View the suggestions for a given patron (members/purchase-suggestions.pl?borrowernumber=XX), the statuses must displayed correctly Signed-off-by: Lisette Scheer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 4b9021895a46bda5234cd6c852f339ba7cd4d882 Author: Owen Leonard Date: Mon Jul 16 17:24:04 2018 +0000 Bug 21041: "Merge patrons" button remains disabled with "Select all" option This patch modifies the JavaScript functions for the select all/clear all links so that each action triggers the "change" event, required to enable or disabled the "merge selected patrons" button. To test, apply the patch and perform a patron search which will return multiple results. - Test the "select all" and "clear all" links, and confirm that the "Merge selected patrons" button is enabled and disabled. - Test that checking and unchecking multiple checkboxes still works correctly to enable and disable the button. Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 039d10044ce16f5a45ab35b79ea69d0526a1a519 Author: Katrin Fischer Date: Wed Aug 1 15:51:22 2018 +0000 Bug 21151: Fix SRU search fields mapping pop-up The SRU search fields mapping pop-up comes up as a blank white page. To test: - Go to Administration > Z39.50/SRU servers - Modify or create an SRU server - Click on the 'Modify' button to change mappings - Verify the new window that opens is blank - Apply patch - Verify the pop-up now is no longer blank but works correctly. Bonus: Spottd some HTML errors while looking for the problem. Also fixed in the patch. Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 838c8ea5ff3c6ae399c4e23018aaf83fb10f96ab Author: Marcel de Rooy Date: Fri Mar 16 11:36:46 2018 +0100 Bug 19436: (QA follow-up) see 19608 Fix use of intranet-bottom in template Bug 19608 incorrectly replaced intranet-bottom by popup-bottom. Adjusting the new template in the same way. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 15088c67d6c1960e98c216321985d667ccf26706 Author: Marcel de Rooy Date: Fri Mar 16 09:52:19 2018 +0100 Bug 19436: (QA follow-up) Revert change in _handle_one_result See Bugzilla comment 7. This change does not belong here and is dubious on its own. Needs further attention on another report. Signed-off-by: Marcel de Rooy Amended: In consultation with the author the same change is applied to the corresponding lines in Z3950SearchAuth. Signed-off-by: Nick Clemens commit 7baa452a6a1609fae801802889dffe9ece32c20d Author: Matthias Meusburger Date: Wed Feb 7 16:02:35 2018 +0100 Bug 19436: Add SRU support for authorities Test plan: - Apply the patch - Add an SRU authority server in admininistration -> Z39.50/SRU servers You can try with the French national library, configured as such: Hostname: catalogue.bnf.fr Port: 80 Database: api/SRU Syntax: Unimarc Record type: authority Additional SRU options: version=1.2,sru=get SRU Search fields mapping example: Keyword (any): aut.anywhere Name (any): aut.anywhere Author (any): (aut.type any "pep org") and aut.accesspoint Author (personal): aut.type=pep and aut.accesspoint Author (corporate): aut.type=org and aut.accesspoint Author (meeting/conference): aut.type=org and aut.accesspoint Subject heading: (aut.type any "geo ram_nc ram_ge ram_pe ram_co") and aut.accesspoint Subject sub-division: aut.type=ram_pe and aut.accesspoint Title (any): (aut.type any "tic tut tum ram_tp ram_tu") and aut.accesspoint Title (uniform):(aut.type any "tut tum ram_tu") and aut.accesspoint - Try a search from Authorities -> New from Z39.50/SRU - Check that the authority is correctly displayed in "Show Marc" - Check that the authority is correclty added to koha in "Import" - prove t/db_dependent/Breeding.t Signed-off-by: Fran?ois Pichenot Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit 76603cc6b077cc9bc45bdc3688a94d290680777b Author: Owen Leonard Date: Mon Aug 6 14:34:12 2018 +0000 Bug 21163: Basket group detail page layout is broken This fixes a problem with layout of the page when viewing a closed basket group. Changed the grid options for basket information when a basket group is closed. To test, apply the patch and go to Acquisitions -> Vendor -> Basket groups. You should have multiple baskets and basket groups to test with. - Edit an open basket group. The layout should look correct, with basket group information in the form in the left column and ungrouped basket in the right column. Grouping and ungrouping baskets should work correctly. - View a closed basket group. The basket group information should display in a single column that spans the main part of the page. Signed-off-by: Jonathan Druart Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 1d888c8d0e9ee2eda9c793cf75fd73a7afeaef16 Author: Jonathan Druart Date: Wed Jul 11 11:29:15 2018 -0300 Bug 21018: Allow uris defined in the item We need to search for uri defined for the itemnumber we passed in parameter. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit d14ed73744fa23d4ed649da6d847f4b37cdfce92 Author: Jonathan Druart Date: Fri Jun 29 10:29:30 2018 -0300 Bug 21018: Fix TrackClicks for 952$u Caused by commit 51b6cf2aafbfb45b9fcb072403b986fe3c2add53 Bug 19847: Track links within the records and 404 for others We should also accept uri stored in items.uri (952$u) Test plan: - Turn on TrackClicks - Defined uri for some items - At the OPAC click on the link (from opac-detail.pl) => Without this patch you will get 404 (redirected from tracklinks.pl) => With this patch applied you will be redirected correctly and the linktracker will be filled correctly Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 038e4011d4e4c1270592d476479062467a7a9be8 Author: Katrin Fischer Date: Thu Aug 2 15:56:11 2018 +0200 Bug 14662: Add empty entries to pull downs in cataloguing form for mandatory subfields First patch deals with the problem on the item form, this patch fixes the same problem on catalouging form for the bibliographic record. To test: - Adapt your frameworks: - Make sure 942$c is mandatory - Link another field to an authorised value, for example: 942$n to YESNO - Add a new record - Verify that the first value of each pull down is preselected, there is no way to trigger the 'required' error - Apply patch - Add a record - Verify that classification source is preselected according to the DefaultClassificationSource system preference - Verify that 942$c now defaults to empty - Verify all your other mandatory subfields can be set to empty - Verify that you can't save before correctly setting them - Chane your frameworks - Add a default value for 942$c, for example: CF - Add another record - Verify the itemtype is now preset to your default itemtype - Edit an existing record, verify all values show correctly Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 003a4439802bc4053ed9e5db7719434256788b29 Author: Katrin Fischer Date: Tue Jul 31 23:58:33 2018 +0000 Bug 14662: Add empty entries to pull downs on item form for mandatory subfields The code assumed that if a subfield is marked as mandatory, there should be no empty entry in the pull downs. This assumption is not correct, as it leads to the first entry of the pull down being preselected if there is no default set. Which means you will never be alerted of any cataloguing errors and errors will be very hard to find later on. Correct behaviour would be to preselect the empty value when there is no default. This means on saving the item an error message is triggered and the cataloger is forced to set the value. To test: - Adapt your frameworks: - Make 942$c non-mandatory - In 952 make itemtype, classification source and some other pull downs like location or collection mandatory - Add a new item - Verify that the first value of each pull down is preselected, there is no way to trigger the 'required' error - Apply patch - Add a new item - Verify that classification source is preselected according to the DefaultClassificationSource system preference - Verify that the itemtype is preselected according to 942$c in the bibliographic record - Verify all mandatory fields can be set to empty - Verify that you can't save before correctly setting them - Change the 942$c in the record to empty - Add another item - Verify the itemtype is now empty - Change your frameworks and set a default for itemtype (Ex: BK) - Repeat default check with another pull down like collection or location Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart We do not want empty values for branches (holdingbranch and homebranch must be mandatory, see bug 21011) Signed-off-by: Nick Clemens commit d463a1b3473106a0b501d6247afdc0f7f84a4ff4 Author: Jonathan Druart Date: Thu Aug 2 11:47:24 2018 -0300 Bug 21149: Fix superlibrarian creation in onboarding See bug 21087 for more details. Test plan: Drop your DB Start the installation process Use the onboarding process to install missing data The superlibrarian created during this process should be created sucessfully and allowed to login Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Breeding.pm | 172 ++++++++------------ C4/Reserves.pm | 2 +- admin/sru_modmapping.pl | 5 +- cataloguing/addbiblio.pl | 11 +- cataloguing/additem.pl | 6 +- cataloguing/z3950_auth_search.pl | 2 +- docs/history.txt | 2 + installer/onboarding.pl | 8 +- .../lib/jquery/plugins/jquery.fixFloat.js | 14 +- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 1 + .../prog/en/includes/authorities-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 + .../prog/en/modules/acqui/basketgroup.tt | 6 +- .../prog/en/modules/admin/sru_modmapping.tt | 8 +- .../prog/en/modules/admin/sru_modmapping_auth.tt | 98 +++++++++++ .../prog/en/modules/admin/z3950servers.tt | 14 +- .../prog/en/modules/members/member.tt | 4 +- .../en/modules/members/purchase-suggestions.tt | 23 ++- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +- opac/tracklinks.pl | 5 +- suggestion/suggestion.pl | 7 +- t/db_dependent/Breeding.t | 16 +- t/db_dependent/Reserves/AutoUnsuspendReserves.t | 57 +++++++ 24 files changed, 319 insertions(+), 154 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt create mode 100644 t/db_dependent/Reserves/AutoUnsuspendReserves.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 9 12:37:50 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 09 Aug 2018 10:37:50 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-67-g9ede6f9 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, 18.05.x has been updated via 9ede6f9a0a2cb07f339a0ef74719b314989ed7fe (commit) via 77f2da8fb26e68fa87d2858fc1dfc9f223e24821 (commit) via 9e67cff276297fe52e2f8c58ab559758ad5043f6 (commit) via 0d349fba89697bf58d86a9b26d8ebc385d1a8417 (commit) via f5121183d9049a82645797e18028d600e11a2476 (commit) via e81fdb07c68fb80bc497190dfd2dd15f24491447 (commit) via 8395187a9822dae95b85b876a143b867acc7fb33 (commit) via ff6f4f7c8860d63f4dc2241fefdd9af84f158a4b (commit) via 0971fed0b85834f20bc2450c7e68e1d252363b56 (commit) via 20bfb6730f3d93d388a538871b94e83d867ac796 (commit) via b0d692dcaaa38a5e4842b2c1466560f08fd2b0e5 (commit) via f8f6c0490f3e21f661bad5734f330b914ea4817b (commit) from be781fc30c34b9aa6d685ada075e8419b7a93b98 (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 9ede6f9a0a2cb07f339a0ef74719b314989ed7fe Author: Josef Moravec Date: Thu Aug 2 06:45:26 2018 +0000 Bug 21145: Do not show buttons for datatables on opac detail page Test plan: 0) Do not apply the patch 1) Go to opac detail page 2) There are up to three datatables - items - items from other branches (only if there are any and the OpacSeparateHoldings preference is set) - subscriptions 3) try to find record with all three tables and confirm, there is button "Columns visibility" above the table 4) Apply the patch 5) Repeat 1-3 and confirm the button is no more here Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit c0eb67a5572294c33e3f82c928e1cad709cb1c3a) Signed-off-by: Martin Renvoize commit 77f2da8fb26e68fa87d2858fc1dfc9f223e24821 Author: Nick Clemens Date: Fri Jul 13 15:13:31 2018 +0000 Bug 21075: Unit tests prove -v t/db_dependent/Reserves/AutoUnsuspendReserves.t Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 6e5865ee4feaca3ca5575ce45d11fc88d88dc43d) Signed-off-by: Martin Renvoize commit 9e67cff276297fe52e2f8c58ab559758ad5043f6 Author: Nick Clemens Date: Fri Jul 13 14:45:55 2018 +0000 Bug 21075: AutoUnsuspendHolds should unsuspend holds <= today To recreate: 1 - Place a hold in your system 2 - Set that hold (or all holds) to expire today update reserves set suspend_until=CONCAT( CURDATE()," 00:00:00"); 3 - Run misc/cronjobs/holds/auto_unsuspend_holds.p 4 - Note the hold is sitll suspended 5 - Visit /cgi-bin/koha/reserve/request.pl for the book with the hold 6 - Note the suspend date is tomorrow (and cannot be set to today] 7 - Click update holds - the date in db is now set to tomorrow 8 - Reset to today 9 - Apply patch 10 - Run the cron again 11 - Visit the page and note hold is unsuspended Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit c0f7aed84d663029b2f1b37ce0391b5a40b10b97) Signed-off-by: Martin Renvoize commit 0d349fba89697bf58d86a9b26d8ebc385d1a8417 Author: Jonathan Druart Date: Fri Jul 20 12:59:16 2018 -0300 Bug 21099: Reposition floating toolbars earlier To recreate: - Go to the advanced search form - scrolldown to position the toolbar on top of the window - scrollup https://screenshots.firefox.com/NnkFg3iOXqLPxfkd/pro.kohadev.org The toolbar should have been repositioned earlier Test plan: Edit a patron - scrolldown - scrollup - unfold the form in the header (tab "Search patrons", link "[+]") - scrolldown - scrollup Advanced search scrolldown scrollup You should notice the difference with and without this patch Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 68e735b10151d7b70187fa7f9d4ecb2b94b34e6a) Signed-off-by: Martin Renvoize commit f5121183d9049a82645797e18028d600e11a2476 Author: Marcel de Rooy Date: Fri Jul 27 09:42:06 2018 +0200 Bug 21048: (QA follow-up) Fix authorized value statuses in filter If you select an authorized value status in the filter, you want to keep it too just like normal statuses as CHECKED. The variable selected_status was not filled. The minimal fix is adding that template variable in the script. Note that suggestion.STATUS is out of scope within a loop using suggestion as loop var. Note: Adding a regular status like CHECKED as an authorized value with same code but another description works, but is kind of confusing ;) Not in the scope of this report though. Test plan: Select an authval status in the filter. Apply the filter and verify again that it is still selected under Suggestion information. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit b1e8193a84a8df6d70ad8de16dadb8c4301a706b) Signed-off-by: Martin Renvoize commit e81fdb07c68fb80bc497190dfd2dd15f24491447 Author: Jonathan Druart Date: Wed Jul 11 18:23:49 2018 -0300 Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS) When a suggestion's status is set to a customized value (AV SUGGEST_STATUS), the description is not always displayed correctly. Test plan: - Create different values for the AV SUGGEST_STATUS - Create several suggestions - Change the status using the SUGGEST_STATUS values - Edit the suggestion and change again the status - View the suggestions for a given patron (members/purchase-suggestions.pl?borrowernumber=XX), the statuses must displayed correctly Signed-off-by: Lisette Scheer Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit b25c063f950076234cf7bb4a496921983a7cc23f) Signed-off-by: Martin Renvoize commit 8395187a9822dae95b85b876a143b867acc7fb33 Author: Owen Leonard Date: Mon Jul 16 17:24:04 2018 +0000 Bug 21041: "Merge patrons" button remains disabled with "Select all" option This patch modifies the JavaScript functions for the select all/clear all links so that each action triggers the "change" event, required to enable or disabled the "merge selected patrons" button. To test, apply the patch and perform a patron search which will return multiple results. - Test the "select all" and "clear all" links, and confirm that the "Merge selected patrons" button is enabled and disabled. - Test that checking and unchecking multiple checkboxes still works correctly to enable and disable the button. Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 4b9021895a46bda5234cd6c852f339ba7cd4d882) Signed-off-by: Martin Renvoize commit ff6f4f7c8860d63f4dc2241fefdd9af84f158a4b Author: Katrin Fischer Date: Wed Aug 1 15:51:22 2018 +0000 Bug 21151: Fix SRU search fields mapping pop-up The SRU search fields mapping pop-up comes up as a blank white page. To test: - Go to Administration > Z39.50/SRU servers - Modify or create an SRU server - Click on the 'Modify' button to change mappings - Verify the new window that opens is blank - Apply patch - Verify the pop-up now is no longer blank but works correctly. Bonus: Spottd some HTML errors while looking for the problem. Also fixed in the patch. Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit 039d10044ce16f5a45ab35b79ea69d0526a1a519) Signed-off-by: Martin Renvoize commit 0971fed0b85834f20bc2450c7e68e1d252363b56 Author: Jonathan Druart Date: Wed Jul 11 11:29:15 2018 -0300 Bug 21018: Allow uris defined in the item We need to search for uri defined for the itemnumber we passed in parameter. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 1d888c8d0e9ee2eda9c793cf75fd73a7afeaef16) Signed-off-by: Martin Renvoize commit 20bfb6730f3d93d388a538871b94e83d867ac796 Author: Jonathan Druart Date: Fri Jun 29 10:29:30 2018 -0300 Bug 21018: Fix TrackClicks for 952$u Caused by commit 51b6cf2aafbfb45b9fcb072403b986fe3c2add53 Bug 19847: Track links within the records and 404 for others We should also accept uri stored in items.uri (952$u) Test plan: - Turn on TrackClicks - Defined uri for some items - At the OPAC click on the link (from opac-detail.pl) => Without this patch you will get 404 (redirected from tracklinks.pl) => With this patch applied you will be redirected correctly and the linktracker will be filled correctly Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit d14ed73744fa23d4ed649da6d847f4b37cdfce92) Signed-off-by: Martin Renvoize commit b0d692dcaaa38a5e4842b2c1466560f08fd2b0e5 Author: Katrin Fischer Date: Thu Aug 2 15:56:11 2018 +0200 Bug 14662: Add empty entries to pull downs in cataloguing form for mandatory subfields First patch deals with the problem on the item form, this patch fixes the same problem on catalouging form for the bibliographic record. To test: - Adapt your frameworks: - Make sure 942$c is mandatory - Link another field to an authorised value, for example: 942$n to YESNO - Add a new record - Verify that the first value of each pull down is preselected, there is no way to trigger the 'required' error - Apply patch - Add a record - Verify that classification source is preselected according to the DefaultClassificationSource system preference - Verify that 942$c now defaults to empty - Verify all your other mandatory subfields can be set to empty - Verify that you can't save before correctly setting them - Chane your frameworks - Add a default value for 942$c, for example: CF - Add another record - Verify the itemtype is now preset to your default itemtype - Edit an existing record, verify all values show correctly Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 038e4011d4e4c1270592d476479062467a7a9be8) Signed-off-by: Martin Renvoize commit f8f6c0490f3e21f661bad5734f330b914ea4817b Author: Katrin Fischer Date: Tue Jul 31 23:58:33 2018 +0000 Bug 14662: Add empty entries to pull downs on item form for mandatory subfields The code assumed that if a subfield is marked as mandatory, there should be no empty entry in the pull downs. This assumption is not correct, as it leads to the first entry of the pull down being preselected if there is no default set. Which means you will never be alerted of any cataloguing errors and errors will be very hard to find later on. Correct behaviour would be to preselect the empty value when there is no default. This means on saving the item an error message is triggered and the cataloger is forced to set the value. To test: - Adapt your frameworks: - Make 942$c non-mandatory - In 952 make itemtype, classification source and some other pull downs like location or collection mandatory - Add a new item - Verify that the first value of each pull down is preselected, there is no way to trigger the 'required' error - Apply patch - Add a new item - Verify that classification source is preselected according to the DefaultClassificationSource system preference - Verify that the itemtype is preselected according to 942$c in the bibliographic record - Verify all mandatory fields can be set to empty - Verify that you can't save before correctly setting them - Change the 942$c in the record to empty - Add another item - Verify the itemtype is now empty - Change your frameworks and set a default for itemtype (Ex: BK) - Repeat default check with another pull down like collection or location Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart We do not want empty values for branches (holdingbranch and homebranch must be mandatory, see bug 21011) Signed-off-by: Nick Clemens (cherry picked from commit 003a4439802bc4053ed9e5db7719434256788b29) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 2 +- cataloguing/addbiblio.pl | 11 ++-- cataloguing/additem.pl | 6 +-- .../lib/jquery/plugins/jquery.fixFloat.js | 14 +++-- .../prog/en/modules/admin/sru_modmapping.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../prog/en/modules/members/member.tt | 4 +- .../en/modules/members/purchase-suggestions.tt | 23 +++++--- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +-- opac/tracklinks.pl | 5 +- suggestion/suggestion.pl | 7 ++- t/db_dependent/Reserves/AutoUnsuspendReserves.t | 57 ++++++++++++++++++++ 13 files changed, 109 insertions(+), 32 deletions(-) create mode 100644 t/db_dependent/Reserves/AutoUnsuspendReserves.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 9 14:23:40 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 09 Aug 2018 12:23:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-424-g537c309 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 537c30984fcd1cf3dc2efef43545fba0803e6b99 (commit) via 5260482a619fa5aa88e83a8c2c3afe1b159ad5fa (commit) via 1b43cab3dd4fb34e4c3a1509415057448496eb82 (commit) via ac0f3b880a4220317ddde107c508c32f75b09aa1 (commit) via fe6cb85c5580b582a0047769d88be23757df0ef5 (commit) via af82a1d59709d02b767613539146b59fa10c3ab3 (commit) via 9d4c7350612dfb941a84a0e62ffe3efe19ccc4f8 (commit) via bf9527457fb31012b65514a36f8f4001157771b4 (commit) via 8d9eb9734f2584c7b5f92689ecbd9a3adba173fd (commit) via f16fb888f132703063f0591e329d72d065f4b1d9 (commit) via f4cf075fbea353a5cbf11aaead37c92eac8179b2 (commit) via ff3987c023a658e63e46ea8601666916287c8ec5 (commit) via 5abcd3312adc02a14465a0781f735b8494d60f42 (commit) via 76a06a7050643add32f4cbccbdc2fb00f66f5485 (commit) via e8e29d3140007b9b92d97ed2f1df7445c6eeb4f9 (commit) via 6e7fd122147bafcd2b66c1ecfde2e9be1cdcccef (commit) via 62aacb5865719e27224bf8f1963de1888d2ca05d (commit) via 948566e7f36a75a186f96b5ee07b5120a5413ca5 (commit) from 70bfac5ce5ee8e806015861d6cb473dfe1ee80b6 (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 537c30984fcd1cf3dc2efef43545fba0803e6b99 Author: David Cook Date: Tue May 23 12:06:59 2017 +1000 Bug 18586: Create module to mint RDF subject URIs Created the Koha::RDF module to mint URIs for RDF documents that represent Koha bibliographic records. _TEST PLAN_ To test the module, just run 'prove t/Koha/RDF.t'. You'll get some warnings about not being able to find koha-conf.xml, but you can safely ignore them or you can point to any koha-conf.xml file since it's not used by the test in actuality. Signed-off-by: Magnus Enger Works as expected. No warnings when run like: sudo koha-shell -c "prove t/Koha/RDF.t" kohadev Signed-off-by: Brendan A Gallagher Signed-off-by: Nick Clemens commit 5260482a619fa5aa88e83a8c2c3afe1b159ad5fa Author: Owen Leonard Date: Thu Apr 5 11:53:07 2018 +0000 Bug 20779: Style refresh for patron detail page This patch makes style and markup changes to the patron detail page template in order to make the display of information somewhat more compact and to increase the visibility of the edit controls. To test you should enable the patronimages system preference. Apply the patch and view the detail page for a patron. - Check that the page looks correct and that sections like "Alternate address" and "Alternative contact" are empty when there is no data. - Check that the "Manage patron image" tool works correctly. Signed-off-by: Cab Vinton Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 1b43cab3dd4fb34e4c3a1509415057448496eb82 Author: Owen Leonard Date: Mon Jul 30 17:33:29 2018 +0000 Bug 21132: Highlight active filters on saved report page This patch adds a more obvious way of see which search terms have been submitted to filter the table of saved reports. The patch also moves embedded CSS into a separate file. To test you should have multiple saved reports. - Apply the patch and go to Reports -> Use saved. - Filter the table of reports by submitting one or more terms in the sidebar "Filter" form. - Confirm that the terms you submit are shown at the top of the table of results. - Confirm that clicking the "Clear" link clears the search filter. Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit ac0f3b880a4220317ddde107c508c32f75b09aa1 Author: Nick Clemens Date: Thu May 18 21:07:11 2017 -0400 Bug 18635: Unit tests I also adjust a few tests that assume value of $nb_of_patrons to not rely on existing datas To test: 1 - Apply this patch only 2 - Prove t/db_dependent/Koha/Patrons.t 3 - Tests fail 4 - Apply other patch 5 - Tests pass Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit fe6cb85c5580b582a0047769d88be23757df0ef5 Author: Nick Clemens Date: Thu May 18 21:08:22 2017 -0400 Bug 18635: Koha::Patron->guarantees() should return results alphabetically To test: 1 - Add the same guarantor to a number of patrons, ensuring random order alphabetically 2 - View the guarantors record, note unordered list of guarantees 3 - Apply patch 4 - Guarantees are alphabetical Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit af82a1d59709d02b767613539146b59fa10c3ab3 Author: Marcel de Rooy Date: Tue Jul 3 15:52:05 2018 +0200 Bug 21033: Remove few warns in acqui/basket.pl Resolve (line numbers based on 16.11.x): Use of uninitialized value in hash element at acqui/basket.pl line 337. Use of uninitialized value in hash element at acqui/basket.pl line 338. Use of uninitialized value in hash element at acqui/basket.pl line 340. Use of uninitialized value in hash element at acqui/basket.pl line 342. Use of uninitialized value in hash element at acqui/basket.pl line 344. Argument "" isn't numeric in multiplication (*) at koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt line 486. Argument "" isn't numeric in multiplication (*) at koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt line 591. Test plan: If you have older acq data, you may have records in aqorders with field tax_rate_on_ordering is NULL. These orders will trigger the above warns. If you do not have, you could simulate by setting this field to NULL. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 9d4c7350612dfb941a84a0e62ffe3efe19ccc4f8 Author: Owen Leonard Date: Thu Jul 19 15:13:55 2018 +0000 Bug 20828: Step 4 of moremember is used for Housebound and additional attributes This patch modifies the patron edit process so that "Housebound roles" can be edited as a separate step. To test, apply the patch and open an existing patron's detail page (moremember.tt). Test the "edit" links for 'Housebound roles' and 'Additional attributes and identifiers' and confirm that each opens its own edit page, and saving changes works correctly. Signed-off-by: Cab Vinton Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit bf9527457fb31012b65514a36f8f4001157771b4 Author: David Bourgault Date: Tue May 1 14:03:52 2018 -0400 Bug 20660: Return date override affects debarments in AddReturn Re-did the patch to follow best practices. TEST PLAN: 0. Apply first patch only 1. prove t/db_dependent/Circulation.t 2. Apply second patch 3. prove t/db_dependent/Circulation.t prove should fail the first time and pass the second time. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 8d9eb9734f2584c7b5f92689ecbd9a3adba173fd Author: David Bourgault Date: Tue May 1 14:01:50 2018 -0400 Bug 20660: Test AddReturn with $return_date override Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit f16fb888f132703063f0591e329d72d065f4b1d9 Author: Jonathan Druart Date: Wed Jul 4 15:05:25 2018 -0300 Bug 21035: Handle new lines when running reports See https://metacpan.org/pod/Text::CSV_XS#Embedded-newlines Test plan: 1) Choose two items, say barcode '123' and '456' 2) Change the public note on 123 to read Line1 Line2 (I.e. type 'Line1', then press Enter, type 'Line2' and click update). 3) Change the public note on 456 to read Public note has one and only one line. Click update. 4) Create a report with the followng query: select barcode, itemnotes from items where barcode in ( '123', '456' ) Let's say that this is report number 10. 5) run ./misc/cronjobs/runreport.pl --format=csv REPORT_ID: => You should see both lines Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit f4cf075fbea353a5cbf11aaead37c92eac8179b2 Author: David Cook Date: Mon Jul 30 14:35:40 2018 +1000 Bug 21131: Remove the TinyMCE.isDirty() check that caused unexpected behaviour When using the WYSIWYG editor for system preferences, the editor only updates the textarea element if the content is different from the original content. This means if you change a system preference and then change it back to the original content, the textarea will have the 2nd last change you made. This patch removes the TinyMCE.isDirty() check, which was responsible for comparing the original and changed content. Every input/keydown/dragend or TinyMCE command will cause the textarea element to be updated and trigger the input event which causes the "modified" class to be added to the element, so that the system preference can be saved. __TEST PLAN__ _Before applying_ 0. Change "UseWYSIWYGinSystemPreferences" to "Show" 1. Change "opaccredits" to "123a" 2. Click "Save all OPAC preferences" 3. Reload the page 4. Change "opaccredits" to "123" 5. Change "opaccredits" to "123a" 6. Click "Save all OPAC preferences" 7. Reload the page 8. Note that "opaccredits" says "123" _Apply the patch_ _After applying_ 1. Change "opaccredits" to "123a" 2. Change "opaccredits" to "123" 3. Click "Save all OPAC preferences" 4. Reload the page 5. Note that "opaccredits" says "123" (and not "123a") 6. Change "opaccredits" to "1234" 7. Click "Save all OPAC preferences" 8. Reload the page 9. Note that "opaccredits" says "1234" Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ff3987c023a658e63e46ea8601666916287c8ec5 Author: Owen Leonard Date: Fri Jul 27 17:22:54 2018 +0000 Bug 19291: Make breadcrumbs for OPAC search history consistent with other patron account pages This patch adds the logged-in patron's name to the search history page's breadcrumb navigation. To test, apply the patch and view the OPAC search history page with no user logged in. The breadcrumbs should read: - Home -> Search history Log in and return to the search history page. The breadcrumbs should read: - Home -> Owen Leonard -> Your search history Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=21137 Signed-off-by: Nick Clemens commit 5abcd3312adc02a14465a0781f735b8494d60f42 Author: Jonathan Druart Date: Tue Jul 31 12:14:54 2018 -0300 Bug 21056: Add another flush later Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 76a06a7050643add32f4cbccbdc2fb00f66f5485 Author: Kyle M Hall Date: Mon Jul 9 14:05:29 2018 -0400 Bug 21056: Changing the logged in library can fail sporadically We are getting reports that sometimes changing the logged in library via selectbranchprinter.pl sometimes appears to fail. Flushing the session after updating the branch appears to fix this. Test Plan: 1) Change your logged in library repeatedly. Hopefully ( sort of ) it will fail to change. You may want to try various browsers. 2) Apply this patch 3) Note the change no longer fails Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit e8e29d3140007b9b92d97ed2f1df7445c6eeb4f9 Author: Jonathan Druart Date: Mon Aug 6 15:26:49 2018 -0300 Bug 21141: Handle non-existent itemnumbers in batch item modification/deletion The itemnumber list passed from a file in the batch item modification/deletion tools is not tested. Like barcodes we should make sure they refer to a valid items in the DB. Test plan: - Create a file with barcodes, itemnumbers and random lines - Use the batch item modification and deletion tools with this file You should see a table with a list of invalid barcodes and itemnumbers. Without this patch you got the following error: Can't call method "title" on an undefined value at /home/vagrant/kohaclone/tools/batchMod.pl line 580 Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 6e7fd122147bafcd2b66c1ecfde2e9be1cdcccef Author: Jonathan Druart Date: Mon Jul 16 11:21:48 2018 -0300 Bug 21050: Fix datepickers on LabelItemSearch calendar.inc must be in the jsinclude block when jsfooter is set Test plan: - Open or create a label batch. - Click "Add items" to trigger the pop-up search window. - Date picker should work now Signed-off-by: Katrin Fischer Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens commit 62aacb5865719e27224bf8f1963de1888d2ca05d Author: Owen Leonard Date: Thu Aug 2 13:46:31 2018 +0000 Bug 21148: Dropdowns styled by the Select2 plugin do not highlight missing required fields This patch adds some CSS to target mandatory fields on the add item screen which are styled by the Select2 plugin. To test you must have at least one item field marked mandatory and linked to an authorized value. Open the add item form for an existing record. Try to submit the form without making a selection in the mandatory dropdown. You should get an alert warning you that you have empty mandatory fields, and the field should be highlighted in yellow. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 948566e7f36a75a186f96b5ee07b5120a5413ca5 Author: Josef Moravec Date: Thu Aug 2 16:11:07 2018 +0000 Bug 21154: Remove unused subs from C4::Serials Test plan: Run these commands, grep should not return any occurences, prove should return green: git grep GetSerialStatusFromSerialId git grep GetDistributedTo git grep SetDistributedTo git grep SetDistributedto git grep in_array git grep is_barcode_in_use kshell prove t/db_dependent/Serials.t Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 1 + C4/Serials.pm | 93 ---- Koha/Patron.pm | 2 +- Koha/RDF.pm | 50 +++ acqui/basket.pl | 4 +- circ/selectbranchprinter.pl | 2 + koha-tmpl/intranet-tmpl/prog/css/reports.css | 75 ++++ koha-tmpl/intranet-tmpl/prog/css/select2.css | 4 + koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 + .../prog/en/includes/wysiwyg-systempreferences.inc | 8 +- .../intranet-tmpl/prog/en/modules/labels/search.tt | 4 +- .../prog/en/modules/members/memberentrygen.tt | 7 +- .../prog/en/modules/members/moremember.tt | 442 ++++++++++++-------- .../en/modules/reports/guided_reports_start.tt | 37 +- .../prog/en/modules/tools/batchMod-del.tt | 50 ++- .../prog/en/modules/tools/batchMod-edit.tt | 54 ++- .../bootstrap/en/modules/opac-search-history.tt | 1 + members/memberentry.pl | 8 +- misc/cronjobs/runreport.pl | 1 + .../default_search_class.pl => Koha/RDF.t} | 22 +- t/db_dependent/Circulation.t | 15 +- t/db_dependent/Koha/Patrons.t | 58 ++- t/db_dependent/Serials.t | 6 +- tools/batchMod.pl | 16 +- 24 files changed, 588 insertions(+), 376 deletions(-) create mode 100644 Koha/RDF.pm create mode 100644 koha-tmpl/intranet-tmpl/prog/css/reports.css copy t/{db_dependent/default_search_class.pl => Koha/RDF.t} (59%) mode change 100755 => 100644 hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 9 17:37:40 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 09 Aug 2018 15:37:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-432-gd035a14 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 d035a140b51be6f2dad8f5f760ac0e626f952be5 (commit) via d7223370be6a056fea17a77bb397c5a1e89bcfe2 (commit) via e90b452bdd16b426e13e5108a1702164d5a3bf02 (commit) via 2df87a94f5bcd538799b8684139525d79d8c0af5 (commit) via 574bc788ab23e554c05742a4f0affabe671993e6 (commit) via 5b6dfd86ace90a5d56e7e9a8d3750ded3dc2a518 (commit) via 894571c36398dd6e5eb79b237c6686e9a04a7cfc (commit) via 5b35c97a841bd2a8a199dc81b70c12d1c1beb0a4 (commit) from 537c30984fcd1cf3dc2efef43545fba0803e6b99 (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 d035a140b51be6f2dad8f5f760ac0e626f952be5 Author: Nick Clemens Date: Thu Aug 9 13:28:27 2018 +0000 Bug 21188: Convert return_date to a DateTime object Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit d7223370be6a056fea17a77bb397c5a1e89bcfe2 Author: Nick Clemens Date: Thu Aug 9 15:21:07 2018 +0000 Bug 20427: (RM follow-up) Add compiled CSS Signed-off-by: Nick Clemens commit e90b452bdd16b426e13e5108a1702164d5a3bf02 Author: Owen Leonard Date: Thu Aug 9 14:04:51 2018 +0000 Bug 20427: (follow-up) Bring SCSS up to date with latest LESS changes This patch catches the SCSS up to the latest changes in master: Changes to opac.less: Bug 20756 Bug 20559 Bug 7547 Changes to print.less: Bug 16575 Signed-off-by: Nick Clemens commit 2df87a94f5bcd538799b8684139525d79d8c0af5 Author: Owen Leonard Date: Thu Mar 15 16:14:09 2018 +0000 Bug 20427: Convert OPAC LESS to SCSS This patch converts the OPAC LESS files to SCSS. In the process of converting opac.less (and other .less files) to .scss, I have improved the completeness of the nesting, reordered properties, and in general done cleanup based on rules in .scss-lint.yml. All of these changes should have no impact on the style of the OPAC. This patch modifies the commands used to compile CSS so that OPAC and staff assets can be processed separately: 'yarn build' <-- Builds the staff client assets by default 'yarn build --view opac' <-- Builds OPAC assets To test, apply the patch and compile the CSS by running the command above (or apply the follow-up patch with compiled CSS). Do a thorough review of the OPAC, taking care to cover as many pages as possible and checking responsive behavior at the same time. There should be no visual differences in the OPAC before and after applying the patch. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 574bc788ab23e554c05742a4f0affabe671993e6 Author: Nick Clemens Date: Thu Aug 9 15:16:42 2018 +0000 Bug 19474: (RM follow-up) Compiled css Signed-off-by: Nick Clemens commit 5b6dfd86ace90a5d56e7e9a8d3750ded3dc2a518 Author: Owen Leonard Date: Mon Jul 23 16:24:00 2018 +0000 Bug 19474: (follow-up) Bring scss up to date with latest CSS changes This patch catches the scss up to the latest changes in master: Bug 19946 Bug 20045 Bug 20343 Bug 18327 Bug 20322 Bug 18799 Bug 20622 Bug 20329 Bug 20744 Bug 20931 Bug 20793 Bug 20651 Bug 20668 Bug 16575 Bug 19166 Bug 20770 Bug 21163 Bug 20779 Signed-off-by: Nick Clemens commit 894571c36398dd6e5eb79b237c6686e9a04a7cfc Author: Josef Moravec Date: Fri Jan 26 09:56:26 2018 +0000 Bug 19474: (QA follow-up) Fix sass lint yaml configuration Test plan: QA tools should report green on the .sass-lint.yml file now Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 5b35c97a841bd2a8a199dc81b70c12d1c1beb0a4 Author: Owen Leonard Date: Tue Mar 13 13:57:36 2018 +0000 Bug 19474: Convert staff client CSS to SCSS This patch converts staff-global.css to Sass, using SCSS syntax. This changes the build process for Koha to include installation and execution of yarn to install npm dependencies and run SCSS -> CSS conversion. To test, apply the patch and run the following: $ sudo apt-get install nodejs npm [not necessary in kohadevbox] $ sudo npm install -g yarn $ yarn install $ yarn build Clear your browser cache if necessary and confirm that CSS styling throughout the staff client looks correct. The "yarn build" command triggers a gulp process which compiles SCSS to CSS, adds automatic vendor-prefixing, and minifies the resulting CSS file. There is also a "yarn css" command available which might be used by developers who are making changes to SCSS. This command does two things differently: 1. Adds .css.map files which aid CSS debugging using in-browser inspector tools. 2. Compiles staff-global.css without minification. It can be useful to see unminified CSS during development, especially to see how SCSS compiles. This patch adds a configuration file for sass-lint, .sass-lint.yml. Currently this configuration is not used during the build process but can be used in a code editor which supports linting. Signed-off-by: Claire Gravely Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 + .sass-lint.yml | 101 + .scss-lint.yml | 245 ++ C4/Circulation.pm | 2 +- gulpfile.js | 61 + .../intranet-tmpl/prog/css/src/staff-global.scss | 4194 ++++++++++++++++++++ koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 3368 +--------------- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/print.css | 2 +- .../opac-tmpl/bootstrap/css/right-to-left.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/_mixins.scss | 10 + .../responsive.less => css/src/_responsive.scss} | 327 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 2966 ++++++++++++++ koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss | 266 ++ .../src/right-to-left.scss} | 346 +- koha-tmpl/opac-tmpl/bootstrap/less/mixins.less | 12 - koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 2634 ------------ koha-tmpl/opac-tmpl/bootstrap/less/print.less | 258 -- package.json | 29 + yarn.lock | 2765 +++++++++++++ 20 files changed, 11001 insertions(+), 6592 deletions(-) create mode 100644 .sass-lint.yml create mode 100644 .scss-lint.yml create mode 100644 gulpfile.js create mode 100644 koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/src/_mixins.scss rename koha-tmpl/opac-tmpl/bootstrap/{less/responsive.less => css/src/_responsive.scss} (56%) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/src/print.scss rename koha-tmpl/opac-tmpl/bootstrap/{less/right-to-left.less => css/src/right-to-left.scss} (63%) delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/less/mixins.less delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/less/opac.less delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/less/print.less create mode 100644 package.json create mode 100644 yarn.lock hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 9 18:20:00 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 09 Aug 2018 16:20:00 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-68-gb3b976f 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, 18.05.x has been updated via b3b976f189fc455f8f0ac553c99d6efb859d747f (commit) from 9ede6f9a0a2cb07f339a0ef74719b314989ed7fe (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 b3b976f189fc455f8f0ac553c99d6efb859d747f Author: Josef Moravec Date: Thu Aug 9 16:57:58 2018 +0100 Bug 21154: Remove unused subs from C4::Serials Test plan: Run these commands, grep should not return any occurences, prove should return green: git grep GetSerialStatusFromSerialId git grep GetDistributedTo git grep SetDistributedTo git grep SetDistributedto git grep in_array git grep is_barcode_in_use kshell prove t/db_dependent/Serials.t Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens RMaint Comment: I have opted to replace this charry-pick with a deprecation warning rather than the removal of these routines outright. (cherry picked from commit 948566e7f36a75a186f96b5ee07b5120a5413ca5) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Serials.pm | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 10 10:35:27 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Aug 2018 08:35:27 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-82-g2e2d4b2 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, 18.05.x has been updated via 2e2d4b26a43e54d7e97a4da03cc294486d7c7922 (commit) via 74a2565c99dc92e390950c7ce340202efba2161c (commit) via 9a6ed1c852c00644349597e59a369bef5a19d9a1 (commit) via 34f3d77cccdb8c06ed5946139154219495f8d4ed (commit) via 6e269676998a5346f279634e64c90d68e4c81259 (commit) via 114b738466e1a1ab3ee9741b86a02c5560c69ed2 (commit) via aa2a0be3f7ecdb4d03441b2283cc86bb7987265d (commit) via 4fd18a7df711f5a59f459234ec186b175ee05eb6 (commit) via 1dfa4318262a908b1df9d8d2454c15a39c84416c (commit) via fe9888e1ab5aa67c4b52efb1dbca5290e9c3dfd7 (commit) via 88a2c8886c4cf37e6dff00cffd26674d6ac548e2 (commit) via 0a5dabc27174d5b77783f81c59248f5da8b37c79 (commit) via 54d960cb86b91bb21cc7c92e1feef9970faaf8a1 (commit) via 9bb74effa31053c685902df48714a61c18d3c6d9 (commit) from b3b976f189fc455f8f0ac553c99d6efb859d747f (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 2e2d4b26a43e54d7e97a4da03cc294486d7c7922 Author: Nick Clemens Date: Thu May 18 21:07:11 2017 -0400 Bug 18635: Unit tests I also adjust a few tests that assume value of $nb_of_patrons to not rely on existing datas To test: 1 - Apply this patch only 2 - Prove t/db_dependent/Koha/Patrons.t 3 - Tests fail 4 - Apply other patch 5 - Tests pass Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ac0f3b880a4220317ddde107c508c32f75b09aa1) Signed-off-by: Martin Renvoize commit 74a2565c99dc92e390950c7ce340202efba2161c Author: Nick Clemens Date: Thu May 18 21:08:22 2017 -0400 Bug 18635: Koha::Patron->guarantees() should return results alphabetically To test: 1 - Add the same guarantor to a number of patrons, ensuring random order alphabetically 2 - View the guarantors record, note unordered list of guarantees 3 - Apply patch 4 - Guarantees are alphabetical Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit fe6cb85c5580b582a0047769d88be23757df0ef5) Signed-off-by: Martin Renvoize commit 9a6ed1c852c00644349597e59a369bef5a19d9a1 Author: Marcel de Rooy Date: Tue Jul 3 15:52:05 2018 +0200 Bug 21033: Remove few warns in acqui/basket.pl Resolve (line numbers based on 16.11.x): Use of uninitialized value in hash element at acqui/basket.pl line 337. Use of uninitialized value in hash element at acqui/basket.pl line 338. Use of uninitialized value in hash element at acqui/basket.pl line 340. Use of uninitialized value in hash element at acqui/basket.pl line 342. Use of uninitialized value in hash element at acqui/basket.pl line 344. Argument "" isn't numeric in multiplication (*) at koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt line 486. Argument "" isn't numeric in multiplication (*) at koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt line 591. Test plan: If you have older acq data, you may have records in aqorders with field tax_rate_on_ordering is NULL. These orders will trigger the above warns. If you do not have, you could simulate by setting this field to NULL. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit af82a1d59709d02b767613539146b59fa10c3ab3) Signed-off-by: Martin Renvoize commit 34f3d77cccdb8c06ed5946139154219495f8d4ed Author: Owen Leonard Date: Thu Jul 19 15:13:55 2018 +0000 Bug 20828: Step 4 of moremember is used for Housebound and additional attributes This patch modifies the patron edit process so that "Housebound roles" can be edited as a separate step. To test, apply the patch and open an existing patron's detail page (moremember.tt). Test the "edit" links for 'Housebound roles' and 'Additional attributes and identifiers' and confirm that each opens its own edit page, and saving changes works correctly. Signed-off-by: Cab Vinton Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 9d4c7350612dfb941a84a0e62ffe3efe19ccc4f8) Signed-off-by: Martin Renvoize commit 6e269676998a5346f279634e64c90d68e4c81259 Author: Nick Clemens Date: Thu Aug 9 13:28:27 2018 +0000 Bug 21188: Convert return_date to a DateTime object Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit d035a140b51be6f2dad8f5f760ac0e626f952be5) Signed-off-by: Martin Renvoize commit 114b738466e1a1ab3ee9741b86a02c5560c69ed2 Author: David Bourgault Date: Tue May 1 14:03:52 2018 -0400 Bug 20660: Return date override affects debarments in AddReturn Re-did the patch to follow best practices. TEST PLAN: 0. Apply first patch only 1. prove t/db_dependent/Circulation.t 2. Apply second patch 3. prove t/db_dependent/Circulation.t prove should fail the first time and pass the second time. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit bf9527457fb31012b65514a36f8f4001157771b4) Signed-off-by: Martin Renvoize commit aa2a0be3f7ecdb4d03441b2283cc86bb7987265d Author: David Bourgault Date: Tue May 1 14:01:50 2018 -0400 Bug 20660: Test AddReturn with $return_date override Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 8d9eb9734f2584c7b5f92689ecbd9a3adba173fd) Signed-off-by: Martin Renvoize commit 4fd18a7df711f5a59f459234ec186b175ee05eb6 Author: Jonathan Druart Date: Wed Jul 4 15:05:25 2018 -0300 Bug 21035: Handle new lines when running reports See https://metacpan.org/pod/Text::CSV_XS#Embedded-newlines Test plan: 1) Choose two items, say barcode '123' and '456' 2) Change the public note on 123 to read Line1 Line2 (I.e. type 'Line1', then press Enter, type 'Line2' and click update). 3) Change the public note on 456 to read Public note has one and only one line. Click update. 4) Create a report with the followng query: select barcode, itemnotes from items where barcode in ( '123', '456' ) Let's say that this is report number 10. 5) run ./misc/cronjobs/runreport.pl --format=csv REPORT_ID: => You should see both lines Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit f16fb888f132703063f0591e329d72d065f4b1d9) Signed-off-by: Martin Renvoize commit 1dfa4318262a908b1df9d8d2454c15a39c84416c Author: David Cook Date: Mon Jul 30 14:35:40 2018 +1000 Bug 21131: Remove the TinyMCE.isDirty() check that caused unexpected behaviour When using the WYSIWYG editor for system preferences, the editor only updates the textarea element if the content is different from the original content. This means if you change a system preference and then change it back to the original content, the textarea will have the 2nd last change you made. This patch removes the TinyMCE.isDirty() check, which was responsible for comparing the original and changed content. Every input/keydown/dragend or TinyMCE command will cause the textarea element to be updated and trigger the input event which causes the "modified" class to be added to the element, so that the system preference can be saved. __TEST PLAN__ _Before applying_ 0. Change "UseWYSIWYGinSystemPreferences" to "Show" 1. Change "opaccredits" to "123a" 2. Click "Save all OPAC preferences" 3. Reload the page 4. Change "opaccredits" to "123" 5. Change "opaccredits" to "123a" 6. Click "Save all OPAC preferences" 7. Reload the page 8. Note that "opaccredits" says "123" _Apply the patch_ _After applying_ 1. Change "opaccredits" to "123a" 2. Change "opaccredits" to "123" 3. Click "Save all OPAC preferences" 4. Reload the page 5. Note that "opaccredits" says "123" (and not "123a") 6. Change "opaccredits" to "1234" 7. Click "Save all OPAC preferences" 8. Reload the page 9. Note that "opaccredits" says "1234" Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit f4cf075fbea353a5cbf11aaead37c92eac8179b2) Signed-off-by: Martin Renvoize commit fe9888e1ab5aa67c4b52efb1dbca5290e9c3dfd7 Author: Owen Leonard Date: Fri Jul 27 17:22:54 2018 +0000 Bug 19291: Make breadcrumbs for OPAC search history consistent with other patron account pages This patch adds the logged-in patron's name to the search history page's breadcrumb navigation. To test, apply the patch and view the OPAC search history page with no user logged in. The breadcrumbs should read: - Home -> Search history Log in and return to the search history page. The breadcrumbs should read: - Home -> Owen Leonard -> Your search history Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=21137 Signed-off-by: Nick Clemens (cherry picked from commit ff3987c023a658e63e46ea8601666916287c8ec5) Signed-off-by: Martin Renvoize commit 88a2c8886c4cf37e6dff00cffd26674d6ac548e2 Author: Jonathan Druart Date: Tue Jul 31 12:14:54 2018 -0300 Bug 21056: Add another flush later Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 5abcd3312adc02a14465a0781f735b8494d60f42) Signed-off-by: Martin Renvoize commit 0a5dabc27174d5b77783f81c59248f5da8b37c79 Author: Kyle M Hall Date: Mon Jul 9 14:05:29 2018 -0400 Bug 21056: Changing the logged in library can fail sporadically We are getting reports that sometimes changing the logged in library via selectbranchprinter.pl sometimes appears to fail. Flushing the session after updating the branch appears to fix this. Test Plan: 1) Change your logged in library repeatedly. Hopefully ( sort of ) it will fail to change. You may want to try various browsers. 2) Apply this patch 3) Note the change no longer fails Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 76a06a7050643add32f4cbccbdc2fb00f66f5485) Signed-off-by: Martin Renvoize commit 54d960cb86b91bb21cc7c92e1feef9970faaf8a1 Author: Jonathan Druart Date: Mon Aug 6 15:26:49 2018 -0300 Bug 21141: Handle non-existent itemnumbers in batch item modification/deletion The itemnumber list passed from a file in the batch item modification/deletion tools is not tested. Like barcodes we should make sure they refer to a valid items in the DB. Test plan: - Create a file with barcodes, itemnumbers and random lines - Use the batch item modification and deletion tools with this file You should see a table with a list of invalid barcodes and itemnumbers. Without this patch you got the following error: Can't call method "title" on an undefined value at /home/vagrant/kohaclone/tools/batchMod.pl line 580 Signed-off-by: Owen Leonard Signed-off-by: Julian Maurice Signed-off-by: Nick Clemens (cherry picked from commit e8e29d3140007b9b92d97ed2f1df7445c6eeb4f9) Signed-off-by: Martin Renvoize commit 9bb74effa31053c685902df48714a61c18d3c6d9 Author: Owen Leonard Date: Thu Aug 2 13:46:31 2018 +0000 Bug 21148: Dropdowns styled by the Select2 plugin do not highlight missing required fields This patch adds some CSS to target mandatory fields on the add item screen which are styled by the Select2 plugin. To test you must have at least one item field marked mandatory and linked to an authorized value. Open the add item form for an existing record. Try to submit the form without making a selection in the mandatory dropdown. You should get an alert warning you that you have empty mandatory fields, and the field should be highlighted in yellow. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 62aacb5865719e27224bf8f1963de1888d2ca05d) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 1 + Koha/Patron.pm | 2 +- acqui/basket.pl | 4 +- circ/selectbranchprinter.pl | 2 + koha-tmpl/intranet-tmpl/prog/css/select2.css | 4 ++ .../prog/en/includes/wysiwyg-systempreferences.inc | 8 +-- .../prog/en/modules/members/memberentrygen.tt | 7 ++- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 50 ++++++++++++----- .../prog/en/modules/tools/batchMod-edit.tt | 54 ++++++++++++------ .../bootstrap/en/modules/opac-search-history.tt | 1 + members/memberentry.pl | 8 +-- misc/cronjobs/runreport.pl | 1 + t/db_dependent/Circulation.t | 15 ++++- t/db_dependent/Koha/Patrons.t | 58 ++++++++++++++++++-- tools/batchMod.pl | 16 +++--- 16 files changed, 172 insertions(+), 61 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 10 14:53:35 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Aug 2018 12:53:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-454-g24a5b9d 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 24a5b9d700fd2d3847e6d7e16502b1c24e8e872e (commit) via 112af732e3685bb46b227caa147e6a9aa3e6226c (commit) via 392e0ca8f151239b600edac9fccccf81ed50f7cb (commit) via ac54e35b20793a8a84a705acb8068589251e3e14 (commit) via 1e3f93aa594ccf673c519573e6c7b4bfc1ba6aac (commit) via d0e37a483cb8445c7830764eef9603694830b56d (commit) via 91c1acd6bb99f18dc1f532414621c5554f230527 (commit) via c659fe807671912e7e5636110e586ea23df65b69 (commit) via 6f65887399a4bd276a5f83ed9d945e19e08036fd (commit) via 46658a0e21594d1f7d76165d77297d4b5229fcab (commit) via 13cc5d3161b2630027a2c04cbc11414e83a4842b (commit) via ef58eff737b2fdcb4f97c8667e2f83e7f7aa70c7 (commit) via ff21352a4a54a1b61f906aeffe7feef1506d4264 (commit) via 985eb929149737571e3830c837a127ab372e42fe (commit) via 1da481f725e65c65e386c3b742d2f1e760f21a28 (commit) via 12ff3717283098602eb4595d6bd242f9ea888a79 (commit) via 2acbee523fbb311a63c4e3f9326fe410cf4ff832 (commit) via 15fd90dcbc98cae6febfeab59df679b761111d42 (commit) via 6ff01e3543fbe6f39739b01b64d2e0073cec75d5 (commit) via db6fc9f024080d8114564490f75ba177c8ccb640 (commit) via 436f4b9e0eb19eea491ecc70a2a996a8297f3d33 (commit) via 0989d37c23d7d9a775d516395dbe69339928aff9 (commit) from d035a140b51be6f2dad8f5f760ac0e626f952be5 (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 24a5b9d700fd2d3847e6d7e16502b1c24e8e872e Author: Nick Clemens Date: Thu Aug 9 16:08:31 2018 +0000 Bug 21195: Ignore files used for SCSS build process koha_1 | # Failed test 'All directories should be mapped: .sass-lint.yml,.scss-lint.yml,gulpfile.js,package.json,yarn.lock' koha_1 | # at t/Makefile.t line 47. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 112af732e3685bb46b227caa147e6a9aa3e6226c Author: Nick Clemens Date: Fri Aug 10 12:38:34 2018 +0000 Bug 20997: DBRev 18.06.00.013 Signed-off-by: Nick Clemens commit 392e0ca8f151239b600edac9fccccf81ed50f7cb Author: Jonathan Druart Date: Tue Jul 31 16:46:23 2018 -0300 Bug 20997: Replace missing credit_applied with 'Credit Applied' Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit ac54e35b20793a8a84a705acb8068589251e3e14 Author: Tomas Cohen Arazi Date: Fri Jul 27 14:55:14 2018 -0300 Bug 20997: (QA follow-up) POD fixes and offset type consistency This patch addresses minor issues highlighted by QA. - The POD is enhanced based on the proposal in bug 11983. - The introduced offset type value is made consistent with the rest of them. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 1e3f93aa594ccf673c519573e6c7b4bfc1ba6aac Author: Tomas Cohen Arazi Date: Thu Jun 28 15:54:53 2018 -0300 Bug 20997: (follow-up) Minor POD fixes Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit d0e37a483cb8445c7830764eef9603694830b56d Author: Tomas Cohen Arazi Date: Thu Jun 28 15:52:01 2018 -0300 Bug 20997: ->apply should be applied to Koha::Account::Lines This patch makes ->apply get passed an object set class instead of single account lines. The change is fully covered by tests. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 91c1acd6bb99f18dc1f532414621c5554f230527 Author: Tomas Cohen Arazi Date: Thu Jun 28 15:51:06 2018 -0300 Bug 20997: Add new offset type Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit c659fe807671912e7e5636110e586ea23df65b69 Author: Josef Moravec Date: Tue Jun 26 00:22:16 2018 +0000 Bug 20997: (follow-up) Add Koha::Account::Line->is_debit method Test plan: 1) Apply this patch 2) prove t/db_dependent/Koha/Account/Lines.t => Test should pass Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 6f65887399a4bd276a5f83ed9d945e19e08036fd Author: Tomas Cohen Arazi Date: Tue Jun 26 11:52:44 2018 -0300 Bug 20997: Add Koha::Account::Line::apply method This patch implements the ->apply() method for account lines. It will only work on credit lines, and raise an exception otherwise. It implements ->is_credit() as well. To test: - Apply this patch - Run: $ kshell k$ prove t/db_dependent/Koha/Account/Lines.t => SUCCESS: Tests pass! - Check all use cases are covered by the tests - Sign off :-D Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 46658a0e21594d1f7d76165d77297d4b5229fcab Author: Tomas Cohen Arazi Date: Tue Jun 26 11:51:41 2018 -0300 Bug 20997: Add unit tests for Koha::Account::Line::apply This patch adds unit tests for the mentioned method. To test: - Apply this patch - Run: $ khell k$ prove t/db_dependent/Koha/Account/Lines.t => FAIL: The method is not already implemented! Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 13cc5d3161b2630027a2c04cbc11414e83a4842b Author: Jonathan Druart Date: Wed Jul 11 13:35:28 2018 -0300 Bug 21125: Shortcut moredetail.pl on nonexistent biblionumber This replaces the solution for 17.11 on bug 20927. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit ef58eff737b2fdcb4f97c8667e2f83e7f7aa70c7 Author: Marcel de Rooy Date: Fri Jul 27 08:29:03 2018 +0200 Bug 20661: (QA follow-up) Add POD for output_and_exit Resolve: FAIL C4/Output.pm FAIL pod *** ERROR: Apparent command =cut not preceded by blank line in file C4/Output.pm FAIL pod coverage POD is missing for output_and_exit Test plan: Run QA tools again. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens commit ff21352a4a54a1b61f906aeffe7feef1506d4264 Author: Jonathan Druart Date: Wed Apr 25 17:08:42 2018 -0300 Bug 20661: Shortcut circ scripts if a blocking error appeared Signed-off-by: Marcel de Rooy No test plan found ;) But tested bookcount and request-article. Signed-off-by: Nick Clemens commit 985eb929149737571e3830c837a127ab372e42fe Author: Owen Leonard Date: Mon Jun 4 18:16:54 2018 +0000 Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests button is wrong This alternate patch adds a new icon to the sprite image which gives icons to the link on the staff client home page. It modifies the CSS positioning for all the links as the new image sprite is somewhat different. The SVG file from which the sprite image was generated is also updated, and the about page has been updated to give credit to the creator of the icon. Unrelated change: The cataloging link is moved to the second column. Although it's probably rare for all modules to be enabled and available, this puts the same number of links in each column. To test, apply the patch and clear your browser cache if necessary. With interlibrary loan enabled, view the staff client home page and confirm that all the module links look correct, including when you hover your mouse over them. Confirm that the about page lists the new icon under the "licenses" tab. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 1da481f725e65c65e386c3b742d2f1e760f21a28 Author: Katrin Fischer Date: Fri May 11 08:24:06 2018 +0200 Bug 20683: Update German web installer for 18.05 Adds translations for 2 new notices CANCEL_HOLD_ON_LOST and CHECKOUT_NOTE. Some small changes to older notices to match them with the English templates. To test: - Install German - Run the web installer on an empty database - Make sure all files install correctly and there are no SQL errors - Check notices were loaded correctly Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 12ff3717283098602eb4595d6bd242f9ea888a79 Author: Nick Clemens Date: Fri Aug 10 10:21:00 2018 +0000 Bug 7143: Update about page for new dev - Vassilis Kanellopoulos Signed-off-by: Nick Clemens commit 2acbee523fbb311a63c4e3f9326fe410cf4ff832 Author: Vassilis Kanellopoulos Date: Mon Nov 9 11:20:21 2015 +0200 Bug 15136: Add homebranch of borrowed items to patron accounts tab Test plan: 1 - View the accounts tab for a patron with fines 2 - Note there is no homebranch displayed to see where charges came from 3 - Apply patch 4 - Reload the page and note that you see the 'Home library' column Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 15fd90dcbc98cae6febfeab59df679b761111d42 Author: Marcel de Rooy Date: Thu Feb 22 11:52:14 2018 +0100 Bug 19633: Use alphanumeric error codes in upload The error codes 1 to 7 are used in Uploader.pm or tools/upload.pl. It would be nice to use alphanumeric codes instead. No behavior change expected. Test plan: [1] Run t/db_dependent/Upload.t [2] Verify that a regular upload with tools/upload.pl still works. [3] Rename upload_path in your koha-conf.xml. Restart Plack, flush the cache and try to upload to a category. Correct error message? [4] Upload the same file twice to the same category. Correct error message the second time? Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher Signed-off-by: Jonathan Druart Bug 19633: (QA follow-up) Really remove these ugly numbers See BZ comment5. We now remove the numbers also from the constant names. Test plan: Read the changes. Git grep "ERRCODE_" Run t/db_dependent/Upload.t (Note: You may see one failure here; it is fixed on bug 20727. So depends on who reaches master first.) Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 6ff01e3543fbe6f39739b01b64d2e0073cec75d5 Author: Marcel de Rooy Date: Mon Jul 2 14:08:59 2018 +0200 Bug 20468: (QA follow-up) Deactivate select/clear all for empty tab This only pertains to the second (Processing) tab. Test plan: [1] Have one entry in Pending and zero in Processing. [2] Click on Processing tab. [3] Without this patch, you would see Select all/Clear all. With this patch, you won't. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit db6fc9f024080d8114564490f75ba177c8ccb640 Author: Marcel de Rooy Date: Wed Jun 6 13:38:36 2018 +0200 Bug 20468: (follow-up) Cancel multiple items for same reason The repeated prompts for cancelling multiple selected items are confusing. The wording is slightly adjusted. The reason is asked only once per group of selected items. Test plan: Create three requests. Select two requests and cancel (from top menu) for reason A. Cancel third request (from item menu) for reason B. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 436f4b9e0eb19eea491ecc70a2a996a8297f3d33 Author: Owen Leonard Date: Fri Jun 1 16:28:29 2018 +0000 Bug 20468: (follow-up) Changes to checkbox/menu interactions This patch makes a couple of minor interface changes and updates the way checkbox change events are handled: - jQueryUI tabs initialization sets a variable for "active table" which can be re-used by functions which affect only the visible table. - The batch "Actions" menu is shown or hidden based on whether there are checked items. - The item selection tools are shown or hidden based on whether there are rows in the table. To test, apply the patch and test various article request actions: - Single "process," "complete," and "cancel" operations. - Select all/ clear all operations on both tabs. - Batch operations with checked requests. - Process all pending requests to confirm the selection controls for that table are hidden. - Complete all processing requests to confirm the selection controls for that table are hidden. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 0989d37c23d7d9a775d516395dbe69339928aff9 Author: Marcel de Rooy Date: Thu Mar 22 15:47:45 2018 +0100 Bug 20468: Add multi-select to staff article request form Adds a column with a checkbox. Adds buttons under the table for Select, Clear and Actions menu. An additional javascript function HandleMulti is placed between the form and the functions handling individual requests. Note: The Actions menu below does not contain Print slip. This does not work in its current form. This could be handled on a separate report. Test plan: [1] Enable Article Requests. Add a few requests. [2] Test the Select all / Clear all functionality on the form. [3] Verify that the menu options Process, Complete and Cancel work as expected both from the individual Actions menu as from the shared Actions menu for selected requests. Signed-off-by: Marcel de Rooy Patch applies and functions as described. Signed-off-by: Dilan Johnpull? Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Output.pm | 25 ++- Koha.pm | 2 +- Koha/Account/Line.pm | 114 ++++++++++- Koha/Account/Lines.pm | 1 - Koha/Exceptions/Account.pm | 66 +++++++ Koha/Uploader.pm | 14 +- Makefile.PL | 5 + catalogue/moredetail.pl | 3 + circ/bookcount.pl | 31 ++- circ/request-article.pl | 3 + docs/history.txt | 1 + installer/data/mysql/account_offset_types.sql | 3 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 67 ++++--- installer/data/mysql/updatedatabase.pl | 9 + koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 58 +++--- .../prog/en/includes/account_offset_type.inc | 1 + .../prog/en/includes/blocking_errors.inc | 4 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +- .../prog/en/modules/circ/article-requests.tt | 206 +++++++++++++------- .../prog/en/modules/circ/bookcount.tt | 10 +- .../prog/en/modules/circ/request-article.tt | 3 + .../intranet-tmpl/prog/en/modules/intranet-main.tt | 12 +- .../prog/en/modules/members/boraccount.tt | 6 +- .../intranet-tmpl/prog/en/modules/tools/upload.tt | 43 ++-- .../prog/img/staff-home-icons-sprite.png | Bin 8960 -> 10479 bytes .../staff-home-icons-sprite.svg | 2 +- t/db_dependent/Koha/Account/Lines.t | 146 +++++++++++++- t/db_dependent/Upload.t | 2 +- tools/upload.pl | 10 +- 29 files changed, 658 insertions(+), 192 deletions(-) create mode 100644 Koha/Exceptions/Account.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 10 15:53:20 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Aug 2018 13:53:20 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-83-g7e19ede 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, 18.05.x has been updated via 7e19edebd88cad5d7541093b10ce3d0207f540fa (commit) from 2e2d4b26a43e54d7e97a4da03cc294486d7c7922 (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 7e19edebd88cad5d7541093b10ce3d0207f540fa Author: Katrin Fischer Date: Fri May 11 08:24:06 2018 +0200 Bug 20683: Update German web installer for 18.05 Adds translations for 2 new notices CANCEL_HOLD_ON_LOST and CHECKOUT_NOTE. Some small changes to older notices to match them with the English templates. To test: - Install German - Run the web installer on an empty database - Make sure all files install correctly and there are no SQL errors - Check notices were loaded correctly Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 1da481f725e65c65e386c3b742d2f1e760f21a28) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../data/mysql/de-DE/mandatory/sample_notices.sql | 66 ++++++++++++-------- 1 file changed, 40 insertions(+), 26 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 10 16:08:37 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Aug 2018 14:08:37 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-84-g6c59f02 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, 18.05.x has been updated via 6c59f027ab23ac0c4a0bd1e564cfc07746449b54 (commit) from 7e19edebd88cad5d7541093b10ce3d0207f540fa (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 6c59f027ab23ac0c4a0bd1e564cfc07746449b54 Author: Owen Leonard Date: Mon Jun 4 18:16:54 2018 +0000 Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests button is wrong This alternate patch adds a new icon to the sprite image which gives icons to the link on the staff client home page. It modifies the CSS positioning for all the links as the new image sprite is somewhat different. The SVG file from which the sprite image was generated is also updated, and the about page has been updated to give credit to the creator of the icon. Unrelated change: The cataloging link is moved to the second column. Although it's probably rare for all modules to be enabled and available, this puts the same number of links in each column. To test, apply the patch and clear your browser cache if necessary. With interlibrary loan enabled, view the staff client home page and confirm that all the module links look correct, including when you hover your mouse over them. Confirm that the about page lists the new icon under the "licenses" tab. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 985eb929149737571e3830c837a127ab372e42fe) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/mainpage.css | 58 ++++++++++---------- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 12 ++-- .../prog/img/staff-home-icons-sprite.png | Bin 8960 -> 10479 bytes .../staff-home-icons-sprite.svg | 2 +- 5 files changed, 39 insertions(+), 35 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 13 10:39:20 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Aug 2018 08:39:20 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-87-gd2cff3c 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, 18.05.x has been updated via d2cff3c68cb06ffb9597c37766ef8490294ef737 (commit) via 1ee0bafc739f9286bfd129fbbd694bcd7c8ec0c2 (commit) via 6864c1b10c2823e1cf07b26a4df361d89757f420 (commit) from 6c59f027ab23ac0c4a0bd1e564cfc07746449b54 (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 d2cff3c68cb06ffb9597c37766ef8490294ef737 Author: Jonathan Druart Date: Wed Jul 11 13:35:28 2018 -0300 Bug 21125: Shortcut moredetail.pl on nonexistent biblionumber This replaces the solution for 17.11 on bug 20927. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit 13cc5d3161b2630027a2c04cbc11414e83a4842b) Signed-off-by: Martin Renvoize commit 1ee0bafc739f9286bfd129fbbd694bcd7c8ec0c2 Author: Marcel de Rooy Date: Fri Jul 27 08:29:03 2018 +0200 Bug 20661: (QA follow-up) Add POD for output_and_exit Resolve: FAIL C4/Output.pm FAIL pod *** ERROR: Apparent command =cut not preceded by blank line in file C4/Output.pm FAIL pod coverage POD is missing for output_and_exit Test plan: Run QA tools again. Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit ef58eff737b2fdcb4f97c8667e2f83e7f7aa70c7) Signed-off-by: Martin Renvoize commit 6864c1b10c2823e1cf07b26a4df361d89757f420 Author: Jonathan Druart Date: Wed Apr 25 17:08:42 2018 -0300 Bug 20661: Shortcut circ scripts if a blocking error appeared Signed-off-by: Marcel de Rooy No test plan found ;) But tested bookcount and request-article. Signed-off-by: Nick Clemens (cherry picked from commit ff21352a4a54a1b61f906aeffe7feef1506d4264) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Output.pm | 25 +++++++++++----- catalogue/moredetail.pl | 3 ++ circ/bookcount.pl | 31 ++++++++++---------- circ/request-article.pl | 3 ++ .../prog/en/includes/blocking_errors.inc | 4 +++ .../prog/en/modules/circ/bookcount.tt | 10 +++++-- .../prog/en/modules/circ/request-article.tt | 3 ++ 7 files changed, 53 insertions(+), 26 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Aug 14 15:02:54 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 14 Aug 2018 13:02:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-478-g4ae91ba 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 4ae91ba2633bac7ec607c8519433ba3cacbde1fd (commit) via 8fc88514c35a9b6cfa9ce93e38ebb7aa2a36ccd1 (commit) via 9d10d076122c4adb6c14b1b86b3bcca0e33ecc4a (commit) via 27bf38f34f03a5bc26abb8f928a8e37c3486b91e (commit) via 889f148e4ed85abde34e73fba3840a54c9953419 (commit) via 484067b228d5cce461c6199b85b2b87cacd3ae40 (commit) via e97f6ab9be6108cbe4d61ea8dd4b876527bd67ba (commit) via 1dfb177d3fff713185bcb0aa86517ef40629fedc (commit) via ed6070a5b43d0f3baaaf07c67faaa92baf00e7aa (commit) via 12dd41ed661c6f120e90f93e5f528abb51871d82 (commit) via 3aef9a158ba866e2ce8a712e87ae9f2ae3b7ed40 (commit) via 81431ee28a3ee128aa7fa5bfb40400b17c868786 (commit) via 8255c8edcf34487a8bfe5fe2a7592097684b2220 (commit) via e8c42c3a94d25d672181b5ad4f023d4aa54288a5 (commit) via 2280877fdd9685aecff0b144319ca3bffc39b78a (commit) via ad0f90b797c77b853ff61501310892282f582988 (commit) via 40577065b60ab87330f1fc0c3e6bbe52f2373e6c (commit) via 5ecf4da7d49357832b77ee087d968e071ab46b93 (commit) via b5520f3e019f38cbd2ea75be0a13806f68a2f515 (commit) via 2588811ef249f0996527e952e4ef5307c1834a71 (commit) via 77196e91402cdb59242f80e596f1812d238923c2 (commit) via 880afc9035c752bb6fbea0ad5505d8730462ce2c (commit) via cacb57689070315fd1fae176e3761abc6870107f (commit) via b1a4205cac57a6432ed2471f0d1ac5c3ce3b527a (commit) from 24a5b9d700fd2d3847e6d7e16502b1c24e8e872e (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 4ae91ba2633bac7ec607c8519433ba3cacbde1fd Author: Owen Leonard Date: Tue Jul 24 16:10:53 2018 +0000 Bug 21112: Re-indent staff client cart template This patch reindents the template for the staff client cart, basket.tt - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, apply the patch and add multiple items to the cart in the staff client. View the cart and confirm that it looks as it should both in the "brief" and "more details" views. HTML validation before and after the patch should return the same results. Signed-off-by: DEVINIM Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 8fc88514c35a9b6cfa9ce93e38ebb7aa2a36ccd1 Author: Katrin Fischer Date: Tue Jul 31 19:15:36 2018 +0000 Bug 21137: Standardize breadcrumbs for tags page Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 9d10d076122c4adb6c14b1b86b3bcca0e33ecc4a Author: Jonathan Druart Date: Wed Aug 1 10:03:42 2018 -0300 Bug 21137: Replace BORROWER_INFO with logged_in_user it also removes 'category_type' and 'description' from a couple of opac scripts, they are not needed. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 27bf38f34f03a5bc26abb8f928a8e37c3486b91e Author: Jonathan Druart Date: Wed Aug 1 11:08:09 2018 -0300 Bug 21137: use logged_in_user from opac-user.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 889f148e4ed85abde34e73fba3840a54c9953419 Author: Jonathan Druart Date: Wed Aug 1 09:57:29 2018 -0300 Bug 21137: Replace USER_INFO with logged_in_user This patch set does several things: - it removes USER_INFO and BORROWER_INFO These 2 variables contained logged-in patron's info. They must be accessed from logged_in_user - Use patron-title.inc for the breadcrumb at the OPAC, for consistencies Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 484067b228d5cce461c6199b85b2b87cacd3ae40 Author: Jenny Way Date: Tue Jan 16 20:37:37 2018 +0000 Bug 18236: MARC21 - Add classes to material type on intranet detail and results pages Test plan: 1. Open a list of results 2. Use fn+f12 to inspect element 3. Without patch it should show that the image class is 'materialtype' 4. With patch there will be an additional class -Books = mt_icon_BK -Kit = mt_icon_MX -Article = mt_icon_AR -Continuous resource = mt_icon_CR -Mixed material = mt_icon_MX -Computer files = mt_icon_CF -Map = mt_icon_MP -Music = mt_icon_MU -Sound = mt_icon_MU -Score = mt_icon_PR -Visual material = mt_icon_VM OR 1. Try using the classes in css to change the style -When viewing the details of a record, the material type img should also have the same changes -Check that the material type classes in the results page is the same as the details page Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer I've squashed the patches to make chanes easier readable. Signed-off-by: Nick Clemens commit e97f6ab9be6108cbe4d61ea8dd4b876527bd67ba Author: Jonathan Druart Date: Wed Aug 1 11:22:14 2018 -0300 Bug 20795: Inform the user about this change, add to pod Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 1dfb177d3fff713185bcb0aa86517ef40629fedc Author: Nick Clemens Date: Sun May 20 14:44:45 2018 +0000 Bug 20795: Pass incrreased verbosity to zebra rebuild script To test: 1 - Run koha-rebuild-zebra with multiple '-v' 2 - Note no increased verbosity 3 - Apply patch 4 - Run the updated koha-rebuild-zebra script with multiple '-v' 5 - Note increased verbosity Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit ed6070a5b43d0f3baaaf07c67faaa92baf00e7aa Author: Nick Clemens Date: Tue Aug 14 12:33:52 2018 +0000 Bug 21121: DBRev 18.06.00.014 Signed-off-by: Nick Clemens commit 12dd41ed661c6f120e90f93e5f528abb51871d82 Author: Jonathan Druart Date: Wed Aug 1 10:51:59 2018 -0300 Bug 21121: Add the IGNORE clause Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 3aef9a158ba866e2ce8a712e87ae9f2ae3b7ed40 Author: Alex Buckley Date: Mon Jul 23 04:34:06 2018 +0000 Bug 21121: Added new system preference to control hiding of personal patron information in the circulation page Libraries may want to hide personal patron data from the circulation page for privacy reasons this syspref introduces that ability for library staff to control the display of this data themselves without having to ask support vendors to hide it for them. Test plan: 1. View circulation page and input a patrons barcode or name 2. Notice if the patron has a phone number, email, street address and city set then these are displayed in the left hand side of the screen under the patrons name. Otherwise if all/any of these fields are not set for the patron then the text: "No stored." is displayed. 3. Apply this patch 4. Run ./updatedatabase.pl from the Koha shell to run the atomicupdate 5. Restart memcached and plack 6. Notice a new systempreference named 'HidePersonalPatronDetailOnCirculation' has been added, which has the default value 'Dont' 7. Without changing the default value notice the personal patron information is still displayed on the circulation page 8. Change the value of the syspref to 'Do' and now notice the phone number, email address, street address and city are now hidden in the circulation page Sponsored-By: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 81431ee28a3ee128aa7fa5bfb40400b17c868786 Author: Jonathan Druart Date: Tue Jul 17 16:21:13 2018 -0300 Bug 20226: Centralize update child code (CATCODE_MULTI) Code and variables to deal with the update child feature are not centralized but copied/pasted in several scripts. Which leads to issues obsviously (bug 20805 for instance). Moreover the strings used by the templates are also in several template files (or .inc) To deal with that this patch introduces the idea to create 1 .inc file per .js file Here we have members-menu.inc for members-menu.js Test plan: - Remove all your adult categories (categories.category_type='A') - Create a patron with a child category - Try to update to adult category => The entry does no longer appears! (This is a change in the behaviour) - Create one adult category - Update to adult category => There is a JS confirmation message, if you accept the patron will be updated to the adult category - Create (at least) another adult category - Create another child - Update to adult category => No more confirmation message but a popup to select the adult category - Pick one => The patron has been updated to the adult category Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 8255c8edcf34487a8bfe5fe2a7592097684b2220 Author: Kyle M Hall Date: Mon Dec 4 17:43:12 2017 +0000 Bug 19743: Unit Tests Signed-off-by: Te Rauhina Jackson Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit e8c42c3a94d25d672181b5ad4f023d4aa54288a5 Author: Kyle M Hall Date: Mon Dec 4 16:16:52 2017 +0000 Bug 19743: Update header and footer on each item for checkin / checkout / renewal notices When generating the checkout notice for a patron we only update the section in between the '---' tags For template toolkit purposes it means we cannot affect the content based on more than a single item. For instance, we want to add the total cost of all items checked out. Test Plan: 1) Add "Thank you for visiting <>." to the bottom of the checkout notice. Below the second '----'. 2) Check out an item to a patron to generate that notice 3) Note the branch name in the notice 4) Update the branch name in the branches editor, change it to something else 5) Check out a 2nd item to that patron 6) Notice the items list updated, but the branch name did not 7) Apply this patch 8) Check out a 3rd item to that patron 9) Notice the branch name updated this time Signed-off-by: Te Rauhina Jackson Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit 2280877fdd9685aecff0b144319ca3bffc39b78a Author: Owen Leonard Date: Mon Aug 6 18:15:10 2018 +0000 Bug 21164: Fix alignment on new basket form in acquisitions This patch removes some unnecessary " "'s from the template for creating a new basket in acquisitions. This fixes the alignment on the form fields. To test, apply the patch and go to Acquisitions -> Vendor -> New basket. All the form fields should be correctly left-aligned with each other. Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ad0f90b797c77b853ff61501310892282f582988 Author: Owen Leonard Date: Wed Aug 8 16:45:28 2018 +0000 Bug 21185: Incorrect title tag on tags review page This patch corrects the title tag on the tags review page. To test, apply the patch and go to Tools -> Tags. The page title (probably shown in the browser tab) should start with "Koha ->" instead of "Home ->". Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 40577065b60ab87330f1fc0c3e6bbe52f2373e6c Author: Jonathan Druart Date: Wed Aug 1 13:18:47 2018 -0300 Bug 21139: No table in toolbar We do not need this selector, we will not have a table in the toolbar Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 5ecf4da7d49357832b77ee087d968e071ab46b93 Author: Jonathan Druart Date: Wed Aug 1 12:34:29 2018 -0300 Bug 21139: Floating toolbar - Resize toolbar on window resize Prior to this patch the toolbar was not resized when the window was resized Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit b5520f3e019f38cbd2ea75be0a13806f68a2f515 Author: Jonathan Druart Date: Wed Aug 1 12:31:01 2018 -0300 Bug 21139: Floating toolbar - Remove horizontal scrollbar on resize To test: - add/edit a patron - resize the window => Without this patch a horizontal scrollbar appears when resized shorter Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 2588811ef249f0996527e952e4ef5307c1834a71 Author: Jonathan Druart Date: Wed Aug 1 12:28:54 2018 -0300 Bug 21139: Floating toolbars - Remove unecessary height This patch remove some pixels under the toolbar, they were used by the hidden element. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 77196e91402cdb59242f80e596f1812d238923c2 Author: Jonathan Druart Date: Wed Aug 1 12:28:37 2018 -0300 Bug 21139: Floating toolbar - Remove dup id We should not have twice the same id, we always use fixFloat() on an element with an id and then duplicate this element. The id must be changed (just in case) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 880afc9035c752bb6fbea0ad5505d8730462ce2c Author: Katrin Fischer Date: Fri Aug 10 17:18:39 2018 +0000 Bug 19390: Make jQuery selector more specific, so OPAC view link can open in new tab The OPAC view link in the staff result list already had a target="_blank", but it didn't work, because of the JavaScript for the result list browser in staff. The JavaSript code was looking for the links to the detail page in staff and this also selected the link to the detail page in OPAC. By changing detail.pl to \detail.pl opac-detail.pl will no longer be selected. To test: - Search in the staff interface - Click "OPAC view" links in staff result lists - Click "OPAC view' links in detai page - Verify both now open in a new tab - Click other links and test that navigation (previous, next, return to results) works as expected - Inside the staff client, you should see something like searchid=scs_1533922927978 added to the URLs Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit cacb57689070315fd1fae176e3761abc6870107f Author: Jonathan Druart Date: Fri Aug 10 17:39:09 2018 -0300 Bug 21208: Fix housebound deliverer/chooser names When creating a housebound visit, the names of the chooser and deliverer are the same as the housebound patron (even though the housebound patron does not have chooser and deliverer roles). It has been caused by: commit 5f80977875ff124d411f2cd89de4a944fa9c27af Bug 18403: Use patron-title.inc when hidepatronname is used patron-title.inc now starts looking for a variable named "patron", which exists in members/housebound. A better fix could be to renamed this "patron" variable tested by patron-title.inc, but at first glance it's the only place this issue exists. Test plan: 1- Make sure HouseboundModule is enabled in system preferences 2- Go to a patron file (Patron A) 3- Edit this patron's housebound roles to Chooser 4- Go to another patron file (Patron B) 5- Edit this patron's housebound roles to Deliverer 6- Go to a third patron's file (Patron C) 7- Go to the Housebound tab 8- Fill out the housebound profile for Patron c 9- Click on "Add a new delivery" 10- Fill out day and time 11- Check the Chooser drop down 12- Check the Deliverer drop down 13- Save the delivery 14- Notice the Chooser and Deliverer names are correct 15- Click on the name of the Chooser, it goes to Patron A's file 16- Go back and click on the name of the Deliverer, it goes to Patron B's file Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit b1a4205cac57a6432ed2471f0d1ac5c3ce3b527a Author: Jonathan Druart Date: Mon Aug 13 11:54:36 2018 -0300 Bug 21213: Add diagnostics to Circulation.t Jenkins reported failures on a D9 run. No idea why it is failing so adding diag and wait for the next failure. Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 4 +- C4/InstallAuth.pm | 2 +- C4/Message.pm | 6 +- Koha.pm | 2 +- Koha/Template/Plugin/Categories.pm | 3 +- admin/aqbudgets.pl | 5 +- admin/aqplan.pl | 12 +- circ/circulation.pl | 6 - debian/scripts/koha-rebuild-zebra | 4 +- installer/data/mysql/updatedatabase.pl | 9 + koha-tmpl/intranet-tmpl/js/browser.js | 4 +- .../lib/jquery/plugins/jquery.fixFloat.js | 17 +- .../prog/en/includes/cateditor-ui.inc | 10 +- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 66 +-- .../prog/en/includes/members-toolbar.inc | 11 +- .../prog/en/includes/patron-search.inc | 11 - .../prog/en/includes/str/members-menu.inc | 24 + .../prog/en/modules/acqui/basketheader.tt | 18 +- .../en/modules/admin/preferences/circulation.pref | 6 + .../intranet-tmpl/prog/en/modules/basket/basket.tt | 526 +++++++++++--------- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../prog/en/modules/cataloguing/addbooks.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 10 +- .../en/modules/circ/circulation_batch_checkouts.tt | 11 +- .../prog/en/modules/members/apikeys.tt | 1 + .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/deletemem.tt | 12 +- .../prog/en/modules/members/discharge.tt | 1 + .../prog/en/modules/members/discharges.tt | 1 + .../intranet-tmpl/prog/en/modules/members/files.tt | 1 + .../prog/en/modules/members/holdshistory.tt | 1 + .../prog/en/modules/members/housebound.tt | 27 +- .../prog/en/modules/members/mancredit.tt | 1 + .../prog/en/modules/members/maninvoice.tt | 1 + .../prog/en/modules/members/member-flags.tt | 1 + .../prog/en/modules/members/member-password.tt | 1 + .../prog/en/modules/members/member.tt | 1 + .../prog/en/modules/members/memberentrygen.tt | 1 + .../prog/en/modules/members/members-update.tt | 1 + .../prog/en/modules/members/merge-patrons.tt | 1 + .../prog/en/modules/members/moremember.tt | 1 + .../prog/en/modules/members/nl-search.tt | 1 + .../prog/en/modules/members/notices.tt | 11 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 1 + .../prog/en/modules/members/paycollect.tt | 1 + .../en/modules/members/purchase-suggestions.tt | 1 + .../prog/en/modules/members/readingrec.tt | 1 + .../prog/en/modules/members/routing-lists.tt | 1 + .../prog/en/modules/members/statistics.tt | 1 + .../prog/en/modules/members/update-child.tt | 25 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/tools/import_borrowers.tt | 1 + .../prog/en/modules/tools/picture-upload.tt | 1 + .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 24 +- koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 6 +- .../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +- .../bootstrap/en/includes/patron-title.inc | 13 +- .../bootstrap/en/modules/opac-account-pay-error.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 2 +- .../bootstrap/en/modules/opac-downloadshelf.tt | 4 +- .../bootstrap/en/modules/opac-illrequests.tt | 4 +- .../bootstrap/en/modules/opac-issue-note.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- .../modules/opac-memberentry-update-submitted.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 2 +- .../bootstrap/en/modules/opac-messaging.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 2 +- .../bootstrap/en/modules/opac-readingrecord.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/modules/opac-routing-lists.tt | 2 +- .../bootstrap/en/modules/opac-search-history.tt | 2 +- .../bootstrap/en/modules/opac-shareshelf.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- .../bootstrap/en/modules/opac-suggestions.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 3 + .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 66 +-- members/boraccount.pl | 6 - members/deletemem.pl | 6 - members/files.pl | 6 - members/holdshistory.pl | 6 - members/housebound.pl | 6 - members/mancredit.pl | 5 - members/maninvoice.pl | 6 - members/member-flags.pl | 6 - members/member-password.pl | 6 - members/moremember.pl | 6 - members/notices.pl | 6 - members/pay.pl | 6 - members/paycollect.pl | 5 - members/printinvoice.pl | 6 - members/readingrec.pl | 6 - members/statistics.pl | 6 - members/update-child.pl | 21 +- opac/opac-account.pl | 6 - opac/opac-messaging.pl | 2 +- opac/opac-routing-lists.pl | 5 - opac/opac-user.pl | 3 +- t/db_dependent/Circulation.t | 7 +- t/db_dependent/Letters/TemplateToolkit.t | 126 ++++- 101 files changed, 681 insertions(+), 612 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 16 13:03:50 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Aug 2018 11:03:50 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-99-ga2b4f38 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, 18.05.x has been updated via a2b4f38712694b55aa4c631e4b0d0a65e2adc002 (commit) via 40bfb7913da164f03ff44956218a8e314f87aeba (commit) via dbdd2b56303be0fab287d861dbd9007bf554f9d8 (commit) via 5fe28bf39877440025e2a7ee1b2db1054be47852 (commit) via 718af573c158412e1dc24308d2e1129b70cef861 (commit) via 71adb4380c101b10ddbda95be32806052e75d0d0 (commit) via 5eecc789af216e56638525961a8c25dd9677c9db (commit) via 106ad2d6f01e6bdcf79b54791a437ae31746a059 (commit) via 3d0d2a35585b6563148178d41545db09dcc8c007 (commit) via af2ccb13e3001f388a320a0619e22871429e09b5 (commit) via bed533eb345b91cb9e0e019a37ebb201dcb94726 (commit) via 647f451e495cd37aed0b50037441a5f7cb1a4981 (commit) from d2cff3c68cb06ffb9597c37766ef8490294ef737 (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 a2b4f38712694b55aa4c631e4b0d0a65e2adc002 Author: Owen Leonard Date: Tue Jul 24 16:10:53 2018 +0000 Bug 21112: Re-indent staff client cart template This patch reindents the template for the staff client cart, basket.tt - Trailing spaces removed - Indentation changed to a consistent 4 spaces - Markup indentation made more consistent To test, apply the patch and add multiple items to the cart in the staff client. View the cart and confirm that it looks as it should both in the "brief" and "more details" views. HTML validation before and after the patch should return the same results. Signed-off-by: DEVINIM Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 4ae91ba2633bac7ec607c8519433ba3cacbde1fd) Signed-off-by: Martin Renvoize commit 40bfb7913da164f03ff44956218a8e314f87aeba Author: Jonathan Druart Date: Wed Aug 1 11:22:14 2018 -0300 Bug 20795: Inform the user about this change, add to pod Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit e97f6ab9be6108cbe4d61ea8dd4b876527bd67ba) Signed-off-by: Martin Renvoize commit dbdd2b56303be0fab287d861dbd9007bf554f9d8 Author: Nick Clemens Date: Sun May 20 14:44:45 2018 +0000 Bug 20795: Pass incrreased verbosity to zebra rebuild script To test: 1 - Run koha-rebuild-zebra with multiple '-v' 2 - Note no increased verbosity 3 - Apply patch 4 - Run the updated koha-rebuild-zebra script with multiple '-v' 5 - Note increased verbosity Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit 1dfb177d3fff713185bcb0aa86517ef40629fedc) Signed-off-by: Martin Renvoize commit 5fe28bf39877440025e2a7ee1b2db1054be47852 Author: Owen Leonard Date: Mon Aug 6 18:15:10 2018 +0000 Bug 21164: Fix alignment on new basket form in acquisitions This patch removes some unnecessary " "'s from the template for creating a new basket in acquisitions. This fixes the alignment on the form fields. To test, apply the patch and go to Acquisitions -> Vendor -> New basket. All the form fields should be correctly left-aligned with each other. Signed-off-by: Pierre-Luc Lapointe Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 2280877fdd9685aecff0b144319ca3bffc39b78a) Signed-off-by: Martin Renvoize commit 718af573c158412e1dc24308d2e1129b70cef861 Author: Owen Leonard Date: Wed Aug 8 16:45:28 2018 +0000 Bug 21185: Incorrect title tag on tags review page This patch corrects the title tag on the tags review page. To test, apply the patch and go to Tools -> Tags. The page title (probably shown in the browser tab) should start with "Koha ->" instead of "Home ->". Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit ad0f90b797c77b853ff61501310892282f582988) Signed-off-by: Martin Renvoize commit 71adb4380c101b10ddbda95be32806052e75d0d0 Author: Jonathan Druart Date: Wed Aug 1 13:18:47 2018 -0300 Bug 21139: No table in toolbar We do not need this selector, we will not have a table in the toolbar Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 40577065b60ab87330f1fc0c3e6bbe52f2373e6c) Signed-off-by: Martin Renvoize commit 5eecc789af216e56638525961a8c25dd9677c9db Author: Jonathan Druart Date: Wed Aug 1 12:34:29 2018 -0300 Bug 21139: Floating toolbar - Resize toolbar on window resize Prior to this patch the toolbar was not resized when the window was resized Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 5ecf4da7d49357832b77ee087d968e071ab46b93) Signed-off-by: Martin Renvoize commit 106ad2d6f01e6bdcf79b54791a437ae31746a059 Author: Jonathan Druart Date: Wed Aug 1 12:31:01 2018 -0300 Bug 21139: Floating toolbar - Remove horizontal scrollbar on resize To test: - add/edit a patron - resize the window => Without this patch a horizontal scrollbar appears when resized shorter Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit b5520f3e019f38cbd2ea75be0a13806f68a2f515) Signed-off-by: Martin Renvoize commit 3d0d2a35585b6563148178d41545db09dcc8c007 Author: Jonathan Druart Date: Wed Aug 1 12:28:54 2018 -0300 Bug 21139: Floating toolbars - Remove unecessary height This patch remove some pixels under the toolbar, they were used by the hidden element. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 2588811ef249f0996527e952e4ef5307c1834a71) Signed-off-by: Martin Renvoize commit af2ccb13e3001f388a320a0619e22871429e09b5 Author: Jonathan Druart Date: Wed Aug 1 12:28:37 2018 -0300 Bug 21139: Floating toolbar - Remove dup id We should not have twice the same id, we always use fixFloat() on an element with an id and then duplicate this element. The id must be changed (just in case) Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 77196e91402cdb59242f80e596f1812d238923c2) Signed-off-by: Martin Renvoize commit bed533eb345b91cb9e0e019a37ebb201dcb94726 Author: Katrin Fischer Date: Fri Aug 10 17:18:39 2018 +0000 Bug 19390: Make jQuery selector more specific, so OPAC view link can open in new tab The OPAC view link in the staff result list already had a target="_blank", but it didn't work, because of the JavaScript for the result list browser in staff. The JavaSript code was looking for the links to the detail page in staff and this also selected the link to the detail page in OPAC. By changing detail.pl to \detail.pl opac-detail.pl will no longer be selected. To test: - Search in the staff interface - Click "OPAC view" links in staff result lists - Click "OPAC view' links in detai page - Verify both now open in a new tab - Click other links and test that navigation (previous, next, return to results) works as expected - Inside the staff client, you should see something like searchid=scs_1533922927978 added to the URLs Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 880afc9035c752bb6fbea0ad5505d8730462ce2c) Signed-off-by: Martin Renvoize commit 647f451e495cd37aed0b50037441a5f7cb1a4981 Author: Jonathan Druart Date: Fri Aug 10 17:39:09 2018 -0300 Bug 21208: Fix housebound deliverer/chooser names When creating a housebound visit, the names of the chooser and deliverer are the same as the housebound patron (even though the housebound patron does not have chooser and deliverer roles). It has been caused by: commit 5f80977875ff124d411f2cd89de4a944fa9c27af Bug 18403: Use patron-title.inc when hidepatronname is used patron-title.inc now starts looking for a variable named "patron", which exists in members/housebound. A better fix could be to renamed this "patron" variable tested by patron-title.inc, but at first glance it's the only place this issue exists. Test plan: 1- Make sure HouseboundModule is enabled in system preferences 2- Go to a patron file (Patron A) 3- Edit this patron's housebound roles to Chooser 4- Go to another patron file (Patron B) 5- Edit this patron's housebound roles to Deliverer 6- Go to a third patron's file (Patron C) 7- Go to the Housebound tab 8- Fill out the housebound profile for Patron c 9- Click on "Add a new delivery" 10- Fill out day and time 11- Check the Chooser drop down 12- Check the Deliverer drop down 13- Save the delivery 14- Notice the Chooser and Deliverer names are correct 15- Click on the name of the Chooser, it goes to Patron A's file 16- Go back and click on the name of the Deliverer, it goes to Patron B's file Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cacb57689070315fd1fae176e3761abc6870107f) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-rebuild-zebra | 4 +- koha-tmpl/intranet-tmpl/js/browser.js | 4 +- .../lib/jquery/plugins/jquery.fixFloat.js | 17 +- .../prog/en/modules/acqui/basketheader.tt | 18 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 526 +++++++++++--------- .../prog/en/modules/members/housebound.tt | 16 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- 7 files changed, 316 insertions(+), 271 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 16 16:17:39 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Aug 2018 14:17:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-484-g610c628 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 610c628def96437c0cc75ec2d2455cd373c5db18 (commit) via bce549bc4c0f9fefddb34fe614f6bf79aef882ea (commit) via b19090c4505c0f407a7f3cbfe3c14da5cfecc657 (commit) via c957b52ef8bba734043157445470bedc36feae5e (commit) via 644de1c4e7616b13ea203f72b661ecb17ffa84a0 (commit) via 51933c7753f04cdc7baa745037919e601ec3d798 (commit) from 4ae91ba2633bac7ec607c8519433ba3cacbde1fd (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 610c628def96437c0cc75ec2d2455cd373c5db18 Author: Nick Clemens Date: Thu Aug 16 14:03:28 2018 +0000 Bug 21226: DBRev 18.06.00.015 Signed-off-by: Nick Clemens commit bce549bc4c0f9fefddb34fe614f6bf79aef882ea Author: Jonathan Druart Date: Wed Aug 15 11:58:12 2018 -0300 Bug 21226: Remove xISBN services OCLC has decided to retire all xISBN services: https://www.oclc.org/developer/news/2018/xid-decommission.en.html The code for related features has to be removed from Koha. Test plan: You need to be familiar with the different sysprefs (I am not): - FRBRizeEditions - SyndeticsEnabled - SyndeticsEditions - ThingISBN Make sure there are no regressions introduced by this patchset. QA Note: C4/XISBN.pm should be renammed Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit b19090c4505c0f407a7f3cbfe3c14da5cfecc657 Author: Jonathan Druart Date: Wed Aug 15 11:36:21 2018 -0300 Bug 21226: DB Changes Remove prefs OCLCAffiliateID, XISBN and XISBNDailyLimit Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit c957b52ef8bba734043157445470bedc36feae5e Author: Jonathan Druart Date: Wed Aug 15 12:21:38 2018 -0300 Bug 21230: Prevent Reserves.t to fail randomly The following test can fail if the hold has been generated with found => 'W': # Failed test 'No tests run for subtest "_koha_notify_reserve() tests"' # at t/db_dependent/Reserves.t line 675. Can't call method "to_address" on an undefined value at t/db_dependent/Reserves.t line 661. # Looks like your test exited with 255 just after 56. We should call AddReserve instead. Test plan: 0. Do not apply this patch 1. Do the following change: my $hold = $builder->build({ source => 'Reserve', value => { borrowernumber=>$hold_borrower, found => 'W', # This line is added, do not forget the comma above } }); 2. Prove it makes the test fail 3. stash the changes and apply this patch 4. Make sure the tests pass Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 644de1c4e7616b13ea203f72b661ecb17ffa84a0 Author: Jonathan Druart Date: Tue Aug 14 16:30:09 2018 -0300 Bug 21222: (bug 20226 follow-up) Fix patron creation Since bug 20226 you cannot longer creation a patron, memberentry.pl will explode with Template process failed: undef error - DBIC result _type isn't of the _type Category at /home/vagrant/kohaclone/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc line 22. The problem is that "patron" is actually defined and the test in str/members-menu.inc does not work as expected. It comes from commit 7b1d08df0f4f69c52826c80a13158245287f4c00 Bug 19936: Replace Generate_Userid - Update the occurrences where I needed $patron to be defined in order to use Koha::Patron->generate_userid on an blessed object. But this was actually wrong, as it could have side-effects. Test plan: Create a new patron Edit it Retest bug 19936 and make sure the userid is generated correctly in the different situations Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 51933c7753f04cdc7baa745037919e601ec3d798 Author: Jonathan Druart Date: Tue Aug 14 16:26:39 2018 -0300 Bug 21221: Shortcut memberentry scripts if patron does not exist If borrowernumber is passed and that it does not refer to a valid patron in DB, we should not continue the script and display an error instead. Test plan: Create a patron Edit a patron => Both should work ok You can also test the other action memberentry.pl manage. Edit it again but modify the borrowernumber parameter => You should see a friendly user message saying that the patron does not exist. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/UsageStats.pm | 1 - C4/XISBN.pm | 18 ++------------ Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 3 --- installer/data/mysql/updatedatabase.pl | 9 +++++++ .../admin/preferences/enhanced_content.pref | 16 ------------- .../prog/en/modules/members/memberentrygen.tt | 20 +++++++++++++--- members/memberentry.pl | 25 ++++++++++++-------- t/db_dependent/Reserves.t | 11 ++++----- t/db_dependent/UsageStats.t | 1 - t/db_dependent/XISBN.t | 17 +------------ 11 files changed, 49 insertions(+), 74 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 16 16:49:44 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Aug 2018 14:49:44 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-105-g7b09487 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, 18.05.x has been updated via 7b094874ec08ed32568a7e0b94464bebc7f082ab (commit) via 7cacd4ddb90d55238e0446a67ce4d68a54c58e3e (commit) via 8111e0c380c9d2c61a2b6b6665b5a7bad3a3e646 (commit) via c359d56f25a0b346b71a3fd8700b07e4713640d7 (commit) via cdd6054f35c8c2a2d5a71397c6b69db5b5431123 (commit) via 0c3d3a3a7fe1d49735d3273b3a45b287219fb5da (commit) from a2b4f38712694b55aa4c631e4b0d0a65e2adc002 (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 7b094874ec08ed32568a7e0b94464bebc7f082ab Author: Nick Clemens Date: Thu Aug 16 14:03:28 2018 +0000 Bug 21226: DBRev 18.05.02.002 Signed-off-by: Nick Clemens (cherry picked from commit 610c628def96437c0cc75ec2d2455cd373c5db18) Signed-off-by: Martin Renvoize commit 7cacd4ddb90d55238e0446a67ce4d68a54c58e3e Author: Jonathan Druart Date: Wed Aug 15 11:58:12 2018 -0300 Bug 21226: Remove xISBN services OCLC has decided to retire all xISBN services: https://www.oclc.org/developer/news/2018/xid-decommission.en.html The code for related features has to be removed from Koha. Test plan: You need to be familiar with the different sysprefs (I am not): - FRBRizeEditions - SyndeticsEnabled - SyndeticsEditions - ThingISBN Make sure there are no regressions introduced by this patchset. QA Note: C4/XISBN.pm should be renammed Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit bce549bc4c0f9fefddb34fe614f6bf79aef882ea) Signed-off-by: Martin Renvoize commit 8111e0c380c9d2c61a2b6b6665b5a7bad3a3e646 Author: Jonathan Druart Date: Wed Aug 15 11:36:21 2018 -0300 Bug 21226: DB Changes Remove prefs OCLCAffiliateID, XISBN and XISBNDailyLimit Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit b19090c4505c0f407a7f3cbfe3c14da5cfecc657) Signed-off-by: Martin Renvoize commit c359d56f25a0b346b71a3fd8700b07e4713640d7 Author: Jonathan Druart Date: Wed Aug 15 12:21:38 2018 -0300 Bug 21230: Prevent Reserves.t to fail randomly The following test can fail if the hold has been generated with found => 'W': # Failed test 'No tests run for subtest "_koha_notify_reserve() tests"' # at t/db_dependent/Reserves.t line 675. Can't call method "to_address" on an undefined value at t/db_dependent/Reserves.t line 661. # Looks like your test exited with 255 just after 56. We should call AddReserve instead. Test plan: 0. Do not apply this patch 1. Do the following change: my $hold = $builder->build({ source => 'Reserve', value => { borrowernumber=>$hold_borrower, found => 'W', # This line is added, do not forget the comma above } }); 2. Prove it makes the test fail 3. stash the changes and apply this patch 4. Make sure the tests pass Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit c957b52ef8bba734043157445470bedc36feae5e) Signed-off-by: Martin Renvoize commit cdd6054f35c8c2a2d5a71397c6b69db5b5431123 Author: Jonathan Druart Date: Mon Aug 13 11:54:36 2018 -0300 Bug 21213: Add diagnostics to Circulation.t Jenkins reported failures on a D9 run. No idea why it is failing so adding diag and wait for the next failure. Signed-off-by: Nick Clemens (cherry picked from commit b1a4205cac57a6432ed2471f0d1ac5c3ce3b527a) Signed-off-by: Martin Renvoize commit 0c3d3a3a7fe1d49735d3273b3a45b287219fb5da Author: Jonathan Druart Date: Tue Aug 14 16:26:39 2018 -0300 Bug 21221: Shortcut memberentry scripts if patron does not exist If borrowernumber is passed and that it does not refer to a valid patron in DB, we should not continue the script and display an error instead. Test plan: Create a patron Edit a patron => Both should work ok You can also test the other action memberentry.pl manage. Edit it again but modify the borrowernumber parameter => You should see a friendly user message saying that the patron does not exist. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 51933c7753f04cdc7baa745037919e601ec3d798) Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/UsageStats.pm | 1 - C4/XISBN.pm | 18 ++---------------- Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 3 --- installer/data/mysql/updatedatabase.pl | 9 +++++++++ .../modules/admin/preferences/enhanced_content.pref | 16 ---------------- members/memberentry.pl | 4 ++++ t/db_dependent/Circulation.t | 7 +++++-- t/db_dependent/Reserves.t | 11 ++++------- t/db_dependent/UsageStats.t | 1 - t/db_dependent/XISBN.t | 17 +---------------- 11 files changed, 26 insertions(+), 63 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 17 19:32:41 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Aug 2018 17:32:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-512-gfacb5cb 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 facb5cb25a3e81952282b228190870640a383295 (commit) via 22ab4ba524fe1595dbd85e10b6727007133ae2e4 (commit) via 9e895e581288e4299e28d6c542ac3f66f80d6f3d (commit) via f59b8461348e0c974c17d970757698b018e00c32 (commit) via 1981db25cefcb39405835ee5e90b1fb1ca6f4928 (commit) via 96e2d28fd5d342b6569ad24d17cedf8ad6415616 (commit) via cc5c66d27b81a5b44238f66d474b6396ad334487 (commit) via 4321dbe2212e917ebed5fc5500e108e02dd041c0 (commit) via 13d0c46bdcceceace6df38bd4bf283855aff3d42 (commit) via 726a61ac65e4d504aba328c41cdc76ef65210222 (commit) via 8d61035e8574a89d5dae44a0c4120e657539c3dc (commit) via f580af25e1518d0cac5ccd46a653a98e8b8d2282 (commit) via 599a4a16ef4e66b7f117502bb94e2eeab399eb57 (commit) via 51b7499d10b0f32eeb59b9debb7cbc99b921eef9 (commit) via 1c0aad5a1d652c8e7ad0c18bb19214b22b3c554a (commit) via cef24888bdf188857511136afd3d35ec607a0ca3 (commit) via 8ee92112e48d52eb5dad5533075f3ab0aed658ba (commit) via a6f9738fd2bda70428ebe49a7be0696ea997406c (commit) via 5a7ee2db081ea4a71ebe98291faf8a7c70994ae5 (commit) via 865c385f718c56ea6fc6d718496ee2ff6aa0c667 (commit) via 62e3b630bfc99f53dd7d40adc17f899ad5942bdc (commit) via 917ec3700ee2694333219b21d5f16d7c2b147254 (commit) via dd9e978c2c4ba140af5d4586fc9ec3589f356e75 (commit) via 82cede1cc202e8e8e6b8d49357400da3343318ca (commit) via 10c154353f78c942647fae4fbadccc555fbea3a3 (commit) via f8e0d905ff98b951de3826420c0c133f52e237cc (commit) via fd9ea323fe1f46ef5c1fd7b93a1cb3f158059133 (commit) via dcd1f5d48c758aee17b6c6f069c6146b42efe117 (commit) from 610c628def96437c0cc75ec2d2455cd373c5db18 (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 facb5cb25a3e81952282b228190870640a383295 Author: Jonathan Druart Date: Fri Aug 17 13:50:39 2018 -0300 Bug 13618: Fix wrong condition in xt tests Signed-off-by: Nick Clemens commit 22ab4ba524fe1595dbd85e10b6727007133ae2e4 Author: Jonathan Druart Date: Fri Aug 17 13:51:01 2018 -0300 Bug 13618: Remove filter when assigning array Signed-off-by: Nick Clemens commit 9e895e581288e4299e28d6c542ac3f66f80d6f3d Author: Jonathan Druart Date: Fri Aug 17 13:11:28 2018 -0300 Bug 13618: Add POD to raw.pm Signed-off-by: Nick Clemens commit f59b8461348e0c974c17d970757698b018e00c32 Author: Jonathan Druart Date: Thu Aug 16 15:00:32 2018 -0300 Bug 13618: (follow-up) Add html filters to all the variables JS block has been re-added to the top whereas it was moved to the bottom! Signed-off-by: Nick Clemens commit 1981db25cefcb39405835ee5e90b1fb1ca6f4928 Author: Jonathan Druart Date: Thu Aug 16 14:58:31 2018 -0300 Bug 13618: (follow-up) Manually replace missing .raw Signed-off-by: Nick Clemens commit 96e2d28fd5d342b6569ad24d17cedf8ad6415616 Author: Jonathan Druart Date: Thu Aug 16 14:55:47 2018 -0300 Bug 13618: Remove html filter for NEXT Signed-off-by: Nick Clemens commit cc5c66d27b81a5b44238f66d474b6396ad334487 Author: Jonathan Druart Date: Tue Aug 14 12:23:08 2018 -0300 Bug 13618: Remove html filter for STOP and deal with existing USE raw Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 4321dbe2212e917ebed5fc5500e108e02dd041c0 Author: Jonathan Druart Date: Tue Aug 14 15:08:46 2018 -0300 Bug 13618: Add tests Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 13d0c46bdcceceace6df38bd4bf283855aff3d42 Author: Jonathan Druart Date: Tue Aug 14 14:50:46 2018 -0300 Bug 13618: Add missing raw filters Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 726a61ac65e4d504aba328c41cdc76ef65210222 Author: Jonathan Druart Date: Mon Aug 13 15:17:31 2018 -0300 Bug 13618: (follow-up) Escape HTML chars in holds.js For biblio level holds we got: TypeError: oObj.itemcallnumber is undefined Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 8d61035e8574a89d5dae44a0c4120e657539c3dc Author: Jonathan Druart Date: Mon Aug 13 14:31:52 2018 -0300 Bug 13618: (follow-up) Add html filters to all the variables IntranetUserJS was missing (?!) Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f580af25e1518d0cac5ccd46a653a98e8b8d2282 Author: Jonathan Druart Date: Thu Aug 9 17:31:20 2018 -0300 Bug 13618: Fix item search We want to encode HTML characters for the "key => value"'s like branchcode => branchname But not the whole JSON string We could have done it controller-side but it sounds better to do it as we do for other places Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 599a4a16ef4e66b7f117502bb94e2eeab399eb57 Author: Jonathan Druart Date: Thu Aug 9 13:13:12 2018 -0300 Bug 13618: Explicitly use raw for itemtype.checkinmsg Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 51b7499d10b0f32eeb59b9debb7cbc99b921eef9 Author: Jonathan Druart Date: Thu Aug 9 13:04:02 2018 -0300 Bug 13618: Specific for labels/spinelabel-print.tt Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 1c0aad5a1d652c8e7ad0c18bb19214b22b3c554a Author: Jonathan Druart Date: Thu Aug 9 12:55:04 2018 -0300 Bug 13618: Specific for labels This is definitely wrong, html is generated in C4/Creators/Lib.pm (see FIXME). We will need to fix it, but let's do that later! Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit cef24888bdf188857511136afd3d35ec607a0ca3 Author: Jonathan Druart Date: Thu Aug 9 12:32:49 2018 -0300 Bug 13618: Escape HTML chars in checkouts.js On the way the itemtype is not displaying correctly the description instead of the code (in the relative's checkouts table) Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 8ee92112e48d52eb5dad5533075f3ab0aed658ba Author: Jonathan Druart Date: Thu Aug 9 12:08:45 2018 -0300 Bug 13618: Add the escapeHtml JS prototype to String Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit a6f9738fd2bda70428ebe49a7be0696ea997406c Author: Jonathan Druart Date: Thu Aug 9 10:31:51 2018 -0300 Bug 13618: Escape HTML chars in holds.js Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 5a7ee2db081ea4a71ebe98291faf8a7c70994ae5 Author: Jonathan Druart Date: Wed Aug 8 16:13:05 2018 -0300 Bug 13618: Deal with span in patron-title Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 865c385f718c56ea6fc6d718496ee2ff6aa0c667 Author: Jonathan Druart Date: Wed Aug 8 16:12:52 2018 -0300 Bug 13618: Specific for IntranetCirculationHomeHTML Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 62e3b630bfc99f53dd7d40adc17f899ad5942bdc Author: Jonathan Druart Date: Thu Jul 19 18:56:26 2018 -0300 Bug 13618: (follow-up) Manually replace missing .raw Syntax was wrong: Template process failed: file error - parse error - bodytag.inc line 4: unexpected token (_) It's escaped later so sounds ok here Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 917ec3700ee2694333219b21d5f16d7c2b147254 Author: Jonathan Druart Date: Thu Jul 19 18:47:46 2018 -0300 Bug 13618: Manually replace missing .raw Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit dd9e978c2c4ba140af5d4586fc9ec3589f356e75 Author: Jonathan Druart Date: Thu Jul 19 18:24:10 2018 -0300 Bug 13618: Fix BLOCKs perl -p -i -e 's/BLOCK \| html/BLOCK/g' **/*.inc **/*.tt Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 82cede1cc202e8e8e6b8d49357400da3343318ca Author: Jonathan Druart Date: Thu Jul 19 17:56:34 2018 -0300 Bug 13618: Add the raw TT filter Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit 10c154353f78c942647fae4fbadccc555fbea3a3 Author: Jonathan Druart Date: Thu Jul 19 17:36:29 2018 -0300 Bug 13618: Remove html filters for HtmlTags We will have to make sure this filter (HtmlTags) is not used with unsafe variables. Generated by: perl -p -i -e 's/HtmlTags tag([^\|]*)\| html -%]/HtmlTags tag\1-%]/g' **/*.tt **/*.inc perl -p -i -e 's/HtmlTags tag([^\|]*)\| html %]/HtmlTags tag\1%]/g' **/*.tt **/*.inc Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit f8e0d905ff98b951de3826420c0c133f52e237cc Author: Mark Tompsett Date: Mon Feb 1 14:25:56 2016 -0500 Bug 15717: Installer: Step 3 has
showing The step to install optional/mandatory things is broken with many
's instead of line breaks. TEST PLAN --------- 1) Back up database 2) Drop database 3) Create empty database 4) Run web installer -- Notice that step 3 has ugly
's at the last part of step 3. 5) Apply patch 6) Repeat steps 2-4 -- Notice the
's are now nice line breaks. NOTE: No promises of perfect positioning! 7) Run koha qa test tools. Joubu: I have no idea if this is still needed. TO TEST Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize https://bugs.koha-community.org/show_bug.cgi?id=13618 Signed-off-by: Nick Clemens commit fd9ea323fe1f46ef5c1fd7b93a1cb3f158059133 Author: Jonathan Druart Date: Thu Jul 19 17:09:26 2018 -0300 Bug 13618: Escape patron's attributes - do we want that? Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens commit dcd1f5d48c758aee17b6c6f069c6146b42efe117 Author: Jonathan Druart Date: Fri Jan 23 13:18:54 2015 +0100 Bug 13618: Add html filters to all the variables Here we go, next step then. As we did not fix the performance issue when autofiltering the variables (see bug 20975), the only solution we have is to add the filters explicitely. This patch has been autogenerated (using add_html_filters.pl, see next pathces) and add the html filter to all the variables displayed in the template. Exceptions are made (using the new 'raw' TT filter) to the variable we already listed in the previous versions of this patch. To test: - Use t/db_dependent/Koha/Patrons.t to populate your DB with autogenerated data which contain - Click "Submit modifications" - TEST: Observe, when the page reloads, only the following is preserved in the "Notes" textarea: Hello TESTING - As a staff user, naviate to the ILL requests table - Select "Manage request" for the request you created - TEST: Observe that the Notes field only contains: Hello TESTING - TEST: Observe that no Javascript alert is displayed Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 552873f7d466abee6919414b8d2f5e6c99f9a44f) Signed-off-by: Martin Renvoize (cherry picked from commit cc81442349cb07afe242607f2c40acb62e4e76fb) Signed-off-by: Fridolin Somers commit a641c83caba3ec75c7cccc299d3b560404f84c56 Author: Nick Clemens Date: Thu Aug 16 14:03:28 2018 +0000 Bug 21226: DBRev 17.11.09.001 Signed-off-by: Fridolin Somers commit 42a4c281cde74fad9145c438bd7a97b1521f0a6d Author: Jonathan Druart Date: Wed Aug 15 11:58:12 2018 -0300 Bug 21226: Remove xISBN services OCLC has decided to retire all xISBN services: https://www.oclc.org/developer/news/2018/xid-decommission.en.html The code for related features has to be removed from Koha. Test plan: You need to be familiar with the different sysprefs (I am not): - FRBRizeEditions - SyndeticsEnabled - SyndeticsEditions - ThingISBN Make sure there are no regressions introduced by this patchset. QA Note: C4/XISBN.pm should be renammed Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit bce549bc4c0f9fefddb34fe614f6bf79aef882ea) Signed-off-by: Martin Renvoize (cherry picked from commit 7cacd4ddb90d55238e0446a67ce4d68a54c58e3e) Signed-off-by: Fridolin Somers commit 28ee71e6849e2be21f24626aad6530b55f514419 Author: Jonathan Druart Date: Wed Aug 15 11:36:21 2018 -0300 Bug 21226: DB Changes Remove prefs OCLCAffiliateID, XISBN and XISBNDailyLimit Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit b19090c4505c0f407a7f3cbfe3c14da5cfecc657) Signed-off-by: Martin Renvoize (cherry picked from commit 8111e0c380c9d2c61a2b6b6665b5a7bad3a3e646) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/UsageStats.pm | 1 - C4/XISBN.pm | 18 ++---------------- Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 3 --- installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ++++ .../modules/admin/preferences/enhanced_content.pref | 16 ---------------- .../prog/en/modules/ill/ill-requests.tt | 4 ++-- .../bootstrap/en/modules/opac-illrequests.tt | 4 ++-- t/db_dependent/UsageStats.t | 1 - t/db_dependent/XISBN.t | 17 +---------------- 11 files changed, 21 insertions(+), 58 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 30 12:24:36 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 30 Aug 2018 10:24:36 +0000 Subject: [koha-commits] main Koha release repository branch 18.05.x updated. v18.05.02-145-g20c85f6 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, 18.05.x has been updated via 20c85f636572aab559ff10839cef9ec09b0e914a (commit) via cc7ee936fc783b0757863c3e4762d75d71a3fe3f (commit) via cd4f89a257092f6e2f41c1c0ed86d71dd38e19bb (commit) via 9bff4f735b341dbfc69d01b774043faed6c65c74 (commit) via ec4f9cd53bac002293ce9209c4a5bbb2090ec8ca (commit) via 157962b8e967628631bb4f1acd55caa8f51e4cc4 (commit) from 516d156bb2aec724e429414f7053e3a2f8fffda1 (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 20c85f636572aab559ff10839cef9ec09b0e914a Author: Martin Renvoize Date: Fri Aug 24 15:44:11 2018 +0100 Update release notes for 18.05.03 release Signed-off-by: Martin Renvoize commit cc7ee936fc783b0757863c3e4762d75d71a3fe3f Author: Martin Renvoize Date: Fri Aug 24 15:30:40 2018 +0100 Increment version for 18.05.03 release Signed-off-by: Martin Renvoize commit cd4f89a257092f6e2f41c1c0ed86d71dd38e19bb Author: Martin Renvoize Date: Fri Aug 24 15:25:49 2018 +0100 Translations: (rmaint followup) - Mark failing strings as fuzzy Signed-off-by: Martin Renvoize commit 9bff4f735b341dbfc69d01b774043faed6c65c74 Author: Koha translators <> Date: Fri Aug 24 10:54:44 2018 -0300 Translation updates for Koha 18.05.03 (cherry picked from commit 756d2717dca7dbbec5bd59c8dd22e41fb3d8c620) Signed-off-by: Martin Renvoize commit ec4f9cd53bac002293ce9209c4a5bbb2090ec8ca Author: Martin Renvoize Date: Mon Aug 13 09:54:44 2018 +0100 Bug 21199: (QA follow-up) Add show_attributes to perldoc Signed-off-by: Martin Renvoize commit 157962b8e967628631bb4f1acd55caa8f51e4cc4 Author: Jonathan Druart Date: Thu Aug 9 19:34:58 2018 -0300 Bug 21199: Hide patron's attributes from ILSDI if required Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/ILSDI/Services.pm | 5 +- Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 7 +- misc/release_notes/release_notes_18_05_03.html | 602 +++ misc/release_notes/release_notes_18_05_03.md | 475 +++ misc/translator/po/am-Ethi-marc-MARC21.po | 2 +- misc/translator/po/am-Ethi-marc-NORMARC.po | 2 +- misc/translator/po/am-Ethi-marc-UNIMARC.po | 2 +- misc/translator/po/am-Ethi-opac-bootstrap.po | 1217 +++--- misc/translator/po/am-Ethi-pref.po | 32 - misc/translator/po/am-Ethi-staff-help.po | 2 +- misc/translator/po/am-Ethi-staff-prog.po | 760 ++-- misc/translator/po/ar-Arab-marc-MARC21.po | 6 +- misc/translator/po/ar-Arab-marc-NORMARC.po | 2 +- misc/translator/po/ar-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ar-Arab-opac-bootstrap.po | 1226 +++--- misc/translator/po/ar-Arab-pref.po | 32 - misc/translator/po/ar-Arab-staff-help.po | 6 +- misc/translator/po/ar-Arab-staff-prog.po | 777 ++-- misc/translator/po/as-IN-marc-MARC21.po | 2 +- misc/translator/po/as-IN-marc-NORMARC.po | 2 +- misc/translator/po/as-IN-marc-UNIMARC.po | 2 +- misc/translator/po/as-IN-opac-bootstrap.po | 1217 +++--- misc/translator/po/as-IN-pref.po | 32 - misc/translator/po/as-IN-staff-help.po | 2 +- misc/translator/po/as-IN-staff-prog.po | 756 ++-- misc/translator/po/az-AZ-marc-MARC21.po | 2 +- misc/translator/po/az-AZ-marc-NORMARC.po | 2 +- misc/translator/po/az-AZ-marc-UNIMARC.po | 2 +- misc/translator/po/az-AZ-opac-bootstrap.po | 1217 +++--- misc/translator/po/az-AZ-pref.po | 32 - misc/translator/po/az-AZ-staff-help.po | 2 +- misc/translator/po/az-AZ-staff-prog.po | 756 ++-- misc/translator/po/be-BY-marc-MARC21.po | 2 +- misc/translator/po/be-BY-marc-NORMARC.po | 2 +- misc/translator/po/be-BY-marc-UNIMARC.po | 2 +- misc/translator/po/be-BY-opac-bootstrap.po | 1217 +++--- misc/translator/po/be-BY-pref.po | 32 - misc/translator/po/be-BY-staff-help.po | 2 +- misc/translator/po/be-BY-staff-prog.po | 758 ++-- misc/translator/po/bg-Cyrl-marc-MARC21.po | 2 +- misc/translator/po/bg-Cyrl-marc-NORMARC.po | 2 +- misc/translator/po/bg-Cyrl-marc-UNIMARC.po | 2 +- misc/translator/po/bg-Cyrl-opac-bootstrap.po | 1217 +++--- misc/translator/po/bg-Cyrl-pref.po | 32 - misc/translator/po/bg-Cyrl-staff-help.po | 2 +- misc/translator/po/bg-Cyrl-staff-prog.po | 760 ++-- misc/translator/po/bn-IN-marc-MARC21.po | 2 +- misc/translator/po/bn-IN-marc-NORMARC.po | 2 +- misc/translator/po/bn-IN-marc-UNIMARC.po | 2 +- misc/translator/po/bn-IN-opac-bootstrap.po | 1217 +++--- misc/translator/po/bn-IN-pref.po | 32 - misc/translator/po/bn-IN-staff-help.po | 2 +- misc/translator/po/bn-IN-staff-prog.po | 760 ++-- misc/translator/po/ca-ES-marc-MARC21.po | 2 +- misc/translator/po/ca-ES-marc-NORMARC.po | 2 +- misc/translator/po/ca-ES-marc-UNIMARC.po | 2 +- misc/translator/po/ca-ES-opac-bootstrap.po | 1217 +++--- misc/translator/po/ca-ES-pref.po | 32 - misc/translator/po/ca-ES-staff-help.po | 2 +- misc/translator/po/ca-ES-staff-prog.po | 756 ++-- misc/translator/po/cs-CZ-marc-MARC21.po | 360 +- misc/translator/po/cs-CZ-marc-NORMARC.po | 2 +- misc/translator/po/cs-CZ-marc-UNIMARC.po | 2 +- misc/translator/po/cs-CZ-opac-bootstrap.po | 1232 +++--- misc/translator/po/cs-CZ-pref.po | 32 - misc/translator/po/cs-CZ-staff-help.po | 2 +- misc/translator/po/cs-CZ-staff-prog.po | 1063 +++--- misc/translator/po/cy-GB-marc-MARC21.po | 2 +- misc/translator/po/cy-GB-marc-NORMARC.po | 2 +- misc/translator/po/cy-GB-marc-UNIMARC.po | 2 +- misc/translator/po/cy-GB-opac-bootstrap.po | 1217 +++--- misc/translator/po/cy-GB-pref.po | 32 - misc/translator/po/cy-GB-staff-help.po | 2 +- misc/translator/po/cy-GB-staff-prog.po | 756 ++-- misc/translator/po/da-DK-marc-MARC21.po | 2 +- misc/translator/po/da-DK-marc-NORMARC.po | 2 +- misc/translator/po/da-DK-marc-UNIMARC.po | 2 +- misc/translator/po/da-DK-opac-bootstrap.po | 1217 +++--- misc/translator/po/da-DK-pref.po | 32 - misc/translator/po/da-DK-staff-help.po | 2 +- misc/translator/po/da-DK-staff-prog.po | 761 ++-- misc/translator/po/de-CH-marc-MARC21.po | 2 +- misc/translator/po/de-CH-marc-NORMARC.po | 2 +- misc/translator/po/de-CH-marc-UNIMARC.po | 2 +- misc/translator/po/de-CH-opac-bootstrap.po | 1217 +++--- misc/translator/po/de-CH-pref.po | 32 - misc/translator/po/de-CH-staff-help.po | 2 +- misc/translator/po/de-CH-staff-prog.po | 773 ++-- misc/translator/po/de-DE-marc-MARC21.po | 2 +- misc/translator/po/de-DE-marc-NORMARC.po | 2 +- misc/translator/po/de-DE-marc-UNIMARC.po | 2 +- misc/translator/po/de-DE-opac-bootstrap.po | 1223 +++--- misc/translator/po/de-DE-pref.po | 41 +- misc/translator/po/de-DE-staff-help.po | 8 +- misc/translator/po/de-DE-staff-prog.po | 810 ++-- misc/translator/po/el-GR-marc-MARC21.po | 20 +- misc/translator/po/el-GR-marc-NORMARC.po | 2 +- misc/translator/po/el-GR-marc-UNIMARC.po | 8 +- misc/translator/po/el-GR-opac-bootstrap.po | 1251 +++--- misc/translator/po/el-GR-pref.po | 148 +- misc/translator/po/el-GR-staff-help.po | 77 +- misc/translator/po/el-GR-staff-prog.po | 1415 +++---- misc/translator/po/en-GB-marc-MARC21.po | 2 +- misc/translator/po/en-GB-marc-NORMARC.po | 2 +- misc/translator/po/en-GB-marc-UNIMARC.po | 2 +- misc/translator/po/en-GB-opac-bootstrap.po | 1217 +++--- misc/translator/po/en-GB-pref.po | 32 - misc/translator/po/en-GB-staff-help.po | 2 +- misc/translator/po/en-GB-staff-prog.po | 770 ++-- misc/translator/po/en-NZ-marc-MARC21.po | 2 +- misc/translator/po/en-NZ-marc-NORMARC.po | 2 +- misc/translator/po/en-NZ-marc-UNIMARC.po | 2 +- misc/translator/po/en-NZ-opac-bootstrap.po | 1217 +++--- misc/translator/po/en-NZ-pref.po | 32 - misc/translator/po/en-NZ-staff-help.po | 2 +- misc/translator/po/en-NZ-staff-prog.po | 766 ++-- misc/translator/po/eo-marc-MARC21.po | 2 +- misc/translator/po/eo-marc-NORMARC.po | 2 +- misc/translator/po/eo-marc-UNIMARC.po | 2 +- misc/translator/po/eo-opac-bootstrap.po | 1229 +++--- misc/translator/po/eo-pref.po | 32 - misc/translator/po/eo-staff-help.po | 2 +- misc/translator/po/eo-staff-prog.po | 760 ++-- misc/translator/po/es-ES-marc-MARC21.po | 2 +- misc/translator/po/es-ES-marc-NORMARC.po | 2 +- misc/translator/po/es-ES-marc-UNIMARC.po | 2 +- misc/translator/po/es-ES-opac-bootstrap.po | 1226 +++--- misc/translator/po/es-ES-pref.po | 32 - misc/translator/po/es-ES-staff-help.po | 2 +- misc/translator/po/es-ES-staff-prog.po | 785 ++-- misc/translator/po/eu-marc-MARC21.po | 2 +- misc/translator/po/eu-marc-NORMARC.po | 2 +- misc/translator/po/eu-marc-UNIMARC.po | 2 +- misc/translator/po/eu-opac-bootstrap.po | 1217 +++--- misc/translator/po/eu-pref.po | 32 - misc/translator/po/eu-staff-help.po | 2 +- misc/translator/po/eu-staff-prog.po | 765 ++-- misc/translator/po/fa-Arab-marc-MARC21.po | 2 +- misc/translator/po/fa-Arab-marc-NORMARC.po | 2 +- misc/translator/po/fa-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/fa-Arab-opac-bootstrap.po | 1217 +++--- misc/translator/po/fa-Arab-pref.po | 32 - misc/translator/po/fa-Arab-staff-help.po | 2 +- misc/translator/po/fa-Arab-staff-prog.po | 761 ++-- misc/translator/po/fi-FI-marc-MARC21.po | 2 +- misc/translator/po/fi-FI-marc-NORMARC.po | 2 +- misc/translator/po/fi-FI-marc-UNIMARC.po | 2 +- misc/translator/po/fi-FI-opac-bootstrap.po | 1217 +++--- misc/translator/po/fi-FI-pref.po | 32 - misc/translator/po/fi-FI-staff-help.po | 2 +- misc/translator/po/fi-FI-staff-prog.po | 766 ++-- misc/translator/po/fo-FO-marc-MARC21.po | 2 +- misc/translator/po/fo-FO-marc-NORMARC.po | 2 +- misc/translator/po/fo-FO-marc-UNIMARC.po | 2 +- misc/translator/po/fo-FO-opac-bootstrap.po | 1217 +++--- misc/translator/po/fo-FO-pref.po | 32 - misc/translator/po/fo-FO-staff-help.po | 2 +- misc/translator/po/fo-FO-staff-prog.po | 756 ++-- misc/translator/po/fr-CA-marc-MARC21.po | 4013 ++++++++++---------- misc/translator/po/fr-CA-marc-NORMARC.po | 2 +- misc/translator/po/fr-CA-marc-UNIMARC.po | 2 +- misc/translator/po/fr-CA-opac-bootstrap.po | 1249 +++--- misc/translator/po/fr-CA-pref.po | 181 +- misc/translator/po/fr-CA-staff-help.po | 88 +- misc/translator/po/fr-CA-staff-prog.po | 939 ++--- misc/translator/po/fr-FR-marc-MARC21.po | 87 +- misc/translator/po/fr-FR-marc-NORMARC.po | 2 +- misc/translator/po/fr-FR-marc-UNIMARC.po | 2 +- misc/translator/po/fr-FR-opac-bootstrap.po | 1221 +++--- misc/translator/po/fr-FR-pref.po | 51 +- misc/translator/po/fr-FR-staff-help.po | 2 +- misc/translator/po/fr-FR-staff-prog.po | 800 ++-- misc/translator/po/ga-marc-MARC21.po | 2 +- misc/translator/po/ga-marc-NORMARC.po | 2 +- misc/translator/po/ga-marc-UNIMARC.po | 2 +- misc/translator/po/ga-opac-bootstrap.po | 1217 +++--- misc/translator/po/ga-pref.po | 32 - misc/translator/po/ga-staff-help.po | 2 +- misc/translator/po/ga-staff-prog.po | 756 ++-- misc/translator/po/gd-marc-MARC21.po | 2 +- misc/translator/po/gd-marc-NORMARC.po | 2 +- misc/translator/po/gd-marc-UNIMARC.po | 2 +- misc/translator/po/gd-opac-bootstrap.po | 1217 +++--- misc/translator/po/gd-pref.po | 32 - misc/translator/po/gd-staff-help.po | 2 +- misc/translator/po/gd-staff-prog.po | 756 ++-- misc/translator/po/gl-marc-MARC21.po | 2 +- misc/translator/po/gl-marc-NORMARC.po | 2 +- misc/translator/po/gl-marc-UNIMARC.po | 2 +- misc/translator/po/gl-opac-bootstrap.po | 1217 +++--- misc/translator/po/gl-pref.po | 32 - misc/translator/po/gl-staff-help.po | 2 +- misc/translator/po/gl-staff-prog.po | 757 ++-- misc/translator/po/he-Hebr-marc-MARC21.po | 2 +- misc/translator/po/he-Hebr-marc-NORMARC.po | 2 +- misc/translator/po/he-Hebr-marc-UNIMARC.po | 2 +- misc/translator/po/he-Hebr-opac-bootstrap.po | 1217 +++--- misc/translator/po/he-Hebr-pref.po | 32 - misc/translator/po/he-Hebr-staff-help.po | 2 +- misc/translator/po/he-Hebr-staff-prog.po | 757 ++-- misc/translator/po/hi-marc-MARC21.po | 2 +- misc/translator/po/hi-marc-NORMARC.po | 2 +- misc/translator/po/hi-marc-UNIMARC.po | 2 +- misc/translator/po/hi-opac-bootstrap.po | 1224 +++--- misc/translator/po/hi-pref.po | 32 - misc/translator/po/hi-staff-help.po | 2 +- misc/translator/po/hi-staff-prog.po | 792 ++-- misc/translator/po/hr-HR-marc-MARC21.po | 2 +- misc/translator/po/hr-HR-marc-NORMARC.po | 2 +- misc/translator/po/hr-HR-marc-UNIMARC.po | 2 +- misc/translator/po/hr-HR-opac-bootstrap.po | 1217 +++--- misc/translator/po/hr-HR-pref.po | 32 - misc/translator/po/hr-HR-staff-help.po | 2 +- misc/translator/po/hr-HR-staff-prog.po | 758 ++-- misc/translator/po/hu-HU-marc-MARC21.po | 2 +- misc/translator/po/hu-HU-marc-NORMARC.po | 2 +- misc/translator/po/hu-HU-marc-UNIMARC.po | 2 +- misc/translator/po/hu-HU-opac-bootstrap.po | 1217 +++--- misc/translator/po/hu-HU-pref.po | 32 - misc/translator/po/hu-HU-staff-help.po | 2 +- misc/translator/po/hu-HU-staff-prog.po | 758 ++-- misc/translator/po/hy-Armn-marc-MARC21.po | 14 +- misc/translator/po/hy-Armn-marc-NORMARC.po | 2 +- misc/translator/po/hy-Armn-marc-UNIMARC.po | 2 +- misc/translator/po/hy-Armn-opac-bootstrap.po | 1233 +++--- misc/translator/po/hy-Armn-pref.po | 32 - misc/translator/po/hy-Armn-staff-help.po | 11 +- misc/translator/po/hy-Armn-staff-prog.po | 818 ++-- misc/translator/po/ia-marc-MARC21.po | 2 +- misc/translator/po/ia-marc-NORMARC.po | 2 +- misc/translator/po/ia-marc-UNIMARC.po | 2 +- misc/translator/po/ia-opac-bootstrap.po | 1217 +++--- misc/translator/po/ia-pref.po | 32 - misc/translator/po/ia-staff-help.po | 2 +- misc/translator/po/ia-staff-prog.po | 756 ++-- misc/translator/po/id-ID-marc-MARC21.po | 2 +- misc/translator/po/id-ID-marc-NORMARC.po | 2 +- misc/translator/po/id-ID-marc-UNIMARC.po | 2 +- misc/translator/po/id-ID-opac-bootstrap.po | 1217 +++--- misc/translator/po/id-ID-pref.po | 32 - misc/translator/po/id-ID-staff-help.po | 2 +- misc/translator/po/id-ID-staff-prog.po | 756 ++-- misc/translator/po/iq-CA-marc-MARC21.po | 2 +- misc/translator/po/iq-CA-marc-NORMARC.po | 2 +- misc/translator/po/iq-CA-marc-UNIMARC.po | 2 +- misc/translator/po/iq-CA-opac-bootstrap.po | 1217 +++--- misc/translator/po/iq-CA-pref.po | 32 - misc/translator/po/iq-CA-staff-help.po | 2 +- misc/translator/po/iq-CA-staff-prog.po | 756 ++-- misc/translator/po/is-IS-marc-MARC21.po | 2 +- misc/translator/po/is-IS-marc-NORMARC.po | 2 +- misc/translator/po/is-IS-marc-UNIMARC.po | 2 +- misc/translator/po/is-IS-opac-bootstrap.po | 1217 +++--- misc/translator/po/is-IS-pref.po | 32 - misc/translator/po/is-IS-staff-help.po | 2 +- misc/translator/po/is-IS-staff-prog.po | 756 ++-- misc/translator/po/it-IT-marc-MARC21.po | 2 +- misc/translator/po/it-IT-marc-NORMARC.po | 2 +- misc/translator/po/it-IT-marc-UNIMARC.po | 2 +- misc/translator/po/it-IT-opac-bootstrap.po | 1217 +++--- misc/translator/po/it-IT-pref.po | 32 - misc/translator/po/it-IT-staff-help.po | 2 +- misc/translator/po/it-IT-staff-prog.po | 775 ++-- misc/translator/po/iu-CA-marc-MARC21.po | 2 +- misc/translator/po/iu-CA-marc-NORMARC.po | 2 +- misc/translator/po/iu-CA-marc-UNIMARC.po | 2 +- misc/translator/po/iu-CA-opac-bootstrap.po | 1217 +++--- misc/translator/po/iu-CA-pref.po | 32 - misc/translator/po/iu-CA-staff-help.po | 2 +- misc/translator/po/iu-CA-staff-prog.po | 756 ++-- misc/translator/po/ja-Jpan-JP-marc-MARC21.po | 2 +- misc/translator/po/ja-Jpan-JP-marc-NORMARC.po | 2 +- misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po | 2 +- misc/translator/po/ja-Jpan-JP-opac-bootstrap.po | 1217 +++--- misc/translator/po/ja-Jpan-JP-pref.po | 32 - misc/translator/po/ja-Jpan-JP-staff-help.po | 2 +- misc/translator/po/ja-Jpan-JP-staff-prog.po | 766 ++-- misc/translator/po/ka-marc-MARC21.po | 2 +- misc/translator/po/ka-marc-NORMARC.po | 2 +- misc/translator/po/ka-marc-UNIMARC.po | 2 +- misc/translator/po/ka-opac-bootstrap.po | 1217 +++--- misc/translator/po/ka-pref.po | 32 - misc/translator/po/ka-staff-help.po | 2 +- misc/translator/po/ka-staff-prog.po | 756 ++-- misc/translator/po/km-KH-marc-MARC21.po | 2 +- misc/translator/po/km-KH-marc-NORMARC.po | 2 +- misc/translator/po/km-KH-marc-UNIMARC.po | 2 +- misc/translator/po/km-KH-opac-bootstrap.po | 1217 +++--- misc/translator/po/km-KH-pref.po | 32 - misc/translator/po/km-KH-staff-help.po | 2 +- misc/translator/po/km-KH-staff-prog.po | 756 ++-- misc/translator/po/kn-Knda-marc-MARC21.po | 2 +- misc/translator/po/kn-Knda-marc-NORMARC.po | 2 +- misc/translator/po/kn-Knda-marc-UNIMARC.po | 2 +- misc/translator/po/kn-Knda-opac-bootstrap.po | 1217 +++--- misc/translator/po/kn-Knda-pref.po | 32 - misc/translator/po/kn-Knda-staff-help.po | 2 +- misc/translator/po/kn-Knda-staff-prog.po | 757 ++-- misc/translator/po/ko-Kore-KP-marc-MARC21.po | 2 +- misc/translator/po/ko-Kore-KP-marc-NORMARC.po | 2 +- misc/translator/po/ko-Kore-KP-marc-UNIMARC.po | 2 +- misc/translator/po/ko-Kore-KP-opac-bootstrap.po | 1219 +++--- misc/translator/po/ko-Kore-KP-pref.po | 32 - misc/translator/po/ko-Kore-KP-staff-help.po | 2 +- misc/translator/po/ko-Kore-KP-staff-prog.po | 756 ++-- misc/translator/po/ku-Arab-marc-MARC21.po | 2 +- misc/translator/po/ku-Arab-marc-NORMARC.po | 2 +- misc/translator/po/ku-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ku-Arab-opac-bootstrap.po | 1217 +++--- misc/translator/po/ku-Arab-pref.po | 32 - misc/translator/po/ku-Arab-staff-help.po | 2 +- misc/translator/po/ku-Arab-staff-prog.po | 758 ++-- misc/translator/po/lo-Laoo-marc-MARC21.po | 2 +- misc/translator/po/lo-Laoo-marc-NORMARC.po | 2 +- misc/translator/po/lo-Laoo-marc-UNIMARC.po | 2 +- misc/translator/po/lo-Laoo-opac-bootstrap.po | 1217 +++--- misc/translator/po/lo-Laoo-pref.po | 32 - misc/translator/po/lo-Laoo-staff-help.po | 2 +- misc/translator/po/lo-Laoo-staff-prog.po | 756 ++-- .../po/{gd-marc-MARC21.po => lv-marc-MARC21.po} | 2 +- .../po/{gd-marc-NORMARC.po => lv-marc-NORMARC.po} | 2 +- .../po/{gd-marc-UNIMARC.po => lv-marc-UNIMARC.po} | 2 +- .../{gd-opac-bootstrap.po => lv-opac-bootstrap.po} | 1261 +++--- misc/translator/po/{gd-pref.po => lv-pref.po} | 32 - .../po/{gd-staff-help.po => lv-staff-help.po} | 2 +- .../po/{gd-staff-prog.po => lv-staff-prog.po} | 756 ++-- misc/translator/po/mi-NZ-marc-MARC21.po | 2 +- misc/translator/po/mi-NZ-marc-NORMARC.po | 2 +- misc/translator/po/mi-NZ-marc-UNIMARC.po | 2 +- misc/translator/po/mi-NZ-opac-bootstrap.po | 1217 +++--- misc/translator/po/mi-NZ-pref.po | 32 - misc/translator/po/mi-NZ-staff-help.po | 2 +- misc/translator/po/mi-NZ-staff-prog.po | 756 ++-- misc/translator/po/ml-marc-MARC21.po | 2 +- misc/translator/po/ml-marc-NORMARC.po | 2 +- misc/translator/po/ml-marc-UNIMARC.po | 2 +- misc/translator/po/ml-opac-bootstrap.po | 1217 +++--- misc/translator/po/ml-pref.po | 32 - misc/translator/po/ml-staff-help.po | 2 +- misc/translator/po/ml-staff-prog.po | 756 ++-- misc/translator/po/mon-marc-MARC21.po | 2 +- misc/translator/po/mon-marc-NORMARC.po | 2 +- misc/translator/po/mon-marc-UNIMARC.po | 2 +- misc/translator/po/mon-opac-bootstrap.po | 1299 +++---- misc/translator/po/mon-pref.po | 32 - misc/translator/po/mon-staff-help.po | 2 +- misc/translator/po/mon-staff-prog.po | 756 ++-- misc/translator/po/mr-marc-MARC21.po | 2 +- misc/translator/po/mr-marc-NORMARC.po | 2 +- misc/translator/po/mr-marc-UNIMARC.po | 2 +- misc/translator/po/mr-opac-bootstrap.po | 1217 +++--- misc/translator/po/mr-pref.po | 32 - misc/translator/po/mr-staff-help.po | 2 +- misc/translator/po/mr-staff-prog.po | 756 ++-- misc/translator/po/ms-MY-marc-MARC21.po | 2 +- misc/translator/po/ms-MY-marc-NORMARC.po | 2 +- misc/translator/po/ms-MY-marc-UNIMARC.po | 2 +- misc/translator/po/ms-MY-opac-bootstrap.po | 1217 +++--- misc/translator/po/ms-MY-pref.po | 32 - misc/translator/po/ms-MY-staff-help.po | 2 +- misc/translator/po/ms-MY-staff-prog.po | 772 ++-- misc/translator/po/my-marc-MARC21.po | 2 +- misc/translator/po/my-marc-NORMARC.po | 2 +- misc/translator/po/my-marc-UNIMARC.po | 2 +- misc/translator/po/my-opac-bootstrap.po | 1217 +++--- misc/translator/po/my-pref.po | 32 - misc/translator/po/my-staff-help.po | 2 +- misc/translator/po/my-staff-prog.po | 756 ++-- misc/translator/po/nb-NO-marc-MARC21.po | 2 +- misc/translator/po/nb-NO-marc-NORMARC.po | 2 +- misc/translator/po/nb-NO-marc-UNIMARC.po | 2 +- misc/translator/po/nb-NO-opac-bootstrap.po | 1217 +++--- misc/translator/po/nb-NO-pref.po | 32 - misc/translator/po/nb-NO-staff-help.po | 2 +- misc/translator/po/nb-NO-staff-prog.po | 769 ++-- misc/translator/po/ne-NE-marc-MARC21.po | 2 +- misc/translator/po/ne-NE-marc-NORMARC.po | 2 +- misc/translator/po/ne-NE-marc-UNIMARC.po | 2 +- misc/translator/po/ne-NE-opac-bootstrap.po | 1217 +++--- misc/translator/po/ne-NE-pref.po | 32 - misc/translator/po/ne-NE-staff-help.po | 2 +- misc/translator/po/ne-NE-staff-prog.po | 760 ++-- misc/translator/po/nl-BE-marc-MARC21.po | 2 +- misc/translator/po/nl-BE-marc-NORMARC.po | 2 +- misc/translator/po/nl-BE-marc-UNIMARC.po | 2 +- misc/translator/po/nl-BE-opac-bootstrap.po | 1217 +++--- misc/translator/po/nl-BE-pref.po | 32 - misc/translator/po/nl-BE-staff-help.po | 2 +- misc/translator/po/nl-BE-staff-prog.po | 759 ++-- misc/translator/po/nl-NL-marc-MARC21.po | 2 +- misc/translator/po/nl-NL-marc-NORMARC.po | 2 +- misc/translator/po/nl-NL-marc-UNIMARC.po | 2 +- misc/translator/po/nl-NL-opac-bootstrap.po | 1217 +++--- misc/translator/po/nl-NL-pref.po | 32 - misc/translator/po/nl-NL-staff-help.po | 2 +- misc/translator/po/nl-NL-staff-prog.po | 760 ++-- misc/translator/po/nn-NO-marc-MARC21.po | 2 +- misc/translator/po/nn-NO-marc-NORMARC.po | 2 +- misc/translator/po/nn-NO-marc-UNIMARC.po | 2 +- misc/translator/po/nn-NO-opac-bootstrap.po | 1217 +++--- misc/translator/po/nn-NO-pref.po | 32 - misc/translator/po/nn-NO-staff-help.po | 2 +- misc/translator/po/nn-NO-staff-prog.po | 756 ++-- misc/translator/po/oc-marc-MARC21.po | 2 +- misc/translator/po/oc-marc-NORMARC.po | 2 +- misc/translator/po/oc-marc-UNIMARC.po | 2 +- misc/translator/po/oc-opac-bootstrap.po | 1217 +++--- misc/translator/po/oc-pref.po | 32 - misc/translator/po/oc-staff-help.po | 2 +- misc/translator/po/oc-staff-prog.po | 763 ++-- misc/translator/po/pbr-marc-MARC21.po | 2 +- misc/translator/po/pbr-marc-NORMARC.po | 2 +- misc/translator/po/pbr-marc-UNIMARC.po | 2 +- misc/translator/po/pbr-opac-bootstrap.po | 1217 +++--- misc/translator/po/pbr-pref.po | 32 - misc/translator/po/pbr-staff-help.po | 2 +- misc/translator/po/pbr-staff-prog.po | 760 ++-- misc/translator/po/pl-PL-marc-MARC21.po | 2 +- misc/translator/po/pl-PL-marc-NORMARC.po | 2 +- misc/translator/po/pl-PL-marc-UNIMARC.po | 2 +- misc/translator/po/pl-PL-opac-bootstrap.po | 1217 +++--- misc/translator/po/pl-PL-pref.po | 32 - misc/translator/po/pl-PL-staff-help.po | 2 +- misc/translator/po/pl-PL-staff-prog.po | 771 ++-- misc/translator/po/prs-marc-MARC21.po | 2 +- misc/translator/po/prs-marc-NORMARC.po | 2 +- misc/translator/po/prs-marc-UNIMARC.po | 2 +- misc/translator/po/prs-opac-bootstrap.po | 1217 +++--- misc/translator/po/prs-pref.po | 32 - misc/translator/po/prs-staff-help.po | 2 +- misc/translator/po/prs-staff-prog.po | 756 ++-- misc/translator/po/pt-BR-marc-MARC21.po | 14 +- misc/translator/po/pt-BR-marc-NORMARC.po | 2 +- misc/translator/po/pt-BR-marc-UNIMARC.po | 2 +- misc/translator/po/pt-BR-opac-bootstrap.po | 1217 +++--- misc/translator/po/pt-BR-pref.po | 32 - misc/translator/po/pt-BR-staff-help.po | 2 +- misc/translator/po/pt-BR-staff-prog.po | 765 ++-- misc/translator/po/pt-PT-marc-MARC21.po | 2 +- misc/translator/po/pt-PT-marc-NORMARC.po | 2 +- misc/translator/po/pt-PT-marc-UNIMARC.po | 2 +- misc/translator/po/pt-PT-opac-bootstrap.po | 1217 +++--- misc/translator/po/pt-PT-pref.po | 32 - misc/translator/po/pt-PT-staff-help.po | 2 +- misc/translator/po/pt-PT-staff-prog.po | 769 ++-- misc/translator/po/ro-RO-marc-MARC21.po | 2 +- misc/translator/po/ro-RO-marc-NORMARC.po | 2 +- misc/translator/po/ro-RO-marc-UNIMARC.po | 2 +- misc/translator/po/ro-RO-opac-bootstrap.po | 1217 +++--- misc/translator/po/ro-RO-pref.po | 32 - misc/translator/po/ro-RO-staff-help.po | 2 +- misc/translator/po/ro-RO-staff-prog.po | 756 ++-- misc/translator/po/ru-RU-marc-MARC21.po | 2 +- misc/translator/po/ru-RU-marc-NORMARC.po | 2 +- misc/translator/po/ru-RU-marc-UNIMARC.po | 2 +- misc/translator/po/ru-RU-opac-bootstrap.po | 1217 +++--- misc/translator/po/ru-RU-pref.po | 32 - misc/translator/po/ru-RU-staff-help.po | 2 +- misc/translator/po/ru-RU-staff-prog.po | 774 ++-- misc/translator/po/rw-RW-marc-MARC21.po | 2 +- misc/translator/po/rw-RW-marc-NORMARC.po | 2 +- misc/translator/po/rw-RW-marc-UNIMARC.po | 2 +- misc/translator/po/rw-RW-opac-bootstrap.po | 1217 +++--- misc/translator/po/rw-RW-pref.po | 32 - misc/translator/po/rw-RW-staff-help.po | 2 +- misc/translator/po/rw-RW-staff-prog.po | 756 ++-- misc/translator/po/sd-PK-marc-MARC21.po | 2 +- misc/translator/po/sd-PK-marc-NORMARC.po | 2 +- misc/translator/po/sd-PK-marc-UNIMARC.po | 2 +- misc/translator/po/sd-PK-opac-bootstrap.po | 1217 +++--- misc/translator/po/sd-PK-pref.po | 32 - misc/translator/po/sd-PK-staff-help.po | 2 +- misc/translator/po/sd-PK-staff-prog.po | 760 ++-- misc/translator/po/sk-SK-marc-MARC21.po | 2 +- misc/translator/po/sk-SK-marc-NORMARC.po | 2 +- misc/translator/po/sk-SK-marc-UNIMARC.po | 2 +- misc/translator/po/sk-SK-opac-bootstrap.po | 1217 +++--- misc/translator/po/sk-SK-pref.po | 32 - misc/translator/po/sk-SK-staff-help.po | 2 +- misc/translator/po/sk-SK-staff-prog.po | 776 ++-- misc/translator/po/sl-SI-marc-MARC21.po | 2 +- misc/translator/po/sl-SI-marc-NORMARC.po | 2 +- misc/translator/po/sl-SI-marc-UNIMARC.po | 2 +- misc/translator/po/sl-SI-opac-bootstrap.po | 1217 +++--- misc/translator/po/sl-SI-pref.po | 32 - misc/translator/po/sl-SI-staff-help.po | 2 +- misc/translator/po/sl-SI-staff-prog.po | 756 ++-- misc/translator/po/sq-AL-marc-MARC21.po | 2 +- misc/translator/po/sq-AL-marc-NORMARC.po | 2 +- misc/translator/po/sq-AL-marc-UNIMARC.po | 2 +- misc/translator/po/sq-AL-opac-bootstrap.po | 1217 +++--- misc/translator/po/sq-AL-pref.po | 32 - misc/translator/po/sq-AL-staff-help.po | 2 +- misc/translator/po/sq-AL-staff-prog.po | 756 ++-- misc/translator/po/sr-Cyrl-marc-MARC21.po | 2 +- misc/translator/po/sr-Cyrl-marc-NORMARC.po | 2 +- misc/translator/po/sr-Cyrl-marc-UNIMARC.po | 2 +- misc/translator/po/sr-Cyrl-opac-bootstrap.po | 1217 +++--- misc/translator/po/sr-Cyrl-pref.po | 32 - misc/translator/po/sr-Cyrl-staff-help.po | 2 +- misc/translator/po/sr-Cyrl-staff-prog.po | 760 ++-- misc/translator/po/sv-SE-marc-MARC21.po | 2 +- misc/translator/po/sv-SE-marc-NORMARC.po | 2 +- misc/translator/po/sv-SE-marc-UNIMARC.po | 2 +- misc/translator/po/sv-SE-opac-bootstrap.po | 1226 +++--- misc/translator/po/sv-SE-pref.po | 32 - misc/translator/po/sv-SE-staff-help.po | 2 +- misc/translator/po/sv-SE-staff-prog.po | 771 ++-- misc/translator/po/sw-KE-marc-MARC21.po | 2 +- misc/translator/po/sw-KE-marc-NORMARC.po | 2 +- misc/translator/po/sw-KE-marc-UNIMARC.po | 2 +- misc/translator/po/sw-KE-opac-bootstrap.po | 1217 +++--- misc/translator/po/sw-KE-pref.po | 32 - misc/translator/po/sw-KE-staff-help.po | 2 +- misc/translator/po/sw-KE-staff-prog.po | 756 ++-- misc/translator/po/ta-LK-marc-MARC21.po | 2 +- misc/translator/po/ta-LK-marc-NORMARC.po | 2 +- misc/translator/po/ta-LK-marc-UNIMARC.po | 2 +- misc/translator/po/ta-LK-opac-bootstrap.po | 1217 +++--- misc/translator/po/ta-LK-pref.po | 32 - misc/translator/po/ta-LK-staff-help.po | 2 +- misc/translator/po/ta-LK-staff-prog.po | 760 ++-- misc/translator/po/ta-marc-MARC21.po | 2 +- misc/translator/po/ta-marc-NORMARC.po | 2 +- misc/translator/po/ta-marc-UNIMARC.po | 2 +- misc/translator/po/ta-opac-bootstrap.po | 1217 +++--- misc/translator/po/ta-pref.po | 32 - misc/translator/po/ta-staff-help.po | 2 +- misc/translator/po/ta-staff-prog.po | 760 ++-- misc/translator/po/tet-marc-MARC21.po | 2 +- misc/translator/po/tet-marc-NORMARC.po | 2 +- misc/translator/po/tet-marc-UNIMARC.po | 2 +- misc/translator/po/tet-opac-bootstrap.po | 1217 +++--- misc/translator/po/tet-pref.po | 32 - misc/translator/po/tet-staff-help.po | 2 +- misc/translator/po/tet-staff-prog.po | 762 ++-- misc/translator/po/th-TH-marc-MARC21.po | 2 +- misc/translator/po/th-TH-marc-NORMARC.po | 2 +- misc/translator/po/th-TH-marc-UNIMARC.po | 2 +- misc/translator/po/th-TH-opac-bootstrap.po | 1217 +++--- misc/translator/po/th-TH-pref.po | 32 - misc/translator/po/th-TH-staff-help.po | 2 +- misc/translator/po/th-TH-staff-prog.po | 756 ++-- misc/translator/po/tl-PH-marc-MARC21.po | 2 +- misc/translator/po/tl-PH-marc-NORMARC.po | 2 +- misc/translator/po/tl-PH-marc-UNIMARC.po | 2 +- misc/translator/po/tl-PH-opac-bootstrap.po | 1217 +++--- misc/translator/po/tl-PH-pref.po | 32 - misc/translator/po/tl-PH-staff-help.po | 2 +- misc/translator/po/tl-PH-staff-prog.po | 760 ++-- misc/translator/po/tr-TR-marc-MARC21.po | 2 +- misc/translator/po/tr-TR-marc-NORMARC.po | 2 +- misc/translator/po/tr-TR-marc-UNIMARC.po | 2 +- misc/translator/po/tr-TR-opac-bootstrap.po | 1217 +++--- misc/translator/po/tr-TR-pref.po | 32 - misc/translator/po/tr-TR-staff-help.po | 2 +- misc/translator/po/tr-TR-staff-prog.po | 773 ++-- misc/translator/po/tvl-marc-MARC21.po | 2 +- misc/translator/po/tvl-marc-NORMARC.po | 2 +- misc/translator/po/tvl-marc-UNIMARC.po | 2 +- misc/translator/po/tvl-opac-bootstrap.po | 1217 +++--- misc/translator/po/tvl-pref.po | 32 - misc/translator/po/tvl-staff-help.po | 2 +- misc/translator/po/tvl-staff-prog.po | 756 ++-- misc/translator/po/uk-UA-marc-MARC21.po | 12 +- misc/translator/po/uk-UA-marc-NORMARC.po | 2 +- misc/translator/po/uk-UA-marc-UNIMARC.po | 2 +- misc/translator/po/uk-UA-opac-bootstrap.po | 1304 ++++--- misc/translator/po/uk-UA-pref.po | 55 +- misc/translator/po/uk-UA-staff-help.po | 2 +- misc/translator/po/uk-UA-staff-prog.po | 856 +++-- misc/translator/po/ur-Arab-marc-MARC21.po | 2 +- misc/translator/po/ur-Arab-marc-NORMARC.po | 2 +- misc/translator/po/ur-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ur-Arab-opac-bootstrap.po | 1217 +++--- misc/translator/po/ur-Arab-pref.po | 32 - misc/translator/po/ur-Arab-staff-help.po | 2 +- misc/translator/po/ur-Arab-staff-prog.po | 760 ++-- misc/translator/po/vi-VN-marc-MARC21.po | 2 +- misc/translator/po/vi-VN-marc-NORMARC.po | 2 +- misc/translator/po/vi-VN-marc-UNIMARC.po | 2 +- misc/translator/po/vi-VN-opac-bootstrap.po | 1217 +++--- misc/translator/po/vi-VN-pref.po | 32 - misc/translator/po/vi-VN-staff-help.po | 2 +- misc/translator/po/vi-VN-staff-prog.po | 760 ++-- misc/translator/po/zh-Hans-CN-marc-MARC21.po | 2 +- misc/translator/po/zh-Hans-CN-marc-NORMARC.po | 2 +- misc/translator/po/zh-Hans-CN-marc-UNIMARC.po | 2 +- misc/translator/po/zh-Hans-CN-opac-bootstrap.po | 1248 +++--- misc/translator/po/zh-Hans-CN-pref.po | 32 - misc/translator/po/zh-Hans-CN-staff-help.po | 14 +- misc/translator/po/zh-Hans-CN-staff-prog.po | 760 ++-- misc/translator/po/zh-Hans-TW-marc-MARC21.po | 2 +- misc/translator/po/zh-Hans-TW-marc-NORMARC.po | 2 +- misc/translator/po/zh-Hans-TW-marc-UNIMARC.po | 2 +- misc/translator/po/zh-Hans-TW-opac-bootstrap.po | 1229 +++--- misc/translator/po/zh-Hans-TW-pref.po | 37 +- misc/translator/po/zh-Hans-TW-staff-help.po | 10 +- misc/translator/po/zh-Hans-TW-staff-prog.po | 771 ++-- t/db_dependent/ILSDI_Services.t | 35 +- 601 files changed, 88748 insertions(+), 90763 deletions(-) create mode 100644 misc/release_notes/release_notes_18_05_03.html create mode 100644 misc/release_notes/release_notes_18_05_03.md copy misc/translator/po/{gd-marc-MARC21.po => lv-marc-MARC21.po} (99%) copy misc/translator/po/{gd-marc-NORMARC.po => lv-marc-NORMARC.po} (99%) copy misc/translator/po/{gd-marc-UNIMARC.po => lv-marc-UNIMARC.po} (99%) copy misc/translator/po/{gd-opac-bootstrap.po => lv-opac-bootstrap.po} (91%) copy misc/translator/po/{gd-pref.po => lv-pref.po} (99%) copy misc/translator/po/{gd-staff-help.po => lv-staff-help.po} (99%) copy misc/translator/po/{gd-staff-prog.po => lv-staff-prog.po} (99%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 30 12:27:59 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 30 Aug 2018 10:27:59 +0000 Subject: [koha-commits] main Koha release repository annotated tag v18.05.03 created. v18.05.03 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, v18.05.03 has been created at 5fc3fd00aed0fa48c40104936332a6522313c762 (tag) tagging b83ae47974455a529692edd4070f4f2dd3bfa3bd (commit) replaces v18.05.02 tagged by Martin Renvoize on Fri Aug 24 15:44:59 2018 +0100 - Log ----------------------------------------------------------------- Koha release 18.05.03 -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE8g0J8pGJSlfC6TBmQitGkTBEGg8FAluAGesACgkQQitGkTBE Gg8hwBAAhuEqKZpnNKWGPBDO6iIJrcS1v9Y/YDmXguMNr1g8rTiMkD9V7a6gijts ldSjxhMJb2HP5o1PcqH3rH0y2cxKZZVJgSROkocsR6esmLGnCbT/ojAS/4JcWMF0 f8sjZ+FRc13ukN2HhBrERYfFLNgyM6f1fThei3mwCCz5uj+2W79bvERAEVMacrc5 L4vlgaUHDDr21IBDF5bBUhdRasZuIUyV9hr9o8jzXlWG9gY1xlidyuZ+/y2jCkoR uXRbMRdV/o7PH7u+pES7Zfh3g60Ot5QoVSEKLLPyEa3FdW9CmX9C4CySSWR3D7IJ UAqM5HM0ugc2B7UxyW0+BJBt8kOM+QMfmXtB/QNSVMVABzVDb1MJm/6g6I8TuGzR DKYSOcUO8UyVv1C4hAWmJVzc8ULRnV7HYDbW4uIesvdTRa6AvC5MCTK8YnOQYzIt kVk1O4cc4frs9USDOc9GDUbMQ8pSF/BP7RJpE4YFluMqd8k3zZtx/H+Kho+UDMWB KxHsworQO13eLy5Bg0QTpRxjdmzEZCj/zy+CscCbRZvspcmyzMw1LMbUC4rj1BQA 4DnHDVFXwEaex6zXMof3PRrk5o5BpVIMOGcAH499jk84S51FQbIEh9EEvzsuLcZx nOyHDgjZaQPTvngN/xos1YcOgbP994BDYepPSIfSSXI5e2MEhSU= =lNTz -----END PGP SIGNATURE----- Alex Arnaud (2): Bug 21032: Fix using facet for searches made on specific index Bug 20273: (follow-up) Autocomplete use start instead of contains Andrew Isherwood (1): Bug 20770: ILL loans OPAC form notes field allow arbitrary input Baptiste Wojtkowski (1): Bug 15408: Remove fund's timestamp when cloning a budget Chris Nighswonger (1): Bug 8604: Patron cards made for patrons which don't have patron images use preceding card's image David Bourgault (2): Bug 20660: Test AddReturn with $return_date override Bug 20660: Return date override affects debarments in AddReturn David Cook (3): Bug 21097: Missing optgroup closing tag in orderreceive.tt Bug 21031: Apache Rewrite rules don't work for API when using anything but Debian package Plack configuration Bug 21131: Remove the TinyMCE.isDirty() check that caused unexpected behaviour Jonathan Druart (40): Bug 20079: Display stack trace for development installations Bug 20806: Do not rely on column position Bug 20806: Surround string by span tag to help translation Bug 21053: Encode URI characters in plugin 008 Bug 20811: Fix wrong usage of ModBiblio Bug 20757: Capture and upload screenshot on selenium errors Bug 20757: Add pod for ->capture Bug 21134: Correctly throw the exception in Koha::Patron::Modification->approve Bug 19604: Fix perlcritic "Loop iterator is not lexical" Bug 21018: Fix TrackClicks for 952$u Bug 21018: Allow uris defined in the item Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS) Bug 21099: Reposition floating toolbars earlier Bug 21141: Handle non-existent itemnumbers in batch item modification/deletion Bug 21056: Add another flush later Bug 21035: Handle new lines when running reports Bug 20661: Shortcut circ scripts if a blocking error appeared Bug 21125: Shortcut moredetail.pl on nonexistent biblionumber Bug 21208: Fix housebound deliverer/chooser names Bug 21139: Floating toolbar - Remove dup id Bug 21139: Floating toolbars - Remove unecessary height Bug 21139: Floating toolbar - Remove horizontal scrollbar on resize Bug 21139: Floating toolbar - Resize toolbar on window resize Bug 21139: No table in toolbar Bug 20795: Inform the user about this change, add to pod Bug 21221: Shortcut memberentry scripts if patron does not exist Bug 21213: Add diagnostics to Circulation.t Bug 21230: Prevent Reserves.t to fail randomly Bug 21226: DB Changes Bug 21226: Remove xISBN services Bug 21203: ILS-DI - Make GetRecords handle non-existent records Bug 21238: Prevent TemplateToolkit.t to fail on slow servers Bug 21142: Open uploaded files in utf-8 - batch mod/del Bug 19500: Add missing span for 'other' Bug 21011: Search for items with not defined homebranch and/or holdingbranch Bug 20509: Search for not defined authority codes Bug 21150: Search for item types inconsistencies Bug 21150: add the biblionumber to the output Bug 21182: Remove acqui/check_duplicate_barcode_ajax.pl Bug 21199: Hide patron's attributes from ILSDI if required Josef Moravec (5): Bug 20806: Add item type description holds history page Bug 20990: (follow-up) Fix test description Bug 21145: Do not show buttons for datatables on opac detail page Bug 21154: Remove unused subs from C4::Serials Bug 21011: (follow-up) Fix pod, fix missing homebranch condition, change mode to executable Joy Nelson (2): Bug 17625: adding subfields f and g to XSLT display Bug 20984: Add 300$f to display Katrin Fischer (14): Bug 16575: (follow-up) Compiled CSS Bug 21077: Fix database documentation for statistics.type Bug 14662: Add empty entries to pull downs on item form for mandatory subfields Bug 14662: Add empty entries to pull downs in cataloguing form for mandatory subfields Bug 21151: Fix SRU search fields mapping pop-up Bug 20683: Update German web installer for 18.05 Bug 19390: Make jQuery selector more specific, so OPAC view link can open in new tab Bug 21144: Add ROADTYPE to default authorised values categories Bug 19500: Make module names on letters overview page translatable Bug 19500: (QA follow-up) Add spans to ease translation Bug 7996: (QA follow-up) Remove unnecessary permission check view logs template Bug 20504: Fix lang attribute in html tag on systempreferences page Bug 20631: Remove unused RemoveLostItem from C4::Accounts Bug 20509: Add to script documentation Koha translators (1): Translation updates for Koha 18.05.03 Kyle M Hall (2): Bug 20990: Make same changes that were made to outstanding_debits Bug 21056: Changing the logged in library can fail sporadically Liz Rea (1): Bug 21122: Fix check-url-quick when utf8 characters in URL's Marcel de Rooy (8): Bug 20811: (QA follow-up) Make the isbn check work Bug 20811: (QA follow-up) Prevent calling AddItemBatchFromMarc and ModBiblioMarc without biblionumber Bug 21048: (QA follow-up) Fix authorized value statuses in filter Bug 21033: Remove few warns in acqui/basket.pl Bug 20661: (QA follow-up) Add POD for output_and_exit Bug 20773: (bug 20724 follow-up) Add a simple db revision Bug 20487: AddReturn should clear items.onloan for unissued items Bug 20487: (QA follow-up) Requested db revision Martin Renvoize (9): Bug 6647: Revert - Label item search should use standard pagination routine" Bug 20942: Revert - Too many missing dependancies Bug 20980: (RMaint follow-up) - Fix for missing use after merge Bug 20273: Use compat routines for autocomplete in auth_finder.pl Bug 21144: (rmaint followup) DBRev 18.05.02.004 Bug 21199: (QA follow-up) Add show_attributes to perldoc Translations: (rmaint followup) - Mark failing strings as fuzzy Increment version for 18.05.03 release Update release notes for 18.05.03 release Nick Clemens (21): Bug 21076: Don't call autocomplete code after patron found Bug 21064: Use undefined instead of undef Bug 20811: (RM follow-up) fix check for matching Bug 20980: DBRev 18.05.02.001 Bug 19604: Unit tests Bug 19604: Elasticsearch Fixes for build_authorities_query for auth searching Bug 21075: AutoUnsuspendHolds should unsuspend holds <= today Bug 21075: Unit tests Bug 21188: Convert return_date to a DateTime object Bug 18635: Koha::Patron->guarantees() should return results alphabetically Bug 18635: Unit tests Bug 20795: Pass incrreased verbosity to zebra rebuild script Bug 21226: DBRev 18.05.02.002 Bug 18947: LDAP - do not assume anonymous bind if no user or password Bug 20773: DBRev 18.05.02.003 Bug 20014: Preselect item budget based on id not code Bug 21144: DBRev 18.05.02.004 Bug 21243: (follow-up) Remove extra '' tag Bug 7996: Correct wrong permissions for modification log Bug 20487: DBRev 18.05.02.005 Bug 15408: Fix tests to fail without patch Owen Leonard (14): Bug 21038: Reserves should be holds Bug 16575: Irregular behaviour using window.print() followed by window.location.href Bug 20974: Remove files left behind after removing Solr Bug 21094: Syndetics: always use https instead of http Bug 21041: "Merge patrons" button remains disabled with "Select all" option Bug 21148: Dropdowns styled by the Select2 plugin do not highlight missing required fields Bug 19291: Make breadcrumbs for OPAC search history consistent with other patron account pages Bug 20828: Step 4 of moremember is used for Housebound and additional attributes Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests button is wrong Bug 21185: Incorrect title tag on tags review page Bug 21164: Fix alignment on new basket form in acquisitions Bug 21112: Re-indent staff client cart template Bug 19511: Local cover images not centered in table column in staff client search results Bug 21243: Regression: SRU mapping popup for bibliographic records is unstyled Tomas Cohen Arazi (18): Bug 20942: OpenAPI spec for /patrons/{patron_id}/account Bug 20942: Unit tests for /patrons/{patron_id}/account Bug 20942: Add route to get patron's account balance Bug 20942: Split debit and credit lines Bug 20942: (QA follow-up) Use $lines->total_outstanding Bug 20980: Add 'Manual Credit' and fix existing offsets Bug 20980: Make mancredit.pl use Koha::Account::add_credit Bug 20980: (follow-up) Only use UpdateStats for 'payment' and 'writeoff' Bug 20980: (follow-up) Offset name consistency Bug 20980: (QA follow-up) Do not delete existing data on tests fix Bug 20990: Unit tests for Koha::Account->outstanding_credits Bug 20990: Add Koha::Account->outstanding_credits Bug 20990: (QA follow-up) make outstanding_credits return the account lines only Bug 20942: OpenAPI spec for /patrons/{patron_id}/account Bug 20942: Unit tests for /patrons/{patron_id}/account Bug 20942: Add route to get patron's account balance Bug 20942: Split debit and credit lines Bug 20942: (QA follow-up) Use $lines->total_outstanding ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 30 12:32:39 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 30 Aug 2018 10:32:39 +0000 Subject: [koha-commits] main Koha release repository annotated tag v18.05.03 deleted. v18.05.02-145-gb83ae47 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, v18.05.03 has been deleted was 5fc3fd00aed0fa48c40104936332a6522313c762 - Log ----------------------------------------------------------------- b83ae47974455a529692edd4070f4f2dd3bfa3bd Update release notes for 18.05.03 release ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 30 12:33:13 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 30 Aug 2018 10:33:13 +0000 Subject: [koha-commits] main Koha release repository annotated tag v18.05.03 created. v18.05.03 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, v18.05.03 has been created at 9e3de04c0524b6fa9899dad98d8cf18fc2c81c30 (tag) tagging 20c85f636572aab559ff10839cef9ec09b0e914a (commit) replaces v18.05.02 tagged by Nick Clemens on Thu Aug 30 06:20:08 2018 -0400 - Log ----------------------------------------------------------------- Koha release 18.05.03 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJbh8TYAAoJEGolcazKjUn0vSUP/14VxHT01fzfuTjMeM94fkq7 qUGWz3A7K1uRxPDPDoqiq73EXXW8NCnRFMXJTIdV2WFp8J6dvKiZx8zhp3EiNElG 9TaksRwU7Bpxa+aqtttDW+ybuwa3TJQKCYxoQlsULPa5eFFySuhRcsK7HsiQ1Ep/ Kobn7QTBz7FegcIuUcaJGoOiLFy8NZIRkV6t7atdSGzSf1cmaPLp+7osSJz2tr6u wOy1+jNBIA8l294TBdc1ds7ofDsdOk8wbt3JfKPq+HxOV8dBMxxJSGMbMosxYJh0 XmFXGipdvSFgbY32+p73wTDQaRZeeww6SHKiiUhh8y0AlvMBBkkL9j+wyj9PC09S HYJGsyJF88O3a2diQmvR4gVRel/tJUSUhPi43VkEI3AN2DOQUEp+JB5I2gaQFaVa Jt5SilM6PTeOzbub1xXUym8pu7IJlDlU+EdzFBz14/mF1hKfrelLWnb6Y598SlBM qmEO3DtBbSB9J6c+M/vw6VP9ctWc3TTcoUeN44p9cbDYymmOAjDzkbIRIVcq2lV4 EcNCAZLYbhQw12ZLGl1Wg0iCCe2fJedEfbakYVMzRdtyULynmGm5yxpMo8S1mWLe HSZojLDjUWVBluHCPor2kzLlu06qQnRKxgLf3ixoxGKZ4UeRsRbjz6F+WVVRDn9e aDBhkK3+BwSF8K3A6DvU =yNJ2 -----END PGP SIGNATURE----- Alex Arnaud (2): Bug 21032: Fix using facet for searches made on specific index Bug 20273: (follow-up) Autocomplete use start instead of contains Andrew Isherwood (1): Bug 20770: ILL loans OPAC form notes field allow arbitrary input Baptiste Wojtkowski (1): Bug 15408: Remove fund's timestamp when cloning a budget Chris Nighswonger (1): Bug 8604: Patron cards made for patrons which don't have patron images use preceding card's image David Bourgault (2): Bug 20660: Test AddReturn with $return_date override Bug 20660: Return date override affects debarments in AddReturn David Cook (3): Bug 21097: Missing optgroup closing tag in orderreceive.tt Bug 21031: Apache Rewrite rules don't work for API when using anything but Debian package Plack configuration Bug 21131: Remove the TinyMCE.isDirty() check that caused unexpected behaviour Jonathan Druart (40): Bug 20079: Display stack trace for development installations Bug 20806: Do not rely on column position Bug 20806: Surround string by span tag to help translation Bug 21053: Encode URI characters in plugin 008 Bug 20811: Fix wrong usage of ModBiblio Bug 20757: Capture and upload screenshot on selenium errors Bug 20757: Add pod for ->capture Bug 21134: Correctly throw the exception in Koha::Patron::Modification->approve Bug 19604: Fix perlcritic "Loop iterator is not lexical" Bug 21018: Fix TrackClicks for 952$u Bug 21018: Allow uris defined in the item Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS) Bug 21099: Reposition floating toolbars earlier Bug 21141: Handle non-existent itemnumbers in batch item modification/deletion Bug 21056: Add another flush later Bug 21035: Handle new lines when running reports Bug 20661: Shortcut circ scripts if a blocking error appeared Bug 21125: Shortcut moredetail.pl on nonexistent biblionumber Bug 21208: Fix housebound deliverer/chooser names Bug 21139: Floating toolbar - Remove dup id Bug 21139: Floating toolbars - Remove unecessary height Bug 21139: Floating toolbar - Remove horizontal scrollbar on resize Bug 21139: Floating toolbar - Resize toolbar on window resize Bug 21139: No table in toolbar Bug 20795: Inform the user about this change, add to pod Bug 21221: Shortcut memberentry scripts if patron does not exist Bug 21213: Add diagnostics to Circulation.t Bug 21230: Prevent Reserves.t to fail randomly Bug 21226: DB Changes Bug 21226: Remove xISBN services Bug 21203: ILS-DI - Make GetRecords handle non-existent records Bug 21238: Prevent TemplateToolkit.t to fail on slow servers Bug 21142: Open uploaded files in utf-8 - batch mod/del Bug 19500: Add missing span for 'other' Bug 21011: Search for items with not defined homebranch and/or holdingbranch Bug 20509: Search for not defined authority codes Bug 21150: Search for item types inconsistencies Bug 21150: add the biblionumber to the output Bug 21182: Remove acqui/check_duplicate_barcode_ajax.pl Bug 21199: Hide patron's attributes from ILSDI if required Josef Moravec (5): Bug 20806: Add item type description holds history page Bug 20990: (follow-up) Fix test description Bug 21145: Do not show buttons for datatables on opac detail page Bug 21154: Remove unused subs from C4::Serials Bug 21011: (follow-up) Fix pod, fix missing homebranch condition, change mode to executable Joy Nelson (2): Bug 17625: adding subfields f and g to XSLT display Bug 20984: Add 300$f to display Katrin Fischer (14): Bug 16575: (follow-up) Compiled CSS Bug 21077: Fix database documentation for statistics.type Bug 14662: Add empty entries to pull downs on item form for mandatory subfields Bug 14662: Add empty entries to pull downs in cataloguing form for mandatory subfields Bug 21151: Fix SRU search fields mapping pop-up Bug 20683: Update German web installer for 18.05 Bug 19390: Make jQuery selector more specific, so OPAC view link can open in new tab Bug 21144: Add ROADTYPE to default authorised values categories Bug 19500: Make module names on letters overview page translatable Bug 19500: (QA follow-up) Add spans to ease translation Bug 7996: (QA follow-up) Remove unnecessary permission check view logs template Bug 20504: Fix lang attribute in html tag on systempreferences page Bug 20631: Remove unused RemoveLostItem from C4::Accounts Bug 20509: Add to script documentation Koha translators (1): Translation updates for Koha 18.05.03 Kyle M Hall (2): Bug 20990: Make same changes that were made to outstanding_debits Bug 21056: Changing the logged in library can fail sporadically Liz Rea (1): Bug 21122: Fix check-url-quick when utf8 characters in URL's Marcel de Rooy (8): Bug 20811: (QA follow-up) Make the isbn check work Bug 20811: (QA follow-up) Prevent calling AddItemBatchFromMarc and ModBiblioMarc without biblionumber Bug 21048: (QA follow-up) Fix authorized value statuses in filter Bug 21033: Remove few warns in acqui/basket.pl Bug 20661: (QA follow-up) Add POD for output_and_exit Bug 20773: (bug 20724 follow-up) Add a simple db revision Bug 20487: AddReturn should clear items.onloan for unissued items Bug 20487: (QA follow-up) Requested db revision Martin Renvoize (9): Bug 6647: Revert - Label item search should use standard pagination routine" Bug 20942: Revert - Too many missing dependancies Bug 20980: (RMaint follow-up) - Fix for missing use after merge Bug 20273: Use compat routines for autocomplete in auth_finder.pl Bug 21144: (rmaint followup) DBRev 18.05.02.004 Bug 21199: (QA follow-up) Add show_attributes to perldoc Translations: (rmaint followup) - Mark failing strings as fuzzy Increment version for 18.05.03 release Update release notes for 18.05.03 release Nick Clemens (21): Bug 21076: Don't call autocomplete code after patron found Bug 21064: Use undefined instead of undef Bug 20811: (RM follow-up) fix check for matching Bug 20980: DBRev 18.05.02.001 Bug 19604: Unit tests Bug 19604: Elasticsearch Fixes for build_authorities_query for auth searching Bug 21075: AutoUnsuspendHolds should unsuspend holds <= today Bug 21075: Unit tests Bug 21188: Convert return_date to a DateTime object Bug 18635: Koha::Patron->guarantees() should return results alphabetically Bug 18635: Unit tests Bug 20795: Pass incrreased verbosity to zebra rebuild script Bug 21226: DBRev 18.05.02.002 Bug 18947: LDAP - do not assume anonymous bind if no user or password Bug 20773: DBRev 18.05.02.003 Bug 20014: Preselect item budget based on id not code Bug 21144: DBRev 18.05.02.004 Bug 21243: (follow-up) Remove extra '' tag Bug 7996: Correct wrong permissions for modification log Bug 20487: DBRev 18.05.02.005 Bug 15408: Fix tests to fail without patch Owen Leonard (14): Bug 21038: Reserves should be holds Bug 16575: Irregular behaviour using window.print() followed by window.location.href Bug 20974: Remove files left behind after removing Solr Bug 21094: Syndetics: always use https instead of http Bug 21041: "Merge patrons" button remains disabled with "Select all" option Bug 21148: Dropdowns styled by the Select2 plugin do not highlight missing required fields Bug 19291: Make breadcrumbs for OPAC search history consistent with other patron account pages Bug 20828: Step 4 of moremember is used for Housebound and additional attributes Bug 20647: (alternate) When ILL is enabled the hover effect on the ILL requests button is wrong Bug 21185: Incorrect title tag on tags review page Bug 21164: Fix alignment on new basket form in acquisitions Bug 21112: Re-indent staff client cart template Bug 19511: Local cover images not centered in table column in staff client search results Bug 21243: Regression: SRU mapping popup for bibliographic records is unstyled Tomas Cohen Arazi (18): Bug 20942: OpenAPI spec for /patrons/{patron_id}/account Bug 20942: Unit tests for /patrons/{patron_id}/account Bug 20942: Add route to get patron's account balance Bug 20942: Split debit and credit lines Bug 20942: (QA follow-up) Use $lines->total_outstanding Bug 20980: Add 'Manual Credit' and fix existing offsets Bug 20980: Make mancredit.pl use Koha::Account::add_credit Bug 20980: (follow-up) Only use UpdateStats for 'payment' and 'writeoff' Bug 20980: (follow-up) Offset name consistency Bug 20980: (QA follow-up) Do not delete existing data on tests fix Bug 20990: Unit tests for Koha::Account->outstanding_credits Bug 20990: Add Koha::Account->outstanding_credits Bug 20990: (QA follow-up) make outstanding_credits return the account lines only Bug 20942: OpenAPI spec for /patrons/{patron_id}/account Bug 20942: Unit tests for /patrons/{patron_id}/account Bug 20942: Add route to get patron's account balance Bug 20942: Split debit and credit lines Bug 20942: (QA follow-up) Use $lines->total_outstanding ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Aug 30 16:19:25 2018 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 30 Aug 2018 14:19:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v18.05.00-614-g34827d6 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 34827d660cc018e68e09bed16170fbd0abf941cd (commit) via 4dec4be0994bb8fd41014c43ce3ae510ece0d37e (commit) via 43326754b110c62fbb2909eea1595656833f8c02 (commit) via c267716e6bdbe6858a78380b49cccf5f81e1ed4c (commit) via 7b114c51eb971010ddb20e492e74090b19a24be4 (commit) via ff16c7d662252162d0f2cd51cfd4c01bd495b8b5 (commit) via a51681fc7a36b6e6bbf7991876c579a1a1f98b1d (commit) via 0757736eaf3bda30042aef5247b3b01a9a3b25bd (commit) via cd43cf715bdb4e55baf9d5cd1114eec47b0eaeca (commit) via 8302af7b017b7554ef1ceb27966e4c1e39fdfc18 (commit) via f191e2ad678cf660980d0f8619e7e5a91aebf600 (commit) via 284cf15a255c30fb2a1f6ce0ddbcb5a5ebb6bc80 (commit) via 1756b874a3d0d921ea9e733849e3783a7b172e23 (commit) via aa97f13411576d651b1ee95a94da1ca644a24bde (commit) via 3795141f54991e0a4c95629754ac2759330ed2e6 (commit) via 63ab5dd3e9f6a1ef14e165260eafe0303d0bb735 (commit) via 20abe30c7bda8bb9133174132396a7dd958f6845 (commit) via f36ce76ea8c4c207ea3f9bb215316c196c3b0c6f (commit) via 592905a4d2d41a1a7b757c48fbac8fc6f025bf9b (commit) via ec257ca25baf19e3895abb2c4061af7592a2b9b4 (commit) via 2b1b168ec470da576c0a6c4aa8d458235a76018e (commit) via f52ba648e2c64293966eca820326e33873c54343 (commit) via ac93446a89f76fca2db90137885a72c918066d5a (commit) via 80ff78413e8de325ec49eb0edd88cfaaf3b4f50b (commit) via aba0c1ddc7b86104ebc8187e57329e43d2a0ea9f (commit) via d8ee32e706b1d59d091b03f5728a96f4bf2b413a (commit) via 38428fd71e76fdd7c9a452bc831affa03918994c (commit) via 59d436ee6023985a299f568fab9fd896492b207a (commit) via be691d86e35acebace0f1576ea9380f405dd55ce (commit) via 823c76cdc58b7b80b365a4f313fed3462f0df720 (commit) via ca2430480eaa4338b3e4aed766589b1406565d69 (commit) via 44d7063209137696d0c844ff82880a973029e534 (commit) via 3f01c8630aeead13ccd054de2eeca7b4eb3c221e (commit) via 7ae0dfa076996cef5644ef8a9a28cb613fc625c2 (commit) via f0652790df8d711dc69c35be5be97761538ccd1e (commit) via 7c05f4fbe41800a9be4b6d4bdc8d7c7ddeb69ef9 (commit) via 82ec02b53883e2d3e815a77b17d2078931abbb29 (commit) via a3848cb7023946aa6aaa23aae4067f44e3ba4fef (commit) from 898cd1d91f54735263d696118e1191e46a73b1c5 (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 34827d660cc018e68e09bed16170fbd0abf941cd Author: Nick Clemens Date: Thu Aug 30 13:40:18 2018 +0000 Bug 20366: (RM follow-up) Fix typo 'hrml' Signed-off-by: Nick Clemens commit 4dec4be0994bb8fd41014c43ce3ae510ece0d37e Author: Josef Moravec Date: Thu Aug 2 13:15:16 2018 +0000 Bug 20366: (follow-up) Fix link to subscription Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 43326754b110c62fbb2909eea1595656833f8c02 Author: Jonathan Druart Date: Tue May 8 13:31:55 2018 -0300 Bug 20366: Add subscription info to the acq tab on the biblio detail page On the "Acquisition details" tab of the bibliographic detail page, the subscription information are missing. This patch replace the call to GetHistory with Koha::Acquisition::Orders in order to simplify the code and make use of new Koha:: packages/methods. TODO: Add column settings (show/hide columns) to this table (?) Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit c267716e6bdbe6858a78380b49cccf5f81e1ed4c Author: Jonathan Druart Date: Tue May 8 13:32:47 2018 -0300 Bug 20366: Add new method Koha::Acquisition::Basket->basket_group Can be moved to a separate bug report. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 7b114c51eb971010ddb20e492e74090b19a24be4 Author: Jonathan Druart Date: Tue May 8 13:30:44 2018 -0300 Bug 20366: Add new method Koha::Acquisition::Order->subscription Can be moved to a separate bug report. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ff16c7d662252162d0f2cd51cfd4c01bd495b8b5 Author: Jonathan Druart Date: Wed Mar 28 12:53:42 2018 -0300 Bug 20365: Allow several orders on the same subscriptions Do we really need this limitation? Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit a51681fc7a36b6e6bbf7991876c579a1a1f98b1d Author: Nick Clemens Date: Thu Aug 30 13:46:06 2018 +0000 Bug 20726: (RM follow-up) Add missing filters Signed-off-by: Nick Clemens commit 0757736eaf3bda30042aef5247b3b01a9a3b25bd Author: Jonathan Druart Date: Mon Jun 4 17:11:46 2018 -0300 Bug 20726: Add title to the price column headers Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit cd43cf715bdb4e55baf9d5cd1114eec47b0eaeca Author: Jonathan Druart Date: Tue May 29 17:10:58 2018 -0300 Bug 20726: Sort by statuses then ordernumbers Not received and most recent at the top. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 8302af7b017b7554ef1ceb27966e4c1e39fdfc18 Author: Jonathan Druart Date: Tue May 29 16:59:05 2018 -0300 Bug 20726: Add show/hide already received orders links Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit f191e2ad678cf660980d0f8619e7e5a91aebf600 Author: Jonathan Druart Date: Mon May 7 20:07:28 2018 -0300 Bug 20726: Add DataTables Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 284cf15a255c30fb2a1f6ce0ddbcb5a5ebb6bc80 Author: Jonathan Druart Date: Mon May 7 20:00:25 2018 -0300 Bug 20726: Add acquisition history on the subscription detail page Since bug 20365 is going to add the ability to create several pending orders on the same subscription we should display the history of the acquisitions on the subscription detail page. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 1756b874a3d0d921ea9e733849e3783a7b172e23 Author: Jonathan Druart Date: Mon May 7 19:46:05 2018 -0300 Bug 20726: Add new method Acquisition::Order->invoice Can be moved to a separate bug report. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit aa97f13411576d651b1ee95a94da1ca644a24bde Author: Jonathan Druart Date: Mon May 7 19:29:19 2018 -0300 Bug 20726: Add new method Koha::Acquisition::Order->fund Can be moved to a separate bug report. Sponsored-by: BULAC - http://www.bulac.fr/ Signed-off-by: S?verine QUEUNE Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens commit 3795141f54991e0a4c95629754ac2759330ed2e6 Author: Jonathan Druart Date: Mon Aug 6 19:42:20 2018 -0300 Bug 21207: Remove unused RM C4::Overdues::GetItems sub Test plan: git grep GetItems | grep -v GetItemsInCollection | grep -v GetItemsForInventory | grep -v GetItemsInfo | grep -v GetItemsLocationInfo | grep -v GetItemsAvailable | grep -v GetItemsByBiblioitemnumber should not return any occurrences of code in perl scripts Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 63ab5dd3e9f6a1ef14e165260eafe0303d0bb735 Author: Nick Clemens Date: Thu Aug 30 13:21:35 2018 +0000 Bug 21157: Compiled CSS Signed-off-by: Nick Clemens commit 20abe30c7bda8bb9133174132396a7dd958f6845 Author: Owen Leonard Date: Mon Aug 13 14:07:46 2018 +0000 Bug 21157: Improve style of OPAC login modal This patch revises the style of the OPAC's login form modal view. The goal is simply to make it look nicer. To test, apply the patch and regenerate the OPAC's CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). In the OPAC, click the "Log in to your account" link at the top of the page. It should trigger the login modal. While the modal is displayed, resize the browser width to confirm that the form handles different widths well. Sign off if you think this is an improvement. Signed-off-by: Claire Gravely Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit f36ce76ea8c4c207ea3f9bb215316c196c3b0c6f Author: Jonathan Druart Date: Wed Aug 29 14:38:56 2018 -0300 Bug 13618: (follow-up) Add html filters to all the variables Signed-off-by: Nick Clemens commit 592905a4d2d41a1a7b757c48fbac8fc6f025bf9b Author: Jonathan Druart Date: Wed Aug 15 14:21:47 2018 -0300 Bug 21139: (follow-up) Floating toolbars - Remove unecessary height Found where QAing bug 20935, we actually want the hidden toolbar to be the exact same height as the visible one. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens commit ec257ca25baf19e3895abb2c4061af7592a2b9b4 Author: Jonathan Druart Date: Thu Aug 16 12:12:11 2018 -0300 Bug 21183: Fix ->get_column call context I am not sure to understand what's going on here. Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit 2b1b168ec470da576c0a6c4aa8d458235a76018e Author: Jonathan Druart Date: Mon Aug 6 15:53:33 2018 -0300 Bug 21183: Replace C4::Items::GetItemnumberFromBarcode calls C4::Items::GetItemnumberFromBarcode calls can be replaced with Koha::Items->find({ barcode => $barcode }); We should make sure the barcode existed in DB and so that ->find returns an object. Note that most of the time we just wanted to know if the barcode existed. The changes are very simple, the only one that need attention is the one in batchMod.pl. It is basically reusing what we did on bug 21141. Test plan: Use the batch item modification/deletion tools to modify/delete items from their barcode (using the textarea or a file) Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit f52ba648e2c64293966eca820326e33873c54343 Author: Jonathan Druart Date: Mon Aug 6 15:53:54 2018 -0300 Bug 21183: Remove GetItemnumberFromBarcode Test plan: git grep GetItemnumberFromBarcode should not return anything Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens commit ac93446a89f76fca2db90137885a72c918066d5a Author: Owen Leonard Date: Fri May 4 15:18:59 2018 +0000 Bug 20740: Update two-column templates with Bootstrap grid, Administration part 4 This patch modifies several administration templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from