From gitmaster at git.koha-community.org Fri Aug 2 22:54:55 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 02 Aug 2019 20:54:55 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.08-34-gd5486eb 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.11.x has been updated via d5486eb13fbe6efa808ee4b9faee6d62fa99107a (commit) via e4c7906dbd9bdea7958961e0bac992627714ed9f (commit) via 27a2c98e537ee2e56b9ff877725b9ff823009429 (commit) from 36d20d4600a0f4f3e9cfc6911689ba5be356b90f (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 d5486eb13fbe6efa808ee4b9faee6d62fa99107a Author: Mark Tompsett Date: Tue Jul 2 05:05:20 2019 +0000 Bug 23199: (follow-up) Fix tab/space issues Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit 611b60ea9657efbe5f6c1da53d4b6a6d2d5f6a01) Signed-off-by: Fridolin Somers (cherry picked from commit ede934b90799b0127ae75018e126abe865a4dbed) Signed-off-by: Lucas Gass commit e4c7906dbd9bdea7958961e0bac992627714ed9f Author: Mark Tompsett Date: Tue Jul 2 05:01:55 2019 +0000 Bug 23199: Added tests for Koha::Patron Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit e53bed5375638c8d7baaefb04cd77843dbe8e8a3) Signed-off-by: Fridolin Somers (cherry picked from commit 05dcd8489c37dc3434e53ddf13f3edf279219cef) Signed-off-by: Lucas Gass commit 27a2c98e537ee2e56b9ff877725b9ff823009429 Author: Arthur Suzuki Date: Tue Jun 25 11:17:24 2019 +0200 Bug 23199: Koha::Patron->store must check 'uppercasesurname' syspref Test plan: 1/ set uppercasesurname to 'Do' 2/ register a new patron using the REST API with lowercase surname 3/ verify the surname is not saved in uppercase 4/ apply patch 5/ repeat 2 6/ verify the surname now is saved to uppercase Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit fa390ca232a0979c6786a0e00eca8d458f644f3e) Signed-off-by: Fridolin Somers (cherry picked from commit ecff60025871d739f695a2ae5b88613ce6617854) Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: Koha/Patron.pm | 4 ++++ members/memberentry.pl | 4 ---- t/db_dependent/Koha/Patrons.t | 13 ++++++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 5 13:01:14 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Aug 2019 11:01:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-414-g3352d75 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 3352d75bfeea1dd5d9d6e025b6884a190044003c (commit) via 36ee00ed952ed9081eeeca5e98fe006fbaa12db6 (commit) via 33bd28fb856d496370f7132171aa479c77b28af8 (commit) via 3eadb87fd86b2331d4ea58aa86f1810bbf952c89 (commit) via 5e4e26dd0f7516bd3dca4758bbc3c72e4b9723d5 (commit) via 484b8245af189edcaba64f191981cd5374237125 (commit) via 0f5d14f70792d5406857a81c415bc3f58cbd8b96 (commit) via 88ff22bb5a5d535893cf238ae784bb62a5b7d676 (commit) from 0c4112a200bfdcdbdba4ce7870aeced1f960cfd9 (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 3352d75bfeea1dd5d9d6e025b6884a190044003c Author: Nick Clemens Date: Fri Jun 28 12:53:20 2019 +0000 Bug 14549: POD and variable cleanup Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 36ee00ed952ed9081eeeca5e98fe006fbaa12db6 Author: Nick Clemens Date: Fri Jun 28 12:37:25 2019 +0000 Bug 14549: Check patrons reserves for any holds on a bib when checking out an item MoveReserve uses CheckReserves to see if the current patron has any holds on the title they are checking out, however, CheckReserves doesn't return all holds on a biblio, it returns holds on the item from the holdsqueue if they exist This can create a condition where we check holds on an item, find we have it planned for another borrower, confirm checkout to the current borrower, but don't fill their hold To test: 1) Find record 2) place record level holds for 2 different patrons (record level) 3) Run holds queue builder, check the queue to confirm an item was selected for patron 1 Circulation->Holds queue->Library="All" 4) Check out the item queued for patron with priority 1 to the second patron 5) You should be asked to confirm, do so 6) Note the item checks out, but both holds remain 7) Apply patch 8) Check in the item 9) Don't confirm the hold 10) Check the holds on the record and the holds queue 11) Patron 1 should be priority 1 with an item selected from the holds queue 12) Checkout to patron 2 as before 13) Note the hold for patron 2 is filled this time 14) Prove -v t/db_dependent/Reserves.t Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 33bd28fb856d496370f7132171aa479c77b28af8 Author: Nick Clemens Date: Fri Jun 28 12:36:16 2019 +0000 Bug 14549: Unit tests To test: 1 - Apply just this patch 2 - prove -v t/db_dependent/Reserves.t 3 - Failure 4 - Apply second patch 5 - prove -v t/db_dependent/Reserves.t 6 - Success! Signed-off-by: Chris Cormack Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 3eadb87fd86b2331d4ea58aa86f1810bbf952c89 Author: Martin Renvoize Date: Mon Aug 5 11:36:40 2019 +0100 Bug 23396: DBRev 19.06.00.016 Signed-off-by: Martin Renvoize commit 5e4e26dd0f7516bd3dca4758bbc3c72e4b9723d5 Author: Tomas Cohen Arazi Date: Fri Aug 2 15:53:01 2019 -0300 Bug 23396: (QA follow-up) Add atomic update New installs before the fix won't have the table populated, this patch adds a fix for that, including the shortcut added by bug 17178. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 484b8245af189edcaba64f191981cd5374237125 Author: Nick Clemens Date: Tue Jul 30 13:37:28 2019 +0000 Bug 23396: Add keyboard_shortcuts.sql to C4/Installer.pm To test: 1 - Back up your DB if you want to save it 2 - sudo koha-mysql kohadev DROP database koha_kohadev; CREATE database koha_kohadev; 3 - http://localhost:8081 4 - Go through the web installer 5 - Enable AdvancedCatalogingEditor 6 - Try to load it, fails with JS console error: insert_copyright is not defined 7 - Apply patch 8 - Repeat 9 - This time editor loads Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 0f5d14f70792d5406857a81c415bc3f58cbd8b96 Author: Bernardo Gonzalez Kriegel Date: Sun May 5 15:12:15 2019 -0300 Bug 10492: Translation problems with TT directives in po files This patch implements the replacement of TTvariables '[%...%]' with normal placeholders '%s' for text inside HTML tags (eg. img, meta, input) The replacement is done in two files: * xgettext.pl, used on create/update, so TTvars are not found on the text to translate (msgid) * tmpl_proccess3.pl, used on install time, so the correct translation is found (msgstr) and the right TTvar is put on the translated text. To test: Before applying the patch 1) Update your favorite language cd misc/traslator perl translate update xx-YY 2) Build a list (ini.txt) of 'msgid' to do a comparison msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > ini.txt 3) Apply the patch 4) Update your favorite language, again cd misc/traslator perl translate update xx-YY 5) Build a final list (end.txt) of 'msgid' to do a comparison msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > end.txt 6) Compare both files, you must find (most) TTvars replaced by '%s' diff ini.txt end.txt for example: < msgid "Translate item type [% itemtype.itemtype | html %]" > msgid "Translate item type %s" < msgid "Holds on this item: [% item_loo.item_holds | html %] / Total holds on this record: [% item_loo.holds | html -%]" > msgid "Holds on this item: %s / Total holds on this record: %s" < msgid "tag_anchor_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]" > msgid "tag_anchor_%s_%s%s" < msgid "[% innerloo.tag_lib | html %] - Click to Expand this Tag" > msgid "%s - Click to Expand this Tag" 7) Translate one of the examples, with more than one variable if possible, for example this text in xx-YY-staff-prog.po > msgid "Holds on this item: %s / Total holds on this record: %s" Check it's not marked as 'fuzzy' 8) Apply the translation perl translate install xx-YY 9) Check the translated string has all variables in the right order edit koha-tmpl/intranet-tmpl/prog/es-ES/modules/tools/batchMod-edit.tt around line '187', first '[% item_loo.item_holds | html %]', then '[% item_loo.holds | html -%]' on this case, or use another example If approved this patch can be backported to current stable versions. Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 88ff22bb5a5d535893cf238ae784bb62a5b7d676 Author: Owen Leonard Date: Wed Jul 31 12:38:16 2019 +0000 Bug 21518: Material type "three-dimensional artifact" displays as "visual material" This patch makes a few corrections to the staff client MARC21 XSLT so that the correct material type icons are displayed for pictures and realia. The more-specific material type handling has been adapted from the corresponding XSL files in the OPAC. To test you must have default XSLT enabled and the DisplayIconsXSLT and DisplayOPACiconsXSLT system preferences enabled. - Apply the patch and locate records with "type of record" specified in the leader as 'g', 'k', and 'r'. A sample MARC file will be attached to the bug report with one of each type of record. Import the records and search your catalog for "Bug_21518." - View the records in search results and their detail pages, both in the OPAC and the staff client. In all cases the correct material type icon should be displayed. Signed-off-by: Lucas Gass Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Installer.pm | 1 + C4/Reserves.pm | 34 +++++++++++--------- Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 23 +++++++++++++ .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 13 +++++--- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 4 ++- .../prog/img}/famfamfam/OB.png | Bin 825 -> 825 bytes .../prog/img/famfamfam/{GR.png => PK.png} | Bin 606 -> 606 bytes .../prog/img/famfamfam/silk/object.png} | Bin 825 -> 825 bytes .../prog/img}/famfamfam/silk/picture.png | Bin 606 -> 606 bytes .../GR.png => opac-tmpl/lib/famfamfam/PK.png} | Bin 606 -> 606 bytes misc/translator/tmpl_process3.pl | 28 ++++++++++++---- misc/translator/xgettext.pl | 5 +++ t/db_dependent/Reserves.t | 30 ++++++++++++++++- 14 files changed, 111 insertions(+), 29 deletions(-) copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/OB.png (100%) copy koha-tmpl/intranet-tmpl/prog/img/famfamfam/{GR.png => PK.png} (100%) copy koha-tmpl/{opac-tmpl/bootstrap/lib/famfamfam/silk/bricks.png => intranet-tmpl/prog/img/famfamfam/silk/object.png} (100%) copy koha-tmpl/{opac-tmpl/bootstrap/lib => intranet-tmpl/prog/img}/famfamfam/silk/picture.png (100%) copy koha-tmpl/{intranet-tmpl/prog/img/famfamfam/GR.png => opac-tmpl/lib/famfamfam/PK.png} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 5 16:24:14 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 05 Aug 2019 14:24:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-440-g2905ff0 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 2905ff0bf87ba0fd71c2fb3bc54bf368fc9d95ce (commit) via 7af08918892b7763c551f70e0de30a8202ab14f2 (commit) via a89a203c1c85841a09b49771adbd77eeb76180c2 (commit) via fe55839893828071967bd84a3041904bb75ac0d0 (commit) via 7883eb0692b15fdc453437cc595bf1903fa4540b (commit) via 66655602b7038a4d7ae45e6d3b8bb98cf78cb0c4 (commit) via 5b1ed49baa49927768dc004d1d56684651bb6d79 (commit) via 4cf5fcf10b85e22aeacc2578a39b173951132143 (commit) via a1a05db1b638803135df535cd9f40180523e5f0e (commit) via 1543134b346fd0c6eab26b3023ca6cf764a16952 (commit) via b641ca7aa758f580f950c4529afa1f63c8fed73f (commit) via 2556b9e523f15765147fe34ed9a2d3d76105bc46 (commit) via 26e5873ee505ace671f2c9e1a9c6ec9ee3278c1b (commit) via 8c8bbb3198b8809aeaabab4de2e7e6bad957d94b (commit) via 5af98f8fab3b0d9263962bac6b5a1e453ad3e988 (commit) via ee44dce28562941b8f831bb79a564c1384a8f832 (commit) via 0e4f36b653af8425650dc76130cfa25af50429ae (commit) via 4ea26c0a697fcd8e4f88feb9a4f43a8b02c06650 (commit) via fabac13052d93465f8d348493930de4daedc708b (commit) via d82e31ab13d658dae7b1385692064d570752be42 (commit) via fe0561ee41d2dd1d2d860b8e95e62a47a249b2de (commit) via 3326ce607d6f82741634c0793f2367f2ff26e29c (commit) via 12db9990b568bd8a0735626961a255399bc72f8c (commit) via 0afc62c43afaef50f74183faf591892789a9bfc0 (commit) via 0a14f4009daca33d88115ee5ca5498457c866cc4 (commit) via 4cb858190edaef92461ebb22145606723d98a05e (commit) from 3352d75bfeea1dd5d9d6e025b6884a190044003c (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 2905ff0bf87ba0fd71c2fb3bc54bf368fc9d95ce Author: Fridolin Somers Date: Fri Jul 26 16:50:23 2019 +0200 Bug 23386: Add language of original in advanced search In advanced search there is a language limit (UNIMARC 101$a), add language of original (UNIMARC 101$c). This patch adds a TT BLOCK to avoid copy the code. Test plan: 1) Create some records with language and language of original 2) Go to advanced search page 3) Check limit on language is OK 4) Check limit on language of the original is OK 5) Check using both is OK Signed-off-by: Maryse Simard Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 7af08918892b7763c551f70e0de30a8202ab14f2 Author: Martin Renvoize Date: Mon Aug 5 14:51:12 2019 +0100 Bug 23099: Compiled CSS Signed-off-by: Martin Renvoize commit a89a203c1c85841a09b49771adbd77eeb76180c2 Author: Owen Leonard Date: Tue Jun 11 18:13:08 2019 +0000 Bug 23099: OPAC Search result sorting "go" button flashes on page load There are a few places in the OPAC where we hide the submit button on a sorting form because the form auto-submits when the selection changes. These should be hidden using CSS instead of JS to prevent the temporary appearance of the submit button while the page loads. To test, apply the patch and rebuild the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Test OPAC search results and OPAC checkout history. On both pages you should not see a "Go" button next to the