From gitmaster at git.koha-community.org Fri Aug 1 14:47:56 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 12:47:56 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-341-g8c56710 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 8c5671087da1ce3daf9ecf55589761f185e34453 (commit) via cf49a75209b1dc5213fb1efbacd953cac72cfbb7 (commit) via b18b48e51325d816a1bbf810d1d08f1e7abba1c4 (commit) from 7123eeccf87f3b53fb05f6b3fea0fecbec3ab232 (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 8c5671087da1ce3daf9ecf55589761f185e34453 Author: Julian Maurice Date: Tue Jun 10 12:47:37 2014 +0200 Bug 12398: Fix CAS authentication validation CGI::url_param() also returns deleted parameters so we have to check with CGI::param() too. Signed-off-by: Matthias Meusburger Signed-off-by: Katrin Fischer Took a while to get it working, but I can confirm CAS login is not working without this patch, but does with it. Some notes: In order for this to work you have to add http:// in front of your OpacBaseURL. You will also need a CAS test server and install the certificate on your system. Tested with CAS test server provided by Biblibre. Signed-off-by: Tomas Cohen Arazi commit cf49a75209b1dc5213fb1efbacd953cac72cfbb7 Author: Tomas Cohen Arazi Date: Fri Aug 1 09:41:35 2014 -0300 Bug 12398: (followup) tidy unit tests This followup removes unnecesary warnings generated by the test, and also prints a proper message for the tests. Added a can_ok test for all the exported functions btw. Signed-off-by: Tomas Cohen Arazi commit b18b48e51325d816a1bbf810d1d08f1e7abba1c4 Author: Julian Maurice Date: Wed Jul 30 14:02:11 2014 +0200 Bug 12398: Add test for C4::Auth_with_cas::_url_with_get_params Run `prove t/db_dependent/Auth_with_cas.t` to run the test Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Auth_with_cas.pm | 10 ++++--- t/db_dependent/Auth_with_cas.t | 57 +++++++++++++++++++++++++++++++++++----- 2 files changed, 58 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 14:53:22 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 12:53:22 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-1-g183aa49 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 183aa49e6b646407f3ebb594de738ca34197b4fa (commit) from 7682e4203c0b9cdf106d071243aadffdd186f60e (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 183aa49e6b646407f3ebb594de738ca34197b4fa Author: Fridolin Somers Date: Fri Apr 11 10:54:57 2014 +0200 Bug 12071: improve generation of Z39.50 search links This patch fixes two problems with the generation of links to execute a Z39.50 search from the staff client catalog and cataloguing search results page. First, if using URI::Escape 3.30 or earlier, performing a simple search with a double quote (e.g., "histoire algerie"), the Javascript is broken in results page because of : function GetZ3950Terms(){ var strQuery="&frameworkcode="; strQuery += "&" + "title" + "=" + ""histoire%20algerie""; Second, the encoding of non-ASCII characters in the search term was broken. This patch moves URI escaping from Perl to template with uri TT filter. Test plan : - To reproduce the issue with double quotes, the server must be running URI::Escape 3.30 or earlier; the current version of URI::Escape properly escapes double quote. - In staff interface, perform a search with double quotes that will return no result, ie "aaa xxx" => Without patch, javascript is broken => With patch, javascript is not broken - Click on Z3950 button on results page => Without patch, the Title input is empty => With patch, the Title input contains the search terms Additional test: Do a search with something like ??? and then click Z3950 button on results page. Without patch, encoding is broken in Z3950 form With patch, encoding is correct. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Fixed a few tabs. Passes tests and QA script. I can't reproduce the Javascript problem, but I can reproduce the Z39.50 encoding problem and can detect no regression. Signed-off-by: Galen Charlton (cherry picked from commit 064d5478d31b05442e19b7d57f0af94d3422731e) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 14:56:11 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 12:56:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-3-g71efba2 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 71efba230442c583d591f8107874cb10016c096a (commit) via 21e5cccc6e07fc04c773f0549182127f40aa9395 (commit) from 183aa49e6b646407f3ebb594de738ca34197b4fa (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 71efba230442c583d591f8107874cb10016c096a Author: Galen Charlton Date: Mon Apr 14 18:44:07 2014 +0000 Bug 12079: ensure that CheckReserves() includes reserve_id in its response This patch modifies _Findgroupreserve so that its one caller, CheckReserves(), would include the reserve_id field in the hold request it returns. Failure to include reserve_id in every circumstance resulted in bug 11947. This patch is therefore a complementary fix for that bug, but is not meant to preempt the direct fix for that bug. To test: [1] Verify that t/db_dependent/Reserves.t passes. [2] Verify that the following test plan taken from the patch for bug 11947 works for this patch *without* applying the patch for 11947: * have a few borrowers, say 4. * have a biblio with a single item (you can scale this up, it should work just the same.) * issue the item to borrower A * have borrowers B, C, and D place a hold on the item * return the item, acknowledge that it'll be put aside for B. * view the holds on the item. Without the patch: * the hold priorities in the UI end up being "waiting, 2, 1" when they should be "waiting, 1, 2". * in the database "reserves" table, they're really "0, 2, 3" when they should be "0, 1, 2". With the patch: * the hold priorities in the UI end up being "waiting, 1, 2" * in the database, they're "0, 1, 2" Signed-off-by: Galen Charlton Signed-off-by: Bernardo Gonzalez Kriegel Work as described. No koha-qa errors. Test pass Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 695fdebdee802387f45505a1350120727d3e2f7f) Signed-off-by: Fridolin Somers commit 21e5cccc6e07fc04c773f0549182127f40aa9395 Author: Robin Sheat Date: Mon Mar 17 18:33:00 2014 +1300 Bug 11947 - renumber reserves when hold is confirmed Currently when a reserve is moved to "waiting" status because it's acknowledged on checkin, the reserve priorities aren't renumbered. This causes things to go a bit haywire in the UI, in particular, some reserves can unjustly end up with priority 1 when they shouldn't. It also seemed to mess with the logic of who should get it next, but I didn't look too closely at that. This patch forces a renumbering so that all the priorities remain copacetic. Test plan: * have a few borrowers, say 4. * have a biblio with a single item (you can scale this up, it should work just the same.) * issue the item to borrower A * have borrowers B, C, and D place a hold on the item * return the item, acknowledge that it'll be put aside for B. * view the holds on the item. Without the patch: * the hold priorities in the UI end up being "waiting, 2, 1" when they should be "waiting, 1, 2". * in the database "reserves" table, they're really "0, 2, 3" when they should be "0, 1, 2". With the patch: * the hold priorities in the UI end up being "waiting, 1, 2" * in the database, they're "0, 1, 2" Signed-off-by: Owen Leonard Test plan confirms that the problem exists and that the patch corrects it. Signed-off-by: Katrin Fischer Passes all tests and QA script, especially t/db_dependent/Reserves.t. Improves priority calculation. Signed-off-by: Galen Charlton (cherry picked from commit 95056d17b715b74e3f7149d60e12d5a365d70eeb) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 8 +++++--- t/db_dependent/Reserves.t | 30 +++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:00:34 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:00:34 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-5-gd49b517 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via d49b517f26e93e2dcef0f20e7c6f45108ffeb426 (commit) via ab86466196fcba6dcc3159af95e4af49091881cb (commit) from 71efba230442c583d591f8107874cb10016c096a (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 d49b517f26e93e2dcef0f20e7c6f45108ffeb426 Author: Fridolin Somers Date: Thu Apr 10 13:12:19 2014 +0200 Bug 11219: (follow-up) fetch only URL parameters This followup corrects the fact that when using $query->url(), both GET and POST params are get. Using $query->url_param() will only get params directly in URL. Test plan : - Enable CAS - Go to login page : cgi-bin/koha/opac-user.pl - Try to connect with local login using random login and password (they will be transmitted by POST) - You stay to login page - Look at CAS login URL => Without this patch it will contain the random login and password as parameters of opac-user.pl => With this patch it does not contain any parameter Signed-off-by: Matthias Meusburger Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit b57d98517c5a9572a54412f7f4e5d872acfa85c3) Signed-off-by: Fridolin Somers commit ab86466196fcba6dcc3159af95e4af49091881cb Author: Fridolyn SOMERS Date: Fri Nov 8 11:12:57 2013 +0100 Bug 11219: make CAS authentication work with URL parameters Bug 10029 tries to fix the use of URL parameters in CAS authentication. But is does not work. The full URL must be used in all methods of C4::Auth_with_cas. Also, in checkpw_cas(), the 'ticket' parameter must be removed to find the original URL. This patch removes the 'ticket' parameter from query before calling checkpw_cas() since the ticket is passed as method arguemnt. In C4::Auth_with_cas, many methods use the same code to get the CAS handler and the service URI. This patch adds a private method _get_cas_and_service() to do the job. Test plan: - Enable CAS - Go to opac without been logged-in - Try to place hold on a record => You get to /cgi-bin/koha/opac-reserve.pl?biblionumber=XXX showing authentication page => Check that CAS link contains query param "biblionumber" - Click on CAS link and log in => Check you return well logged-in to reserve page with biblionumber param - Check CAS loggout - Check Proxy CAS auth Signed-off-by: Koha team AMU Signed-off-by: Katrin Fischer Passes all tests in t, xt, and t/db_dependent/Auth.t. Also passes QA script. As I have no working CAS server, I focused on regression testing: Activated Persona and casAuthentication. - Verified normal login against database still works. - Verified Persona login works. Note: With Persona you are always forwarded to the patron account - so you have to search for the record again before you can place a hold. - Verified that the CAS URL contains the biblionumber when logging in while placing a hold. Signed-off-by: Katrin Fischer Retested 2014-04-12 Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit c8a18f5eefd81dc07512faa962064effdfb88de9) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 1 + C4/Auth_with_cas.pm | 69 ++++++++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 31 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:12:02 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:12:02 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-6-g438fbd4 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 438fbd42748ef05318de8855563e774884f4a3e5 (commit) from d49b517f26e93e2dcef0f20e7c6f45108ffeb426 (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 438fbd42748ef05318de8855563e774884f4a3e5 Author: Owen Leonard Date: Fri Feb 7 14:06:50 2014 -0500 Bug 11711 - Use new DataTables include in circ templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to all circ-related pages which use DataTables. Apply the patch and test the following pages to confirm that table sorting works correctly: - Circulation - The UseTablesortForCirc system preference must be enabled. - Check out to a patron with existing checkouts. Choose a patron who is a guarantor to another patron with checkouts in order to test the relatives' checkouts table. - The checkouts and relatives' checkouts tables have been modified to exclude articles when sorting of titles. - Hold ratios - The title column has been configured to exclude articles from sorting - Transfer to receive - Holds queue - The title column has been configured to exclude articles when sorting - The date column has been modified to use the title-string filter for sorting. An unformatted date is now passed from C4::HoldsQueue.pm to the template, where the KohaDates filter is used for formatting. Sorting is based on the unformatted date. - Holds awaiting pickup - The "available since" column has been configured for sorting on an unformatted date. waitingreserves.pl now passes the unformatted date to the template, and formatting is done using the KohaDates filter. - The title column has been configured to exclude articles when sorting. Edit: Rebased on current master following commit of Bug 11605 Signed-off-by: A. Sassmannshausen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 612b33ae69adbed63e55c91f7314f6c2888f6d71) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 1 - circ/waitingreserves.pl | 2 +- .../prog/en/modules/circ/circulation.tt | 8 +++----- .../prog/en/modules/circ/reserveratios.tt | 7 +++---- .../prog/en/modules/circ/transferstoreceive.tt | 6 ++---- .../prog/en/modules/circ/view_holdsqueue.tt | 20 +++++++++----------- .../prog/en/modules/circ/waitingreserves.tt | 14 ++++++++------ 7 files changed, 26 insertions(+), 32 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:13:59 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:13:59 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-7-g9babb3d Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 9babb3dc3d8baaf2b95d220a868090324b0e3f72 (commit) from 438fbd42748ef05318de8855563e774884f4a3e5 (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 9babb3dc3d8baaf2b95d220a868090324b0e3f72 Author: Owen Leonard Date: Mon Feb 10 12:26:34 2014 -0500 Bug 11734 - Use new DataTables include in batch modification templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to the batch modification and batch deletion pages. Minor text changes: Corrected capitalization. Apply the patch and test the following: - On batch modification and batch deletion, submit multiple barcodes or item numbers. On the results page the title column has been configured to use the "anti-the" filter to exclude articles from sorting. Sorting on all columns should work correctly. Edit: Put back checkboxes plugin which was accidentally removed. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton (cherry picked from commit 7349f847fad28ada0eb98cd5ebb44d563d7ee0f7) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js | 3 ++- .../intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 10 ++++------ .../intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 10 ++++------ 3 files changed, 10 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:16:11 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:16:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-9-gd0ea1ce Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via d0ea1ce586de9cd65edc92d32ae9c25e112b13fa (commit) via 97d9b102fa2fc1a3cf6cee1356b288c0b0d0a15f (commit) from 9babb3dc3d8baaf2b95d220a868090324b0e3f72 (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 d0ea1ce586de9cd65edc92d32ae9c25e112b13fa Author: Marcel de Rooy Date: Fri Apr 4 17:11:15 2014 +0200 Bug 9075: Rename "type" to "material type" on OPAC XSLT detail and results The label Material type better describes what the icon presents. It is based on leader values of the MARC record. Revised Test Plan ----------------- 1) In the staff client, set the OPAC system preference OPACXSLTDetailsDisplay to 'default' and save. 2) In the staff client, set the OPAC system preference OPACXSLTResultsDisplay to 'default' and save. 3) In the staff client, set the OPAC system preference opacthemes to 'bootstrap' and save. 4) In the OPAC, search for biblio used in previous patch testing. -- It should display "Type:" 6) Look at the biblio details -- It should also display "Type:" 7) In the staff client, set the OPAC system preference opacthemes to 'prog' and save. 8) In the OPAC, search for biblio used in previous patch testing. -- It should display "Type:" 9) Look at the biblio details -- It should also display "Type:" 10) Apply the patch 11) In the staff client, set the OPAC system preference opacthemes to 'bootstrap' and save. 12) In the OPAC, search for biblio used in previous patch testing. -- It should display "Material type:" this time. 13) Look at the biblio details -- It should display "Material type:" this time. 14) In the staff client, set the OPAC system preference opacthemes to 'prog' and save. 15) In the OPAC, search for biblio used in previous patch testing. -- It should display "Material type:" this time. 16) Look at the biblio details -- It should display "Material type:" this time. 17) Run the koha qa test tool. Signed-off-by: Mark Tompsett Note: Just a simple string change. Signed-off-by: Katrin Fischer String change, works as advertised in staff, prog and bootstrap OPAC. Signed-off-by: Galen Charlton (cherry picked from commit 007c94ff20a5c9d9c3121849b42f820a0da5b869) Signed-off-by: Fridolin Somers commit 97d9b102fa2fc1a3cf6cee1356b288c0b0d0a15f Author: Marcel de Rooy Date: Mon Apr 11 11:46:44 2011 +0200 Bug 9075: Rename "type" to "material type" on staff XSLT detail and results The label Material type better describes what the icon presents. It is based on leader values of the MARC record. Revised Test Plan ----------------- 1) Set the Staff system preference XSLTDetailsDisplay to 'default' and save. 2) Set the Staff system preference XSLTResultsDisplay to 'default' and save. 3) Click 'Search the catalog' tab in the search area. 4) Search for something 5) Look for a biblio that has 942$c set to some type. -- It should display "Type:" Or take a result and modify it to have a 942$c. 6) Look at the biblio details -- It should also display "Type:" 7) Apply the patch 8) Search for the same biblio again. -- It should display "Material type:" this time. 9) Look at the biblio details -- It should display "Material type:" this time. 10) Run the koha qa test tool. Signed-off-by: Mark Tompsett Note: This is a simple string substitution. Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit 4bdd8d9a69f72751f0429be5bc58afdd218a4bb0) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:26:26 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:26:26 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-13-g0183394 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 0183394e8c77d583a2dae2a59bcbe678911fe9ff (commit) via 839dc46ce613e16123621169de6ab8f3e6fd0a64 (commit) via d440e51758acad905cf002f23e7994b1a112d877 (commit) via f05d933bf9deb0a999dba5550a22debeca068d30 (commit) from d0ea1ce586de9cd65edc92d32ae9c25e112b13fa (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 0183394e8c77d583a2dae2a59bcbe678911fe9ff Author: Marcel de Rooy Date: Thu Aug 15 15:19:32 2013 +0200 Bug 8044: (follow-up) ensure Modern::Perl is imported first Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit fe32727fc55823ab1a3edba70597b89856cd0ea3) Signed-off-by: Fridolin Somers commit 839dc46ce613e16123621169de6ab8f3e6fd0a64 Author: Julian Maurice Date: Mon Aug 20 13:51:27 2012 +0200 Bug 8044: (follow-up) add copyright block and use Modern::Perl Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 061cff837d1667b0f714fbbfba59c2caed098d6b) Signed-off-by: Fridolin Somers commit d440e51758acad905cf002f23e7994b1a112d877 Author: Julian Maurice Date: Mon Aug 20 10:55:50 2012 +0200 Bug 8044: (follow-up) fix warning and error messages in translate.pl CHARSET is now automatically replaced by UTF-8, and 'update' creates the PO file if it does not exist. Also do not try to create PO files if POT file creation failed (when there is no messages to translate for example). + add some verbosity + add Locale::Maketext and Locale::Maketext::Lexicon to Koha dependencies Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 75bd34df7acba7b20bc7981f2484e79e19032d4a) Signed-off-by: Fridolin Somers Conflicts: C4/Installer/PerlDependencies.pm commit f05d933bf9deb0a999dba5550a22debeca068d30 Author: Julian Maurice Date: Fri May 4 14:33:10 2012 +0200 Bug 8044: new module for translating strings in Perl source files You have to use the new module Koha::I18N Code example: use Koha::I18N; use CGI; my $input = new CGI; my $lh = Koha::I18N->get_handle_from_context($input, 'intranet'); print $lh->maketext("Localized string!"); PO files are in misc/translator/po/LANG-messages.po. Creation of PO files are integrated to existing workflow, so to create PO file for a language, just run in misc/translator: ./translate create LANG To update: ./translate update LANG You can then translate the PO with your favorite editor. Strings will be localized at runtime. Signed-off-by: Marcel de Rooy Works as advertised. Some details needing further attention noted on bug report. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 114f3dd49998be21643f83bec644f9837c6bdecc) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 10 +++ Koha/{Template/Plugin/Branches.pm => I18N.pm} | 53 ++++++++------- misc/translator/LangInstaller.pm | 86 +++++++++++++++++++++++++ 3 files changed, 125 insertions(+), 24 deletions(-) copy Koha/{Template/Plugin/Branches.pm => I18N.pm} (52%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:28:39 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:28:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-15-g9b854b5 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 9b854b501e2e6c7d41aeeef490f499794594c5c6 (commit) via 86a6a5f35f2e0b6f410062a5b1859176ec0e53c2 (commit) from 0183394e8c77d583a2dae2a59bcbe678911fe9ff (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 9b854b501e2e6c7d41aeeef490f499794594c5c6 Author: Kyle M Hall Date: Fri Jan 10 08:36:28 2014 -0500 Bug 9865 (follow-up) give better usage examples in example SIPconfig.xml Signed-off-by: Galen Charlton (cherry picked from commit 7b295e9dd7a1f2a9b1d1cf1882edbc2a0e70fe3a) Signed-off-by: Fridolin Somers commit 86a6a5f35f2e0b6f410062a5b1859176ec0e53c2 Author: Adrien Saurat Date: Fri Nov 8 11:49:56 2013 +0100 Bug 9865: make SIP msg encoding configurable via SIPconfig.xml The accounts->login tag in SIPconfig.xml can now accept a new parameter, "encoding". It will be mostly used to encode to utf8. For this, simply add the parameter: encoding="utf8" Signed-off-by: Chris Cormack Works as advertised, does nothing if encoding is not set. Blows up all the machines that can't handled utf8 if it is set :) But that's not Koha's fault. :) Patch rebased by Christophe Croullebois Signed-off-by: Petter Goksoyr Asen But now I did it the right way! And I can confirm that this patch solves all issues with mangled characters in SIP messages. Confirmed that it looks good with Norwegian characters in patron name and in book titles. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 4a72f6b2375895c690dcaaaff26b07de53cfd518) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/SIP/Sip.pm | 6 ++++-- C4/SIP/Sip/MsgType.pm | 34 +++++++++++++++++----------------- etc/SIPconfig.xml | 4 ++-- 3 files changed, 23 insertions(+), 21 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Aug 1 15:39:03 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Aug 2014 13:39:03 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-16-g754cacc Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via 754caccf77595840701fdad400fa02a298993344 (commit) from 9b854b501e2e6c7d41aeeef490f499794594c5c6 (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 754caccf77595840701fdad400fa02a298993344 Author: Owen Leonard Date: Wed Apr 9 09:08:27 2014 -0400 Bug 12056: fix untranslatable strings in calendar In the calendar there are some strings in a JavaScript function which are not properly wrapped in a function for translation. This patch corrects this. This patch also corrects some minor validation issues and spelling and grammar issues, including those covered by Bug 12055. To test, apply the patch and view the calendar in Tools -> Calendar. When you hover your mouse over a day in the calendar you should see a title tooltip indicating what kind of day/holiday it is and showing the title of the holiday, if any. To test that the strings are now being picked up for translation, run translate update on a po file and confirm that the affected strings are now present: "Weekly holiday," "Yearly holiday," etc. Signed-off-by: Bernardo Gonzalez Kriegel Works well. New strings on translation file. No koha-qa errors. Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton (cherry picked from commit 0837954cdda85549f5552dacefd3a5bc3e58292e) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/holidays.tt | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Aug 3 17:00:21 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 03 Aug 2014 15:00:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-347-gdfc5017 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 dfc5017acb276d44e092dfea34f9df68bbbbac6a (commit) via c9fab262405a08a24f46defb9654fc00a7775d31 (commit) via b0e9711ec40bae63ca2feab63711b491042b5df2 (commit) via 7d9c554b5fbdd89f4bd66ea9f12b9b29c06b2db2 (commit) via a111d3149dfd1872c0232b2349baf0e8b0c16048 (commit) via 5c42809746e4b256766174d4d374f73d02616111 (commit) from 8c5671087da1ce3daf9ecf55589761f185e34453 (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 dfc5017acb276d44e092dfea34f9df68bbbbac6a Author: Nicole C. Engard Date: Thu Jul 31 11:40:22 2014 -0500 Bug 12685: Add help file for staff search history This patch adds a missing help file for the staff search history page. To test: * Turn on EnableSearchHistory * Do a search in the catalog * Click your username in the top right and choose 'search history' * Click 'help' in the top right * Confirm that help file is there * note: link to manual won't work until after 2014-08-01 in the USA Signed-off-by: Bernardo Gonzalez Kriegel Work as described, no errors. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit c9fab262405a08a24f46defb9654fc00a7775d31 Author: Petter Goksoyr Asen Date: Fri Jul 11 10:54:11 2014 +0200 Bug 12554: Fix GetMarcPrice for NORMARC When doing aquisitions and ordering from external z3950 targes, the item price is not inferred from the MARC record when the NORMARC framework is set. This patch makes GetMarcPrice treat NORMARC the same as MARC21. Test plan * Setup Koha with NORMARC framework * Add a norwegian z3950 search target (ex: z3950.bibsys.no:2100, database=BIBSYS) * Create a new basket, and add order to basket from external source * Search for a tile (ex: ISBN 8205341834) from the bibsys z3950 server * Click to order the title * Observe that vendor price is not set * Apply patch, repeat search for same book * Order, and observe the vendor price is filled in from the MARC record http://bugs.koha-community.org/show_bug.cgi?id=12554 Signed-off-by: Bernardo Gonzalez Kriegel Works as described. No errors. Tested changing marcflavour syspref to NORMARC, and following test plan, bug exist and is fixed. Changed bug description on patch, too long :) Signed-off-by: Katrin Fischer Patch adds a check for NORMARC to provide the same functionality as for MARC21. No regressions found. Signed-off-by: Tomas Cohen Arazi commit b0e9711ec40bae63ca2feab63711b491042b5df2 Author: Tomas Cohen Arazi Date: Tue Jul 29 15:53:10 2014 -0300 Bug 12554: (regression test) C4::Biblio::GetMarcPrice does not handle NORMARC Signed-off-by: Tomas Cohen Arazi commit 7d9c554b5fbdd89f4bd66ea9f12b9b29c06b2db2 Author: Tomas Cohen Arazi Date: Tue Jul 29 13:55:44 2014 -0300 Bug 12672: GetMarcISBN should return the corresponding subfield The current GetMarcISBN implementation returns an array of ISBN in which all subfields of a ISBN field occurence are appended. For example, in MARC21, if you have $a and $c defined, they will be appended for output. This happens for $z. To reproduce: - Run the regression tests attached to this bug. To test: - Apply the patch, regression tests pass. - Sign off Signed-off-by: Bernardo Gonzalez Kriegel Now test pass, no koha-qa errors Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit a111d3149dfd1872c0232b2349baf0e8b0c16048 Author: Tomas Cohen Arazi Date: Tue Jul 29 13:36:03 2014 -0300 Bug 12672: (regression test) GetMarcISBN should return the corresponding subfield Run: $ prove -v t/db_dependent/Biblio.t => FAIL: GetMarcISBN doesn't return the expected value for ISBN in MARC21, NORMARC and UNIMARC Signed-off-by: Bernardo Gonzalez Kriegel Test fails, no koha-qa errors. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 5c42809746e4b256766174d4d374f73d02616111 Author: Bernardo Gonzalez Kriegel Date: Thu Jul 31 16:47:30 2014 -0300 Bug 12687 - Remove CGI::scrolling_list from circulation.pl This patch removes the only instance in this file To test: 1. Apply the patch 2. Search for patrons on staff CheckOut, use a string that gives multiple results 3. Results are displayed on a select, that was replaced. 4. Check for regressions: select a patron and press 'Select', or do double click on a patron name, verify you go to patron's checkout tab. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 5 +++-- circ/circulation.pl | 19 +++++----------- .../prog/en/modules/circ/circulation.tt | 16 +++++++++----- .../en/modules/help/catalogue/search-history.tt | 11 ++++++++++ t/db_dependent/Biblio.t | 23 +++++++++++++++----- 5 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/catalogue/search-history.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Aug 3 21:11:58 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 03 Aug 2014 19:11:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-348-g54c4c73 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 54c4c73e479f374dad7b5db6dc23272960aa2a01 (commit) from dfc5017acb276d44e092dfea34f9df68bbbbac6a (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 54c4c73e479f374dad7b5db6dc23272960aa2a01 Author: Tomas Cohen Arazi Date: Sun Aug 3 16:41:18 2014 -0300 Bug 12554: (tests followup) need to mock GetCurrency Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Biblio.t | 8 ++++++++ 1 file changed, 8 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Aug 3 22:01:45 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 03 Aug 2014 20:01:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-353-g4e27878 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 4e278782f156a9d7452e6e9ddcefee9542b964fc (commit) via ab0d9ae5163d22a9f0e971a80d8470275332fe67 (commit) via c7ca45d0463099ac5cee8978d0f05960e3779c0f (commit) via 5466a5f4ce9a3b71ce1cdf4927bc78d81e3262d7 (commit) via 2db8ba555d40ee2bb8edb0342e86e03d5d2a7d04 (commit) from 54c4c73e479f374dad7b5db6dc23272960aa2a01 (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 4e278782f156a9d7452e6e9ddcefee9542b964fc Author: Bernardo Gonzalez Kriegel Date: Tue Jul 29 15:00:56 2014 -0300 Bug 12673: Remove CGI::scrolling_list from C4::Items.pm This patch removes only instance in this file To test: 1. Apply the patch 2. (Esay way) Put on staff URL /cgi-bin/koha/services/itemrecorddisplay.pl?biblionumber=N&itemnumber=M 3. Code replaced corresponds to pulldowns, verify information is correct (check with another item edit view) PrepareItemrecordDisplay() in Items.pm is filled with chunks of HTML code that must be put on TT file. For now scrolling_list is the only removed. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Tested different item edit displays and the URL given above, no regressions found. Also passes all tests and QA script. Signed-off-by: Tomas Cohen Arazi commit ab0d9ae5163d22a9f0e971a80d8470275332fe67 Author: Bernardo Gonzalez Kriegel Date: Wed Jul 30 11:31:39 2014 -0300 Bug 12675: Add unit test to GetFrameworksLoop to test: 1. Apply the patch 2. Run the test, prove t/db_dependent/Koha.t 3. Check that it pass Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit c7ca45d0463099ac5cee8978d0f05960e3779c0f Author: Bernardo Gonzalez Kriegel Date: Tue Jul 29 15:49:44 2014 -0300 Bug 12675: Remove CGI::scrolling_list from labeledMARCdetail.pl This patch removes only instance in this file. Also updates getframework POD on C4/Koha.pm, adds new GetFrameworksLoop() func on same file from suggested code, but with ordered result. To test: 1. Apply the patch 2. Enable viewLabeledMARC syspref 3. On staff, search for a record, goto detail view 4. Clic on Labeled MARC 5. Framework pulldown was replaced, check changing framework. A bug was fixed, because selecting any fw and then Default tries to load values from 'Default' fw code, which does not exists. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Works as described, passes tests and QA script. Signed-off-by: Tomas Cohen Arazi commit 5466a5f4ce9a3b71ce1cdf4927bc78d81e3262d7 Author: Owen Leonard Date: Mon Jul 28 11:35:47 2014 -0400 Bug 12677: Use Bootstrap "label" style for inline OPAC renewal messages This patch revises the styling of the renewal success message to use a default Bootstrap style more suited to inline messages. I think this is preferable to using the alert style because the alert is designed to be a block-level element. http://getbootstrap.com/2.3.2/components.html#labels-badges Because Koha's CSS already uses a "label" class for something else I duplicate the Bootstrap "label" class in opac.css as "blabel." The Bootstrap color definitions are included. To test, follow the test plan already provided: 1) Apply this patch 2) From the OPAC, renew some items 3) Note the "Renewed!" message in the "Renew" column of the checkouts table Patch works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Works as described, no problems found. Signed-off-by: Tomas Cohen Arazi commit 2db8ba555d40ee2bb8edb0342e86e03d5d2a7d04 Author: Olli-Antti Kivilahti Date: Tue Jul 29 12:04:52 2014 +0300 Bug 12668 - Stray dollar ($) -sign in opac-reserve.pl A dollar sign is hard-coded in opac-reserve.pl and becomes apparent when trying to place a reservation when one has "too_much_oweing" or too much fines. Removing the dollar sign so we just get <"K?ytt?maksujen katto ylitetty. Et voi tehd? varauksia. Sinulla on maksamattomia maksuja 9.50."> instead of <"K?ytt?maksujen katto ylitetty. Et voi tehd? varauksia. Sinulla on maksamattomia maksuja $9.50."> Patch removes hard coded $ sign. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer The dollar sign is gone and the message still displays correctly. Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 15 ++--- C4/Koha.pm | 71 +++++++++++++++++--- catalogue/labeledMARCdetail.pl | 27 +------- .../prog/en/modules/catalogue/labeledMARCdetail.tt | 13 +++- .../prog/en/modules/services/itemrecorddisplay.tt | 12 ++++ koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 25 +++++++ opac/opac-reserve.pl | 2 +- t/db_dependent/Koha.t | 47 ++++++++++++- 10 files changed, 170 insertions(+), 46 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Aug 4 06:14:20 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Aug 2014 04:14:20 +0000 Subject: [koha-commits] main Koha release repository branch MM-OPAC/bug_12568 deleted. v3.16.00-294-gd9172b3 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, MM-OPAC/bug_12568 has been deleted was d9172b3cdf77bdcd6da890cfbb1ab5cb890320db - Log ----------------------------------------------------------------- d9172b3cdf77bdcd6da890cfbb1ab5cb890320db Bug 12568 [QA Followup] - Use ':' as separator instead of '|' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 6 00:57:04 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Aug 2014 22:57:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-359-gfad7daf 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 fad7daf10261d59e5e40ea84d4caaae9bd87d4e0 (commit) via 129cedf943c09d084ad6e09e8de60a87962094e6 (commit) via dda53be4900b9b5b6171af3d865306e71415ee06 (commit) via 7a5eac3a51b3dc5b344c91a729b282a191bf2c8e (commit) via d3ece3601504e51878b00e49f9911e80b5337ac3 (commit) via 6e13e16db34e61d90d358b05af6f5d9d2751f70f (commit) from 4e278782f156a9d7452e6e9ddcefee9542b964fc (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 fad7daf10261d59e5e40ea84d4caaae9bd87d4e0 Author: Fridolin Somers Date: Tue Jul 29 08:57:54 2014 +0200 Bug 11331 - CSV export for viewlog.pl is missing newlines - followup Perl formatting and cleaning. Also corrects the HTML of results table in viewlog.tt. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi commit 129cedf943c09d084ad6e09e8de60a87962094e6 Author: Fridolin Somers Date: Fri Jul 25 17:01:42 2014 +0200 Bug 11331 - CSV export for viewlog.pl is missing newlines When you try to export the result of tools/viewlog.pl in csv, file cannot be correctly loaded : - newline is missing after each record, - strings should be enclosed in "" - columns are not the same as for screen output This patch corrects this by using like other export Text::CSV. Adds a header line made with the keys of first data. For that, all data values are initialiszed with empty string. Test plan : - Use a database with some logs, see sysprefs /cgi-bin/koha/admin/preferences.pl?tab=logs - Go to export page /cgi-bin/koha/tools/viewlog.pl - Select a module - Click on "To a file" and choose a file name - Click on "Submit" - Open file => Without this patch : newline is missing, multi-lines cells are not enclosed in "", there are no column headings => Without this patch : each line is a data line, complexe cells are enclosed in "", there are column headings - Test the export of all modules to see that all headings are necessary - Check the output to screen in the browser Signed-off-by: Owen Leonard The CSV export is significantly improved. I question the usefulness of including biblioitemnumber in the output. A better inclusion would be itemnumber. Signed-off-by: Katrin Fischer While this feature is still not perfect, this is a big improvement. Passes tests and QA script, restores basic functionality. Signed-off-by: Tomas Cohen Arazi commit dda53be4900b9b5b6171af3d865306e71415ee06 Author: Brian Norris Date: Fri Jul 25 14:55:04 2014 +1200 Bug 12660:Correct mispelling of accomodate in comments View the file in your git checkout to see the misspelling of accomodate do the patch view the files again to see the correct spelling accommodate Patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Fixes typos to correct spelling. Signed-off-by: Tomas Cohen Arazi commit 7a5eac3a51b3dc5b344c91a729b282a191bf2c8e Author: Fridolyn SOMERS Date: Fri Jul 26 17:02:01 2013 +0200 Bug 10648 - In records merge greatest field can not be added When merging 2 records (/cgi-bin/koha/cataloguing/merge.pl), the destination record is build using the fields and subfields checked in source records. When a field is checked, the javascript code searches in destination record a field with a greater tag number to insert new field before. When the new field tag number is greater than all existing field tag numbers, the field is not added. This patch corrects this by adding at end if no greater field tag number exists. Also adds a sort of fields by tag number because all mergo code is based on this. Test plan : - Add to a framework a repeatable field with the greater non existing tag number. For example 998. - Edit 2 records with this framework and add them a value in this tag. - Put those records is a list - Go to this list and check the two records - Click on "Merge selected" - Click on next - Go to second source record - Click on the greatest tag number. for example 998. => The field is added at the end of destination record Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Works as described, no regressions. commit d3ece3601504e51878b00e49f9911e80b5337ac3 Author: Owen Leonard Date: Wed Jul 16 15:32:08 2014 -0400 Bug 4013 [Revised] road type missing on search results On the patron search results page there are several patron fields which do not show: street number, road type, and state. This patch adds them. To test, go to Patrons -> Search patrons and perform a search. In the table of patron search results each patron record should display the correct information including street number, road type, and state. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described, passes tests and QA script. Signed-off-by: Tomas Cohen Arazi Works as described. commit 6e13e16db34e61d90d358b05af6f5d9d2751f70f Author: David Cook Date: Fri Aug 1 16:42:34 2014 +1000 Bug 12690 - opacuserjs gets loaded twice in self checkout This patch removes a second instance of "opacuserjs" in the opac self-checkout. _TEST PLAN_ 1) Enable OPAC Self-checkout in the system preferences 2) Type the following code into your "opacuserjs" system preference: alert("This is a test"); 2) Visit /cgi-bin/koha/sco/sco-main.pl 3) Note that you get a pop-up saying "This is a test" twice. 4) Apply the patch 5) Refresh /cgi-bin/koha/sco/sco-main.pl 6) Note that you now only get a pop-up saying "This is a test" once. Followed test plan, patch behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer opac-bottom.inc already adds opacuserjs, so the additional line in this template can be removed. Works as described, no problems found. Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Log.pm | 1 - C4/Utils/DataTables/Members.pm | 7 +- koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js | 16 +- .../en/modules/members/tables/members_results.tt | 3 +- .../prog/en/modules/tools/batchMod-del.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 21 +- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 1 - tools/viewlog.pl | 230 +++++++++++--------- 9 files changed, 158 insertions(+), 125 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 6 01:20:50 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Aug 2014 23:20:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-365-g6b6e0b4 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 6b6e0b43c2b5ee614dff00739e6c9a2ebe860f6a (commit) via b3cd7f110a7535d597060a2d654dcc3e404e34f0 (commit) via 2197d1280622923b0c1046dd079fc8ea0c418154 (commit) via 71881f1a8e983479c70e1ef58e96c01ad8705504 (commit) via 5fc2a6dbad8a450f9acbe53e699a0c8c3877f917 (commit) via 2bd123f5ba863138a298ac90e3ccc4e9f3a78dc4 (commit) from fad7daf10261d59e5e40ea84d4caaae9bd87d4e0 (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 6b6e0b43c2b5ee614dff00739e6c9a2ebe860f6a Author: Owen Leonard Date: Mon Jul 28 12:11:33 2014 -0400 Bug 12597 - Give better visual indication of currently-selected language in the staff client There is currently no visual feedback to the user reflecting which of multiple installed translations is currently selected. I think some necessary styling didn't make it into the conversion to Bootstrap menus. This patch attempts to improve things. Most of the changes are to bring back the previous style of highlighting the currently selected language. A new change is the addition of the sub-language code to the display of the menu label if one of that menu item's sub-languages is selected. This patch also removes some obsolete CSS which referred to the old menu system. To test, apply the patch and install or update multiple languages, including at least two sub-languages. In my test I used en, en-GB and de-DE. Clear your browser cache if necessary. Enable all these languages and test the functionality of the language selection menu in the footer. - Non-enabled languages should appear as non-bold links. - When a single language (with no sub-languages) is enabled it should appear as bold text. - When one of multiple sub-languages is enabled that selection in the pop-up menu should appear as bold text. The menu label should show in bold the language code of the selected sub-language. Tested with de-DE and de-CH, works as expected Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Works as expected, passes all tests. No problems found. Signed-off-by: Tomas Cohen Arazi commit b3cd7f110a7535d597060a2d654dcc3e404e34f0 Author: Owen Leonard Date: Tue Jul 15 15:35:54 2014 -0400 Bug 8521 - Error in warning message when deleting list When deleting a list the operation is blocked if there are items still on the list, and the interface shows a warning which includes a count of the items on the list. This count is broken for lists containing more items than the number specified in the numSearchResults system preference. This patch corrects the item count to use an actual count of the total number of results, not the total number of results in the first page of results. The template change to the staff client copies some language logic from the OPAC template for dealing with a single number of list entries. Test in both the OPAC and the staff client. Check the number specified in the numSearchResults system preference and locate or create a list containing more than that number of items. Try to delete the list. You should receive a warning message stating the correct total number of items on the list. Test also with a list which contains fewer than numSearchResults entries, and a list which contains zero entries. Signed-off-by: Ian Beardslee Tested Public and Private lists with 0, 5 & 25 entries, Public with 40 and Private with 45. Working as expected. Signed-off-by: Katrin Fischer Works as described, passes tests and QA script. Signed-off-by: Tomas Cohen Arazi commit 2197d1280622923b0c1046dd079fc8ea0c418154 Author: Jacek Ablewicz Date: Tue Jul 22 17:57:01 2014 +0200 Bug 12619 - Shipment date gets lost on finishing and/or editing the invoice To reproduce: - Create a new shipment, make sure to add a shipment date - Receive or not receive orders - Finish receiving with the button at the bottom of the page - Verify that shipment date is now empty To test: - reproduce the aforementioned issue - apply patch - confirm that the issue is no longer rerpoductible (= shipment date is not getting lost any longer), and that there are no apparent regresssions of any kind involving invoice shipment date entering and/or editing - sign off Signed-off-by: Aleisha Signed-off-by: Katrin Fischer Passes tests and QA script, fixes the issues, no problems found. Signed-off-by: Tomas Cohen Arazi commit 71881f1a8e983479c70e1ef58e96c01ad8705504 Author: Tomas Cohen Arazi Date: Tue Aug 5 20:39:03 2014 -0300 Bug 12407: (QA followup) last occurence of 'Other phone' renamed to 'Mobile phone' Signed-off-by: Tomas Cohen Arazi commit 5fc2a6dbad8a450f9acbe53e699a0c8c3877f917 Author: Marcel de Rooy Date: Thu Jul 31 14:22:37 2014 +0200 Bug 12407: [QA Follow-up] Rename Other Phone to Mobile in staff Touches three member templates. Changes label Other into Mobile. This is consistent with database field name and OPAC. Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi commit 2bd123f5ba863138a298ac90e3ccc4e9f3a78dc4 Author: Brendon Ford Date: Thu Jun 12 20:28:28 2014 -0400 Bug 12407: phone label or data switched Fix for switched phone numbers on patron details page. This patch fixes switched phone numbers on patron details page and also makes phone number labels more uniform. To Test: 1. Apply the patch. 2. Create/modify a patron entering some unique data into the "Secondary phone:" and "Other phone:" fields (different data for each). 3. Save the patron record. 4. Go to the patrons details page and make sure the data entered into the "Secondary phone:" field is displaying next to the "Secondary phone:" label and that the data entered into the "Other phone:" field is displaying next to the "Other phone:" label. Signed-off-by: Nicole C. Engard Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/VirtualShelves/Page.pm | 6 +- acqui/invoice.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/columns.def | 2 +- .../intranet-tmpl/prog/en/css/staff-global.css | 149 +++++--------------- .../prog/en/includes/intranet-bottom.inc | 31 ++-- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember-brief.tt | 6 +- .../prog/en/modules/members/moremember.tt | 6 +- .../prog/en/modules/virtualshelves/shelves.tt | 6 +- 9 files changed, 72 insertions(+), 138 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 6 01:43:04 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Aug 2014 23:43:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.16.00-366-gccd2a36 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 ccd2a36c3c08f4ba25f9b6c29bcd33ab9c060820 (commit) from 6b6e0b43c2b5ee614dff00739e6c9a2ebe860f6a (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 ccd2a36c3c08f4ba25f9b6c29bcd33ab9c060820 Author: Evonne Cheung Date: Fri Nov 21 14:10:08 2014 +1300 Bug 10220 IDs on checkin columns Test: go to Circulation > Check in, table has ID and each column has a class. Signed-off-by: Katrin Fischer Adds a class to every th and td element in the check-in table. Works as describe, no regressions found. Signed-off-by: Jonathan Druart Amended patch: Replace some tab with spaces. Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/returns.tt | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Aug 6 09:14:47 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Aug 2014 07:14:47 +0000 Subject: [koha-commits] main Koha release repository branch 3.14.x updated. v3.14.09-20-gc706ace Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.14.x has been updated via c706ace5872a3eef0ca44d67d074b8fd1354b7a8 (commit) via 2d0731c5abcb3bbbf8a728c5d71de05ac788807a (commit) via 70e4440e9cc671368a3f2d0de52a9ade0b3bb4ee (commit) via 04e5d3387591713f78b9c16b07cf205c634fa109 (commit) from 754caccf77595840701fdad400fa02a298993344 (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 c706ace5872a3eef0ca44d67d074b8fd1354b7a8 Author: Owen Leonard Date: Wed Apr 9 12:41:24 2014 -0400 Bug 10865: (Follow-up) Add CSS style for form hints This patch adds a new "hint" class for displaying information relating to a form field. On the list edit screen the hint also has an alert class to highlight it. Signed-off-by: Katrin Fischer Passes all tests and QA script. Works as advertised. Tested with Bootstrap and prog theme. Some notes: - When OpacAllowPublicListCreation is turned off, the permissions don't show. - When OpacAllowPublicListCreation is turned off, we could also hide the Category pull down in the [new list] pop up, as there is only Private left as an option. - Maybe we should move the new list link outside of the tabs? When OpacAllowPublicListCreation is turned off, but public lists exist, the link 'new list' will still show on the public list tab, but a private list will be created. Signed-off-by: Galen Charlton (cherry picked from commit 9094b4a1bbff95e0f8e5747a805dacede165bc9a) Signed-off-by: Fridolin Somers Conflicts: koha-tmpl/opac-tmpl/bootstrap/css/opac.css commit 2d0731c5abcb3bbbf8a728c5d71de05ac788807a Author: Galen Charlton Date: Fri Feb 21 20:44:24 2014 +0000 bug 10865: (follow-up) allow patrons to make their public lists private when OpacAllowPublicListCreation is off This patch ensures that patrons continue to have the ability to make their public lists private for any public lists they control that were created before the library turned the OpacAllowPublicListCreation system preference off. To test: [1] Ensure OpacAllowPublicListCreation is on. [2] As a patron, create a public list in the OPAC. Also, create a private list. [3] Turn OpacAllowPublicListCreation off. [4] Back in the OPAC, verify that the public list can be edited and that there are drop-downs for category and permissions. Also verify that there is a warning that the patron cannot change it back if they convert a public list to private. [5] Edit the private list created in step 2. Verify that the category and permissions drop-downs are not displayed. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Broust Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit 7dd0e9a41fd639e86ed32d98d863d605a6ba63e8) Signed-off-by: Fridolin Somers commit 70e4440e9cc671368a3f2d0de52a9ade0b3bb4ee Author: Jonathan Druart Date: Wed Feb 12 11:33:21 2014 +0100 Bug 10865: (follow-up) Move a li tag to avoid overlapping tags With this patch, a li tag is empty (only using the bootstrap theme) if the pref is disabled. Signed-off-by: Jonathan Druart Signed-off-by: Broust Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit c8085cb9c38f60b1152f4cf86c7ffcc82d3e8106) Signed-off-by: Fridolin Somers commit 04e5d3387591713f78b9c16b07cf205c634fa109 Author: Owen Leonard Date: Fri Sep 13 10:50:27 2013 -0400 Bug 10865: Don't show list permissions when adding public lists/sharing lists is not allowed If patron creation of public lists is disallowed by the OpacAllowPublicListCreation system preference the "category" option should be hidden altogether instead of showing a