') and renames the include file to make it clear that it relates only to patron card creator operations. To test, perform various operations: - Go to 'manage images' and try to upload a file which exceeds the 500KBfile size limit - Go to the edit batch page and manually append an error code to the URL: /cgi-bin/koha/patroncards/edit-batch.pl?op=new&error=403 - Go to one of the manage pages and manually append an error code to the URL: /cgi-bin/koha/patroncards/manage.pl?card_element=profile&error=201 Correct display of an error message indicates that the include file is being found. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Passes test plan, test suite and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/error-messages.inc | 108 -------------------- .../prog/en/includes/patroncards-errors.inc | 35 +++++++ .../prog/en/modules/patroncards/edit-batch.tt | 2 +- .../prog/en/modules/patroncards/image-manage.tt | 2 +- .../prog/en/modules/patroncards/manage.tt | 2 +- patroncards/edit-batch.pl | 3 +- patroncards/image-manage.pl | 15 +-- patroncards/manage.pl | 3 +- 8 files changed, 45 insertions(+), 125 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Sep 8 21:09:53 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 19:09:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1078-g86c08e6 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 86c08e63a25afa86c9051f070d819ddac675425d (commit) from 46bbfa12a1d20cfaea2c61ad9bf1fdb47a25435a (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 86c08e63a25afa86c9051f070d819ddac675425d Author: Janusz Kaczmarek Date: Fri May 24 14:38:10 2013 +0300 Bug 10331 - Little errors in unimarc_field_4XX.pl (punctuation) Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described, no koha-qa errors Signed-off-by: Katrin Fischer Copying the test plan from the bug report: A. 1) have $a active in one of the linking fields (like 461, 463, etc.). 2) have a biblio record with the field 700 $a, $b, $f filled up 3) go to cataloguing -> field 4XX of your choice, use the plugin to fetch data from biblio rec. mentioned in 2) 4) see the punctuation in $a -- it will be wrong (no closing bracket) B. 1) have $a active in one of the linking fields (like 461, 463, etc.). 2) have a biblio record with the field 700 $a, $b, $c, $f filled up 3) go to cataloguing -> field 4XX of your choice, use the plugin to fetch data from biblio rec. mentioned in 2) 4) see the punctuation in $a -- it will be wrong (dash instead of semicolon between original $c and $f, no closing bracket) C. 1) have $a active in one of the linking fields (like 461, 463, etc.). 2) have a biblio record with the field 702 $a, $b, $c filled up 3) go to cataloguing -> field 4XX of your choice, use the plugin to fetch data from biblio rec. mentioned in 2) 4) see the punctuation in $a -- it will be wrong (unnecessary semicolon after original $c, n.b. lacking space). D. 1) have $a active in one of the linking fields (like 461, 463, etc.). 2) have a biblio record with the field 712 $a, $b filled up 3) go to cataloguing -> field 4XX of your choice, use the plugin to fetch data from biblio rec. mentioned in b) 4) see the punctuation in $a -- it will be wrong (unnecessary opening bracket at the end). Test plan, all tests and QA script pass. Thx Bernardo for his testing and explanations! Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: cataloguing/value_builder/unimarc_field_4XX.pl | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Sep 8 21:13:35 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 19:13:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1079-gbc240a9 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 bc240a908d0fbc50b099df04e61da9fbb55fab52 (commit) from 86c08e63a25afa86c9051f070d819ddac675425d (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 bc240a908d0fbc50b099df04e61da9fbb55fab52 Author: Fridolyn SOMERS Date: Wed Jul 10 11:06:39 2013 +0200 Bug 10564 - use OPACURLOpenInNewWindow in UNIMARCslim2OPACResults.xsl When using UNIMARC XSLT for OPAC detail page, if record has an 856$u, its content is displayed as a link. The syspref OPACURLOpenInNewWindow adds the option of opening in a new window (attribute target="_blank"). 856$u is also used in UNIMARC results XSLT but the use of OPACURLOpenInNewWindow syspref is missing. It exists for MARC21. This patch adds the use of OPACURLOpenInNewWindow in UNIMARCslim2OPACResults.xsl. Test plan : - In a UNIMARC catalog, enable XSLT for OPAC results page - Create a record with a link in 856$u and set second indicator to 0 - Set OPACURLOpenInNewWindow syspref on - At OPAC, perform a search that contains the record => You should see the link : "Click here to access online" - click on it => You shoud get to a new window (or tab depending on your browser configuration) - Set OPACURLOpenInNewWindow syspref off - re-perform the search - click on the link => You shoud stay in same window Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described, no koha-qa errors Tested following plan after applying patch Signed-off-by: Katrin Fischer XSLT change only, works as described. To test: Catalog 856$u and $a, 2nd indicator = 0. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Sep 8 21:41:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 19:41:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1080-g63820d3 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 63820d3973dae7514556172665a46c0584aaefc8 (commit) from bc240a908d0fbc50b099df04e61da9fbb55fab52 (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 63820d3973dae7514556172665a46c0584aaefc8 Author: Colin Campbell Date: Wed Sep 4 11:18:11 2013 +0100 Bug 10817: return hold items info in SIP Patron Info Response When requested by the summary flags the sipserver should return in the patron info response barcodes of the relevant titles. For available holds this is the barcode of the captured items. For unavailable holds ( i.e. current unsatisfied holds ), we need to send a barcode so that the unit can use this to request the title info. The barcode could be any one belonging to the title. This patch also corrects the erroneous return of empty items in the patron information response. If the unit supplies a range 1 - 100 unless the title has a hundred or more copies the unit expects all copies. The server was erroneously stuffing the returned arrays with null copies so that all summary requests returned 100 copies (mainly without barcodes) Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Testing notes: Using the test script provided on the bug report, but changed it to match sip user and patron existing in my database. Before applying the patch the SIP responses show the behaviour pointed out above regarding the 100 items. After applying the patch and restarting the SIP server responses are much more clean not returning empty IDs. 64 Patron information response AS = hold items hold items count is correct. AS contains barcodes of waiting holds. Before patch, all AS were empty. AT = overdue items overdue items count is correct. AT contains barcodes of overdue items. AU = charged items charged items count is correct. AU contains barcodes of charged items. AV = fine items Judging from behaviour seen and comment in Patrons.pm currently not implemented. BU = recall items Recalls are not implemented in Koha yet. CD = unavailable hold items unavailable items count is correct. CD contains barcode for item level holds and is empty for title level holds where no item can be determined. Before patch, all CD were empty. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/SIP/ILS/Patron.pm | 55 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 45 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Sep 8 22:20:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 20:20:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1082-g995a270 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 995a270dd10bd2dd56222fcdcb29ab033fad567e (commit) via ec09fe092e302dfbaf8ddf2a26ab361be9ea915e (commit) from 63820d3973dae7514556172665a46c0584aaefc8 (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 995a270dd10bd2dd56222fcdcb29ab033fad567e Author: Kenza Zaki Date: Thu Jul 25 09:37:34 2013 +0200 Bug 10630: give DelBookseller() a return value This patch makes DelBookseller returns the number of suppliers it has deleted or undef if an error has occurred. It also fixes a test which doesn't pass before in t/db_dependent/Bookseller.t To test: prove t/db_dependent/Bookseller.t t/db_dependent/Bookseller.t .. 1/54 All tests successful. Files=1, Tests=54, 1 wallclock secs ( 0.02 usr 0.00 sys + 0.48 cusr 0.02 csys = 0.52 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Logical change and makes another test pass :) Signed-off-by: Galen Charlton commit ec09fe092e302dfbaf8ddf2a26ab361be9ea915e Author: Fridolyn SOMERS Date: Tue Aug 13 14:55:32 2013 +0200 Bug 10718: fix items with no checkouts report Bug 8124 has commented the option to download results items with no checkouts report into a file. But the perl code of this page uses the export into a file has default behavior since the input "output" is no more present. The consequence is that there are never results in page. This patch removes the code concerning file output from template and perl. Such a feature exists in guided reports. Test plan : Play with cgi-bin/koha/reports/catalogue_out.pl form and see if you get results Bug 10718 - select user branch as default In cgi-bin/koha/reports/catalogue_out.pl report, select in library filter the user logged-in. Test plan : - Log into intranet with a normal user - Got to "Items with no checkouts" reports => Your branch is selected - Run report => You see "Filtered on : Branch = " - Come back to report - Select "Any library" - Run report => You do not see "Filtered on : Branch" Bug 10718 - items with no checkouts report permission is execute_reports This report only executes SQL to change reports/catalogue_out.pl permissions from all reports subpermissions to reports/execute_reports. Test plan : Test you can access and run this report with only execute_reports subpermission into reports permission. Bug 10718 - redefine limit input In reports/catalogue_out.pl form, the limit input is by defaut none. So by default the report queries all the catalogue. This may take a very long time (fall into timeout) and since now the results are displayed in page, the page may be huge. This patch modifies limit input to removes the "none" option. Also reduces the number of options (same options as guided reports results per page). Test plan: - Go to reports/catalogue_out.pl => first value "10" is selected - Launch report => You see "Filtered on: limit = 10" Bug 10718 - perltidy on reports/catalogue_out.pl Signed-off-by: Liz Rea Tested all of these things, all ok - squashed patch for neatness. Signed-off-by: Katrin Fischer Passes all tests and QA script. Fixed a tab in one of the comments. Improves script, but more work needed. Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Bookseller.pm | 3 +- .../prog/en/modules/reports/catalogue_out.tt | 53 ++-- reports/catalogue_out.pl | 330 +++++++++----------- t/db_dependent/Bookseller.t | 5 +- 4 files changed, 174 insertions(+), 217 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Sep 8 22:24:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 20:24:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1084-gc26ab35 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 c26ab35be632e7130a13e94e5767d182a42a2595 (commit) via be4fb1db9cc17d6d4f10ad8e633b5b87844d1472 (commit) from 995a270dd10bd2dd56222fcdcb29ab033fad567e (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 c26ab35be632e7130a13e94e5767d182a42a2595 Author: Galen Charlton Date: Sun Sep 8 20:37:19 2013 +0000 Bug 10640: (follow-up) bump up the number of expected tests in Bookseller.t Signed-off-by: Galen Charlton commit be4fb1db9cc17d6d4f10ad8e633b5b87844d1472 Author: Kenza Zaki Date: Thu Jul 25 10:18:11 2013 +0200 Bug 10640: give ModBookseller() an explicit return value. Before, ModBookseller always returns undef. This patch modifies it in order to be more explicit. Now it returns : 1 -> If a modification has been done 0E0 -> If the given ID doesn't exist undef -> If no ID given It also fixes one of the tests which didn't pass before in t/db_dependent/Bookseller.t To Test: prove t/db_dependent/Bookseller.t Bookseller.t .. 1/54 [Some warnings about uninitialized values] t/db_dependent/Bookseller.t .. ok All tests successful. Files=1, Tests=54, 1 wallclock secs ( 0.03 usr 0.00 sys + 0.46 cusr 0.04 csys = 0.53 CPU) Result: PASS Signed-off-by: Srdjan Signed-off-by: Katrin Fischer Change is logical and passes new and old tests. Fixed the author line to have Kenza's correct email address. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Bookseller.pm | 4 ++-- t/db_dependent/Bookseller.t | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Sep 8 22:32:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 20:32:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1085-gd3a0e60 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 d3a0e603fb2baa7aef9f1243739b243d0aaff657 (commit) from c26ab35be632e7130a13e94e5767d182a42a2595 (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 d3a0e603fb2baa7aef9f1243739b243d0aaff657 Author: Galen Charlton Date: Sun Sep 8 20:45:22 2013 +0000 Bug 10320: (follow-up) remove stray merge conflict marker Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/css/opac.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Sep 9 00:20:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 08 Sep 2013 22:20:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1087-g6fcb671 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 6fcb6712fe5411b182b6f0d23c40d3ce6d44f3eb (commit) via a2e7e6ef1cc4306e5429ca99317b96479cfa26d2 (commit) from d3a0e603fb2baa7aef9f1243739b243d0aaff657 (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 6fcb6712fe5411b182b6f0d23c40d3ce6d44f3eb Author: Tomas Cohen Arazi Date: Fri Aug 2 18:36:19 2013 -0300 Bug 10678 - Update addbooks help page The button's name changed, and a caret was added. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Melia Meggs Signed-off-by: Katrin Fischer Passes all tests and QA script. If you click the button directly, the default framework is still used. If you use the split button functionality to select another framework, this framework will be used for the imported record. Signed-off-by: Galen Charlton commit a2e7e6ef1cc4306e5429ca99317b96479cfa26d2 Author: Tomas Cohen Arazi Date: Fri Aug 2 15:22:43 2013 -0300 Bug 10678 - Allow framework selection when creating from Z39.50 If we are creating a new record, we are forced to use the default framework and then change it after we have the cataloguing form filled. This patch adds the option to choose (from a splitted button dropdown) which framework to use. To test: - Apply the patch. - Go to More > Cataloguing - Check there's a nice split button that says "New from Z39.50" a) Click the button, the usual Z39.50 search popup should appear and work as expected (check the URL parameters and see frameworkcode= has no value b) Click on the dropdown arrow, choose a framework and the usual Z39.50 search popup should appear, this time frameworkcode= should have the chosen value. Edit: fixed a small bug that prevented the default framework to be called. Thanks Owen for testing. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Melia Meggs Signed-off-by: Katrin Fischer Notes on second patch. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/cataloguing/addbooks.tt | 28 +++++++++++++++---- .../prog/en/modules/help/cataloguing/addbooks.tt | 2 +- 2 files changed, 23 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 10 17:49:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Sep 2013 15:49:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-8-g91211fe Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 91211febd5606e4c3713f235817ec0f4a46128c9 (commit) via 3d05ea27a7237006d1256df9b476f4886b027233 (commit) from 6df54fd2fa2e33166c5c6e24b5aabf8299ed5ef9 (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 91211febd5606e4c3713f235817ec0f4a46128c9 Author: Julian Maurice Date: Tue Jul 9 11:48:23 2013 +0200 Bug 2394: Use syspref canreservefromotherbranches in CanItemBeReserved If IndependentBranches is ON, patrons are not allowed to place hold requests on items whose owning library is different from the patron's home library, *unless* the canreservefromotherbranches system preference is also ON. The patch implements the intended behavior; without it, IndependentBranches and canreservefromotherbranches were not consulted during the item holdability check. To test: [1] Have IndependentBranches ON and canreservefromotherbranches OFF. Make sure that the circulation rules are set up to permit patrons to place hold requests in general. [2] In the OPAC, log in as a patron from library A, and try placing a hold on an item from library B. The patron will be able to place the request. [3] Cancel the request. [4] Apply the patch. [5] Try placing the same hold request. This time, the request should be forbidden. [6] Turn on canreservefromotherbranches. [7] Try placing the hold request. This time, it should go through. [8] Cancel the request. [9] Turn off IndependentBranches. [10] Try placing the hold request and verify that it is permitted. [10] Signed-off-by: Srdjan Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 2cbc47a871efc60ae663ecfedf59ec77dda718f4) Signed-off-by: Tomas Cohen Arazi Works as expected. Note: on my tests i first forgot to enable AllowOnShelfHolds to get this working. It is not mentioned on the test description. commit 3d05ea27a7237006d1256df9b476f4886b027233 Author: Galen Charlton Date: Fri Aug 9 17:40:54 2013 +0000 bug 2394: regression test for canreservefromotherbranches If IndependentBranches is ON and canreservefromotherbranches is OFF, a patron is not permittedo to request an item whose homebranch (i.e., owner of the item) is different from the patron's own library. However, if canreservefromotherbranches is turned ON, the patron can create such hold requests. Note that canreservefromotherbranches has no effect if IndependentBranches is OFF. To test, run prove -v t/db_dependent/Holds.t. Without the bugfix patch for bug 2394, the last two tests should fail. Signed-off-by: Galen Charlton (cherry picked from commit 23e302071efabd824f0a6c69bc68dee4cfc13e5b) Signed-off-by: Tomas Cohen Arazi The Holds.t file was introduced by 9394 which refactors several lines of code and thus i'm not cherry-picking in the stable branch. I'm just cherry-picking Galen's regression tests. ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 17 ++++++- t/db_dependent/Holds.t | 103 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 3 deletions(-) create mode 100755 t/db_dependent/Holds.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 10 19:17:26 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Sep 2013 17:17:26 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-10-ga400e3c Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via a400e3c37e4b84da52fc5bc8371a0048f99cfa17 (commit) via 475bb4e6bf79a21fed261e91ed466950374636ec (commit) from 91211febd5606e4c3713f235817ec0f4a46128c9 (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 a400e3c37e4b84da52fc5bc8371a0048f99cfa17 Author: Kyle M Hall Date: Mon Jul 22 08:32:39 2013 -0400 Bug 10511: (follow-up) jQuery .removeAttr() has only one parameter Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 7d6edc6f182009726e9675ae832385f37e16c4e0) Signed-off-by: Tomas Cohen Arazi commit 475bb4e6bf79a21fed261e91ed466950374636ec Author: Kyle M Hall Date: Wed Jun 26 16:40:09 2013 -0400 Bug 10511: fix message preference form glitch concerning phone notifications An error in the onclick for phone notices causes the "Do not notify" checkbox to be checked when the phone checkbox is checked. Also, checking "Do not notify" does not uncheck the phone checkbox. Test plan: 1) Enable TalkingTechItivaPhoneNotification 2) Browse to the new patron screen ( memberentry.pl ) 3) In the patron messaging preferences check the Phone checkbox 4) Not the "do not notify" checkbox is then checked 5) Uncheck the "do not notify" checkbox, and check the Email checkbox as well 6) Now check the "do not notify" checkbox, note the Phone checkbox remains checked 7) Apply this patch 8) Repeat steps 3-6, noting the odd behavior is no longer present Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit e608f4d48c09e025fc10d47668bb40c0d3d686a7) Signed-off-by: Tomas Cohen Arazi Works as expected. EnhancedMessagingPreferences needs to be set to reproduce. ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/messaging-preference-form.inc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Sep 10 21:11:35 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 10 Sep 2013 19:11:35 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-13-gdf428a4 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via df428a49e5c8b9106771d308bd1c1dea62d64429 (commit) via 2f4839c3ff22edab560b15e6bafa1a308a32c6a6 (commit) via d9e157347a076ef693ecf4f70df8167a77700098 (commit) from a400e3c37e4b84da52fc5bc8371a0048f99cfa17 (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 df428a49e5c8b9106771d308bd1c1dea62d64429 Author: Fridolyn SOMERS Date: Mon Jun 17 17:01:33 2013 +0200 Bug 10483: fix item uniqueness check on order form When syspref "UniqueItemFields" is defined, the item uniqueness is tested in acquisition by an AJAX call to check_uniqueness.pl. This patch fixes an issue where check_uniqueness.pl wasn't looking at the correct CGI parameters. Test plan : - Select an existing item with barcode - Add "barcode" to "UniqueItemFields" syspref (use space as separator for multiple values) - Set "AcqCreateItem" syspref to "Create an item when placing an order" - Go to an acquisition basket - Create a new order from empty - Enter existing barcode in item form and save => You get an alert that barcode already exists and order is not saved - Enter a non-existing barcode in item form and save => Order and item are created Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 1c9135262b9233f59fd05e34c90980e7dc8be338) Signed-off-by: Tomas Cohen Arazi commit 2f4839c3ff22edab560b15e6bafa1a308a32c6a6 Author: Janusz Kaczmarek Date: Mon Apr 22 20:28:08 2013 +0300 Bug 5262: make authority plugin copy indicators to bib record With this patch Koha should correctly copy indicators (and create $2 subfield in MARC 21 if need) from the chosen authority record to the edited bibliographic record (according to discussion in bugzilla). UNIMARC and MARC 21 flavors are covered. Signed-off-by: Bernardo Gonzalez Kriegel Comment: work as described, testing in comments 9 and 12. No errors. Signed-off-by: Katrin Fischer Passes QA script and tests. Tested functionality repeating some of the tests noted by Bernardo - checking mostly 1xx, 490, and 7xx. Signed-off-by: Galen Charlton (cherry picked from commit 129c974fdde0dc62e568f7aa01c4a0796ae150ae) Signed-off-by: Tomas Cohen Arazi commit d9e157347a076ef693ecf4f70df8167a77700098 Author: Owen Leonard Date: Mon Aug 12 08:36:09 2013 -0400 Bug 10614 - have add order form at top and bottom If a basket has a lot of items it may be inconvenient to scroll to the bottom of the patch to reach the "add to basket" form. This patch adds as "Add to basket" button to the toolbar which uses JavaScript to copy the form into a modal dialog for quick access. To test, apply the patch and view an open basket. You should be able to click the "Add to basket" button to trigger a modal dialog with the full "Add to basket" list of options. All options in the list should function normally. If you view a closed basket the new button should not appear. Signed-off-by: Nicole C. Engard All tests pass and I love it :) Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit fe193210815b33efbefbf518ccc13329f20eeefc) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: acqui/check_uniqueness.pl | 4 +- authorities/blinddetail-biblio-search.pl | 43 ++++++++++++++++++++ .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 15 +++++++ .../authorities/blinddetail-biblio-search.tt | 3 + 4 files changed, 63 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 11 18:29:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 11 Sep 2013 16:29:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-15-gf21d182 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via f21d18254f636d882563f0c56dd84ebe48c9398f (commit) via b420990a85f0fbbd5f5df5cf409a9f233a50e698 (commit) from df428a49e5c8b9106771d308bd1c1dea62d64429 (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 f21d18254f636d882563f0c56dd84ebe48c9398f Author: Srikanth Dhondi Date: Tue Oct 30 11:17:52 2012 +1300 Bug 8712: add 'and' label for inputs in OPAC "fewer options" advanced search page The "and" label not only improves the accessibility but also gives the user an idea that the operation between multiple search fields is a boolean "AND" by default. Signed-off-by: Marcel de Rooy Actually only adds a label and an id to the select. Note that the boxes do not exactly align anymore now (with fewer options). Signed-off-by: Galen Charlton (cherry picked from commit 98bd9de54aa7cab6fe3dec8e7cd88378a06e8684) Signed-off-by: Tomas Cohen Arazi commit b420990a85f0fbbd5f5df5cf409a9f233a50e698 Author: Srikanth Dhondi Date: Mon Oct 29 13:57:09 2012 +1300 Bug 8712: change "New list" to "Create new list" in OPAC masthead This makes it clear for screen reader users. Signed-off-by: Marcel de Rooy Note that you should delete all your private lists to see this change. Signed-off-by: Galen Charlton (cherry picked from commit f0280dabe0db3e27e0e56a025a61bd41f206de57) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +- .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 11 19:03:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 11 Sep 2013 17:03:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-20-gd7bd725 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via d7bd725fb1309813b89190b73556e0cb0ba7c4b4 (commit) via 2ba6d6636b6e6eeab554e6793074899fa40be5c8 (commit) via 801f9fbdae6ef2158d4a555d3e3bf1a77c33edfd (commit) via 6f55deac4a976b59edd13632e11f70cbfbd22642 (commit) via 8a407d8d02463cd15423735dc6030da2c8f5e3a7 (commit) from f21d18254f636d882563f0c56dd84ebe48c9398f (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 d7bd725fb1309813b89190b73556e0cb0ba7c4b4 Author: Jonathan Druart Date: Tue Aug 13 12:25:35 2013 +0200 Bug 10716: fix JavaScript error on basket groups page To test: Go on acqui/basketgroup.tt and verify a js error occurred (ReferenceError: CONFIG_EXCLUDE_ARTICLES_FROM_SORT is not defined). Apply the patch and verify the error does not appear anymore. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit a4d8144efdcbbf30d649264495f151e8b6fd7594) Signed-off-by: Tomas Cohen Arazi commit 2ba6d6636b6e6eeab554e6793074899fa40be5c8 Author: Nicole C. Engard Date: Thu Aug 8 09:01:23 2013 -0400 Bug 10703: Document borrower_files table Add db documentation to borrower_files table. To test: apply review kohastructure.sql to be sure documentation is there Signed-off-by: Bernardo Gonzalez Kriegel Comment: No errors. Tested loading on new database. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 09e802c7933073cd98040155b02898ab79739b3a) Signed-off-by: Tomas Cohen Arazi commit 801f9fbdae6ef2158d4a555d3e3bf1a77c33edfd Author: Nicole C. Engard Date: Thu Aug 8 08:53:58 2013 -0400 Bug 10703: Document quotes table Add db documentation for the quotes table To test: apply patch review kohastructure.sql to be sure documentation is there Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 6823c745371a115d5bec98beb9d10b59e188c9fe) Signed-off-by: Tomas Cohen Arazi commit 6f55deac4a976b59edd13632e11f70cbfbd22642 Author: Nicole C. Engard Date: Thu Aug 8 08:49:25 2013 -0400 Bug 10703: Add db documentation for biblioimages table This patch adds db documentation to the biblioimages table. To test: Apply patch Review kohastructure.sql to be sure that the documentation is there Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 801d8237d80d7079f3355da18ef18c60b7f37325) Signed-off-by: Tomas Cohen Arazi commit 8a407d8d02463cd15423735dc6030da2c8f5e3a7 Author: David Cook Date: Tue Aug 13 12:16:28 2013 +1000 Bug 10715 - MARC21 007 Plugin Editor doesn't load position 01 This patch changes the MARC21 007 plugin editor so that it uses 1 character instead of 4 characters for position 01. TEST PLAN: 1) Create new record/edit an existing record 2) Using the tag editor for the 007 field, choose "Videorecording" 3) Click OK 4) Change the second character in the 007 from "c" to "d" 5) Open the tag editor again 6) Note that position 01 will still say "c - Videocartridge" rather than "d - Videodisc". 7) Exit tag editor 8) Apply patch 9) Reload the page (Shift + Refresh is always useful) 10) Open the tag editor again 11) Note that position 01 will now say "d - Videodisc" Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 73ac970f734b0f04fff5561aa35bb9d9d47aa943) Signed-off-by: Tomas Cohen Arazi Fix worked as expected. ----------------------------------------------------------------------- Summary of changes: cataloguing/value_builder/marc21_field_007.pl | 2 +- installer/data/mysql/kohastructure.sql | 38 ++++++++++---------- .../prog/en/modules/acqui/basketgroup.tt | 1 + 3 files changed, 21 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Sep 11 19:39:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 11 Sep 2013 17:39:06 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-28-g0311e39 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 0311e39c269291156f82393fbb7269caab7b679e (commit) via a4dbe6821d167908792a7665c492d0e2976aaa0a (commit) via 10ce9281d7eb63276511e05879af88d807495785 (commit) via 800e1fc6d059b59a6aa0f5f0353c64ea1b606560 (commit) via eb0373c7eb6d1f0cb52155709c18e06c09ab55df (commit) via 5fde0910787f9c36caedfc12bc5af6dfedc7df36 (commit) via af6c169f2a68296d99ad7f6908e441ababb79c98 (commit) via 98397ed4b10b03fb0b00e9550b571c3cc47407dc (commit) from d7bd725fb1309813b89190b73556e0cb0ba7c4b4 (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 0311e39c269291156f82393fbb7269caab7b679e Author: root Date: Thu Jul 25 13:47:09 2013 +0200 Bug 10642: fix inappropriate uses of $sth->finish() in C4::RotatingCollections.pm From the man page finish() Indicate that no more data will be fetched from this statement handle before it is either executed again or destroyed. You almost certainly do not need to call this method. Adding calls to "finish" after loop that fetches all rows is a common mistake, don't do it, it can mask genuine problems like uncaught fetch errors. To test: Verify that prove -v t/db_dependent/RotatingCollections.t passes Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Passes koha-qa.pl, passes UT provided by bug 10653 Signed-off-by: Galen Charlton (cherry picked from commit d1b3e4ab6b432844e076e1eb0662a9c04a5f412e) Signed-off-by: Tomas Cohen Arazi commit a4dbe6821d167908792a7665c492d0e2976aaa0a Author: Marc Veron Date: Sun Oct 7 19:54:44 2012 +0200 Bug 8887: only display desired result when doing exact syspref search This patch fixes an issue where entering the complete name of a system preference when doing a syspref search in the staff interface resulted in the display of *all* preferences belonging to the desired one's module. Since providing a more specific search string should result in getting back more specific results, the previous behavior was not intuitive. Test scenario: a) In sysprefs, do a search with partial match (e.g. intranetcolor) -> Result shows one entry: intranetcolorstylesheet b) Do an exact search. e.g. intranetcolorstylesheet -> Result shows all Staff Client preferences Apply patch, test again. Now b) behaves like a). Signed-off-by: Mirko Tietgen Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Passes koha-qa.pl, works as advertised. Signed-off-by: Galen Charlton (cherry picked from commit 9bc53a0fccc3b673dca43791ebfcb53fd6e0a9ee) Signed-off-by: Tomas Cohen Arazi commit 10ce9281d7eb63276511e05879af88d807495785 Author: Owen Leonard Date: Tue Aug 13 10:05:58 2013 -0400 Bug 9238 - make fund pull down say 'select fund', not 'select budget' When adding a new order to a basket the fund selection field is labeled "Fund:" but the default option is "Select a budget." This patch changes this string to "Select a fund" and also corrects the associated JavaScript error message text displayed when one doesn't choose a fund. To test, add an order to basket. The "New order" form should show "Select a fund" as the default option for "Fund" in the "Accounting details" section. If you submit the form without selecting a fund the error message should read "You must select a fund." Signed-off-by: Nicole C. Engard tests pass Signed-off-by: Kyle M Hall String updates only, passes koha-qa.pl Signed-off-by: Galen Charlton (cherry picked from commit dbe233a0e5d86975c28918d8b7023b70bdd29d38) Signed-off-by: Tomas Cohen Arazi commit 800e1fc6d059b59a6aa0f5f0353c64ea1b606560 Author: Galen Charlton Date: Fri Aug 16 16:09:13 2013 +0000 Bug 10653: (follow-up) minor tweaks to RotatingCollections tests - remove unnecessary module import - use parentheses for all C4 function calls Signed-off-by: Galen Charlton (cherry picked from commit 40aa42f31f10acad92da5f2c57319f049fba9289) Signed-off-by: Tomas Cohen Arazi commit eb0373c7eb6d1f0cb52155709c18e06c09ab55df Author: Kenza Zaki Date: Tue Jul 30 13:43:19 2013 +0200 Bug 10653: add unit tests for C4::RotatingCollections.pm The tests are wrap in a database transaction. Test plan: prove t/db_dependent/RotatingCollections.t t/db_dependent/RotatingCollections.t .. ok All tests successful. Files=1, Tests=41, 20 wallclock secs ( 0.02 usr 0.01 sys + 0.41 cusr 0.02 csys = 0.46 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 12061f44beb46709e03d09f7ff61551fa9297b2e) Signed-off-by: Tomas Cohen Arazi commit 5fde0910787f9c36caedfc12bc5af6dfedc7df36 Author: Galen Charlton Date: Fri Aug 16 15:00:35 2013 +0000 Bug 10481: (follow-up) fix typo in POD Signed-off-by: Galen Charlton (cherry picked from commit 1e84b1217afc74f490423538b7b8808e3d34513a) Signed-off-by: Tomas Cohen Arazi commit af6c169f2a68296d99ad7f6908e441ababb79c98 Author: Jonathan Druart Date: Thu Jul 11 11:45:06 2013 +0200 Bug 10481: Unit tests for C4::Members::AddEnrolmentFeeIfNeeded prove t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t .. ok All tests successful. Files=1, Tests=3, 0 wallclock secs ( 0.02 usr 0.00 sys + 0.38 cusr 0.01 csys = 0.41 CPU) Result: PASS Signed-off-by: Srdjan Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 1c8efaf3f9b14caf5f6512149d5fcd957bd3e487) Signed-off-by: Tomas Cohen Arazi commit 98397ed4b10b03fb0b00e9550b571c3cc47407dc Author: Jonathan Druart Date: Mon Jun 17 14:56:22 2013 +0200 Bug 10481: FIX No enrollment fee when changing patron category. When a patron changes to a category with enrollment fee, they are not generated. Test plan: - Choose a category without fee (e.g. Kid) - Add an enrollment fee for another category (e.g. Young adult) - Choose a kid and change his category to "Young adult". - Note the warning message "Fees & Charges: Patron has Outstanding fees & charges of XX" on the check out page. This patch also moves all instances of adding the enrollment fee to a new routine in C4::Members, AddEnrolmentFeeIfNeeded(), so additional tests include: - Register a new patron and give it a category that has an enrollment fee. Verify that the fee is charged. - Renew the patron. Verify that the additional fee is charged. - Register a new patron with a child patron category. - Use the 'update child to adult' menu option to change the patron's category to one that is fee-bearing. Verify that the enrollment fee was charged. Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit f8eb19163bd4e59e99b6dae90a5712b6a7be52f6) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 65 +++-- C4/RotatingCollections.pm | 18 -- admin/preferences.pl | 10 +- .../prog/en/modules/acqui/neworderempty.tt | 6 +- t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t | 56 ++++ t/db_dependent/RotatingCollections.t | 307 ++++++++++++++++++++ 6 files changed, 412 insertions(+), 50 deletions(-) create mode 100644 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t create mode 100644 t/db_dependent/RotatingCollections.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Sep 12 20:54:57 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 12 Sep 2013 18:54:57 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-29-ga85f9e1 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via a85f9e1928a89e5c8f01983f1b853b090ec8cd1e (commit) from 0311e39c269291156f82393fbb7269caab7b679e (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 a85f9e1928a89e5c8f01983f1b853b090ec8cd1e Author: Jared Camins-Esakov Date: Mon Aug 5 20:56:48 2013 -0400 Bug 10686: Remove fields from searches for highlighting If you do a fielded search like au:smith, "Smith" will not get highlighted on the results page because the Javascript is looking for the exact string "au:smith." To test: 1) Turn on OpacHighlightedWords. 2) Do a simple keyword search. 3) Confirm that the word is highlighted on the results and details page. 4) Do a fielded search by entering au:smith (or whatever). 5) Confirm that the word is highlighted on the results and details page. 6) Sign off. Signed-off-by: Mirko Tietgen Signed-off-by: Kyle M Hall Passes koha-qa.pl, works as advertised. Signed-off-by: Galen Charlton (cherry picked from commit b0ea3be36c8e7ae6dc6f28820b1c26fc909d9039) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 1 + .../prog/en/modules/opac-results-grouped.tt | 1 + .../opac-tmpl/prog/en/modules/opac-results.tt | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 13 16:19:15 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Sep 2013 14:19:15 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-42-g66b2148 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 66b214899fe6624a023ee16e3e920414f27abb8a (commit) via a55080c88593b5e0e0d3d8192ee9c7f09e78d258 (commit) via 3ca258cd4aeba3b8bcb86dbdb28b55657e1c1e46 (commit) via a011492c7e5cdc3c0ef9db1ca1c415ec078e1f6c (commit) via 624af4b7f11a4ff8bccf3252e72880cec9c22b1b (commit) via d97742d0a6426bfb6a880b998ad57278a4ac0b3f (commit) via 885e928aaeddca5adc24061b615a0388d1c8e828 (commit) via 3cd7313007061c0e644d0daf37cf79739c342717 (commit) via 70681a47f2cefcdee665d4d8076f3228eee891de (commit) via f0203f9e9cc985e6b4eb9fb8d2f99d65d3337973 (commit) via 25c84440cd1123a0f454d4a7ebb33da4634d76a3 (commit) via 5d3f5023019f0d09688ebb44d35259fd2ec9990a (commit) via 27f96f606c90f85756b290e1a832377f5465bf40 (commit) from a85f9e1928a89e5c8f01983f1b853b090ec8cd1e (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 66b214899fe6624a023ee16e3e920414f27abb8a Author: Owen Leonard Date: Mon Aug 19 10:55:52 2013 -0400 Bug 8670 - Update POD of C4::Branch::GetBranches() to use TT syntax This patch updates the example template syntax in the POD for C4::Branch::GetBranches() to use Template Toolkit syntax. To test, view the POD for C4::Branch::GetBranches() and confirm that it looks correct. Signed-off-by: Magnus Enger Checked the POD with "perldoc C4/Branch.pm" before and after applying the patch. The example now uses TT syntax, and looks sensible. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 7ae3ea68579b3f870d7e42968c3727ecffac7f02) Signed-off-by: Tomas Cohen Arazi commit a55080c88593b5e0e0d3d8192ee9c7f09e78d258 Author: Owen Leonard Date: Mon Aug 19 11:16:51 2013 -0400 Bug 10763 - [SIGNED-OFF] Update POD of C4::Creators::Lib::html_table() to use TT syntax This patch updates the example template syntax in the POD for C4::Creators::Lib::html_table() to use Template Toolkit syntax. To test, view the POD for C4::Creators::Lib::html_table() and confirm that it looks correct. Signed-off-by: Magnus Enger Checked the POD with "perldoc C4/Creators/Lib.pm" before and after applying the patch. The example now uses TT syntax, and looks sensible. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 54c6dccca70a142c14fff049cb3212694af86610) Signed-off-by: Tomas Cohen Arazi commit 3ca258cd4aeba3b8bcb86dbdb28b55657e1c1e46 Author: Owen Leonard Date: Mon Aug 19 11:37:55 2013 -0400 Bug 10764 - Update POD of C4::Items::GetItemStatus() to use TT syntax This patch updates the example template syntax in the POD for C4::Items::GetItemStatus() to use Template Toolkit syntax. To test, view the POD for C4::Items::GetItemStatus() and confirm that it looks correct. Signed-off-by: Magnus Enger This patch works as advertised (verified with "perldoc C4::Items"), for GetItemStatus, but it does not fix a a similar example for GetItemLocation in the same file, which still has the old template syntax. So a followup or separate bug for that is called for. Signed-off-by: Jonathan Druart It seems the default option is not in used in templates. Signed-off-by: Galen Charlton (cherry picked from commit d515457c719197e66bd0a10c7011b407af2faa23) Signed-off-by: Tomas Cohen Arazi commit a011492c7e5cdc3c0ef9db1ca1c415ec078e1f6c Author: Owen Leonard Date: Mon Aug 19 12:06:31 2013 -0400 Bug 10765 - [SIGNED-OFF] Update POD of C4::Koha::GetSupportList() to use TT syntax This patch updates the example template syntax in the POD for C4::Koha::GetSupportList() to use Template Toolkit syntax. To test, view the POD for C4::Koha::GetSupportList() and confirm that it looks correct. Signed-off-by: Magnus Enger This patch works as advertised (verified with "perldoc C4::Koha"), for GetSupportList, but it does not fix a a similar example for GetItemTypes, getauthtypes and getframework in the same file, which still has the old template syntax. So a followup or separate bug(s) for those are called for. Signed-off-by: Jonathan Druart It seems the default option is not in used in templates. Signed-off-by: Galen Charlton (cherry picked from commit 3429e5e16da0b23615fac4ca0bb6251fac70301c) Signed-off-by: Tomas Cohen Arazi commit 624af4b7f11a4ff8bccf3252e72880cec9c22b1b Author: Owen Leonard Date: Tue Aug 13 12:27:28 2013 -0400 Bug 10081: add library name to IndependentBranches error message With IndependentBranches turned on, if you try to check out an item which belongs to another library you will get an error message which is missing the library name. This patch corrects the problem by passing the necessary variable to the template and outputting the library name using the KohaBranchName TT plugin. To test, turn on IndependentBranches and try to check out an item belonging to another library (note that you must test with a staff user who is not a superlibrarian). The error message you see should include the name of the library to which the item belongs: "This item belongs to Nelsonville and cannot be checked out from this location." Checkouts of items belonging to the library should be unaffected. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 50ff4f4a94598ce197c0ca5656d314195cf69d07) Signed-off-by: Tomas Cohen Arazi commit d97742d0a6426bfb6a880b998ad57278a4ac0b3f Author: Owen Leonard Date: Thu Aug 8 15:37:35 2013 -0400 Bug 10701: fix display of transit status on the bibliographic detail page The patch for Bug 10083 incorrectly changed some template variable names so that in-transit details could not be shown on the biblio detail page. This patch corrects the error. To test, perform any action that will trigger an transfer between libraries (for instance, check in an item from Library A at Library B). View the detail page for that title and look for the transfer details in the status column of the holdings table. It should show correct information: "In transit from Athens to Nelsonville since 08/08/2013" Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described, no errors. Before patch incorrect information: "In transit from to since" after patch correct information. Signed-off-by: Katrin Fischer Works perfectly and passes all tests. Signed-off-by: Galen Charlton (cherry picked from commit 0a6e9c48c5c63e17318f4c8e5c7f0400bab0c363) Signed-off-by: Tomas Cohen Arazi commit 885e928aaeddca5adc24061b615a0388d1c8e828 Author: Jonathan Field Date: Fri Aug 9 11:38:31 2013 +0100 Bug 10704: make OPAC highlighting work across previous/next travel To test Enable 'OpacHighlightedWords' 1) Run a search with multiple results 2) Click on a title of one of the results to get the full record display. Hit highlighting SHOULD work on this page. 3) Use either the "Next" or "Previous" buttons on this page (opac-detail) to move to the next or previous record. 4) Moving forward or back, the highlighting should still be working on the page. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 7d0aea7c39e22f42760c3ecbba4c0cd0818785a7) Signed-off-by: Tomas Cohen Arazi commit 3cd7313007061c0e644d0daf37cf79739c342717 Author: Galen Charlton Date: Wed Aug 14 14:53:25 2013 +0000 bug 10728: fix additional log noise generated by subscription-renew.pl To test: [1] Use the renew link to bring up the subscription renewal form. [2] Verify that a warning message containing the text 'Problem = a value of 1 has been passed to param without key' was not added to the Apache error log. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 6e864430caaa951b06d5fecff3fe7864317e5e26) Signed-off-by: Tomas Cohen Arazi commit 70681a47f2cefcdee665d4d8076f3228eee891de Author: Colin Campbell Date: Wed Aug 14 15:26:34 2013 +0100 Bug 10728: fix log noise generated by subscription-renew.pl Error log is showing warnings because mode is undefined and we are doing string comparisons on it. Set it to a default value (we were already assigning it a variable which we were not using) and use the the result in the comparison To test, after applying the patch: [1] Use the renew link from the subscription detail page to renew a subscription. [2] Verifying that doing this did not add a warning containing 'subscription-renew.pl: Use of uninitialized value $mode in string eq ' to the Apache error log. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 27edb618dd604e0a718f43e98ed97255f72eb515) Signed-off-by: Tomas Cohen Arazi commit f0203f9e9cc985e6b4eb9fb8d2f99d65d3337973 Author: Galen Charlton Date: Sat Aug 17 16:04:34 2013 +0000 Bug 10573: (follow-up) update license and copyright statement Signed-off-by: Galen Charlton (cherry picked from commit 971449866fc23ff9c0c083754e4dd9c53d8d4cdc) Signed-off-by: Tomas Cohen Arazi commit 25c84440cd1123a0f454d4a7ebb33da4634d76a3 Author: Bernardo Gonzalez Kriegel Date: Thu Aug 8 15:54:22 2013 -0300 Bug 10573: (followup) French translation for printing a basketgroup small followup to fix tabs Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit a9cd81e6858dda89d95625520108fa0b269ff770) Signed-off-by: Tomas Cohen Arazi commit 5d3f5023019f0d09688ebb44d35259fd2ec9990a Author: Christophe Croullebois Date: Wed Jul 10 16:57:12 2013 +0200 Bug 10573: French translation for printing a basketgroup If you want to print a basketgroup with pdf format, it will be in English. The pdf is done with layout2pages.pm or layout3pages.pm, which call layout2pages.pdf or layout3pages.pdf. This patch adds layout3pagesfr.pm in src/acqui/pdfformat/ which calls layout3pagesfr.pdf. And adds in basketgroup.pl the check for layout3pagesfr To use it you have to change the systempreferences to pdfformat::layout3pagesfr Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described, koha-qa reports some tab errors. Corrected in a followup. Please, always add a test plan, it's easier to test. Test: 1) apply the patch 2) change syspref OrderPdfFormat to pdfformat::layout3pagesfr 3) select a vendor 4) create a basket group (empty works) 5) close basket group 6) print basket group 7) PDF is in french Signed-off-by: Katrin Fischer This works nicely, although it would be better if we could find a more general solution to make the templates editable and translatable. Signed-off-by: Galen Charlton (cherry picked from commit a7fe13a52f320e6aded1f3313f721bd7fd73fb52) Signed-off-by: Tomas Cohen Arazi I don't like the approach, but I wouldn't hold this one until a proper solution comes up. commit 27f96f606c90f85756b290e1a832377f5465bf40 Author: Jonathan Druart Date: Thu Apr 11 12:00:45 2013 +0200 Bug 10028: fix how ModReceiveOrder() calls NewOrder() In C4::Acquisition::ModReceiveOrder, a call to NewOrder is badly used. NewOrder returns ($basketno, $ordernumber) but in ModReceiveOrder the ordernumber is got with my $ordernumber = NewOrder( $args ); It works because: sub t{ return ("a", "b"); } my $a = t(); say $a; Will display 'b'. But it is not really clear. Test plan: Check that there is no regression for partial receives. Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 29689de399a8927547c36e53461c7766ecc604f0) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 +- C4/Branch.pm | 14 +++-- C4/Circulation.pm | 6 +- C4/Creators/Lib.pm | 46 +++++++------- C4/Items.pm | 16 +++-- C4/Koha.pm | 20 +++--- acqui/basketgroup.pl | 2 +- .../{layout3pages.pm => layout3pagesfr.pm} | 65 ++++++++++---------- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 3 +- .../intranet-tmpl/prog/pdf/layout3pagesfr.odt | Bin 0 -> 13284 bytes .../intranet-tmpl/prog/pdf/layout3pagesfr.pdf | Bin 0 -> 24394 bytes opac/opac-detail.pl | 4 +- serials/subscription-renew.pl | 6 +- 14 files changed, 98 insertions(+), 89 deletions(-) copy acqui/pdfformat/{layout3pages.pm => layout3pagesfr.pm} (93%) create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.odt create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pagesfr.pdf hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 13 17:46:25 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Sep 2013 15:46:25 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-51-gb64c925 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via b64c9255fc14a8b812585990ad3bad2e726365c7 (commit) via 16584258f9a3e3a99065b2aeb3ed4a631b13a04e (commit) via e28f2f5ff680e8486fb70e4197c1f8c91d564249 (commit) via 0de2e0b55876fa6de5efb981972c064c7aa5a75e (commit) via 7daec54dc80f2d1f7c3ea8b55416e18082c8f3fb (commit) via 65e0bbb2632611e8d9bd082aa882e7908350b9ee (commit) via e143ff307286698575a41e943202c902f1493071 (commit) via 4de32c9586e4615079cf3d0de801df2d38eb3f6c (commit) via 7c7aee054fa8af8e753d7f9391a27efb83f9b52c (commit) from 66b214899fe6624a023ee16e3e920414f27abb8a (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 b64c9255fc14a8b812585990ad3bad2e726365c7 Author: Jared Camins-Esakov Date: Mon Aug 5 20:33:27 2013 -0400 Bug 9820 follow-up: fix a typo Although the XSLT template was renamed to nameABCQ, one instance of the old name (nameABCDQ) was not corrected. This patch corrects that. To test: Follow test plan on previous patch Signed-off-by: Jared Camins-Esakov Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit 1e1ccd68aa0642167c2578d167ff3ec343df3a78) Signed-off-by: Tomas Cohen Arazi commit 16584258f9a3e3a99065b2aeb3ed4a631b13a04e Author: Galen Charlton Date: Fri Mar 15 14:17:09 2013 -0700 Bug 9820: display titles in MARC21 name headings better in XSLT mode Prior to this patch, if a 100/700 had a $c, it would be displayed with no space between the contents of $a and $c in XSLT mode. For example, 100 1#$aSeuss,$cDr. would be displayed as SeussDr The problem was caused by the original version of the stylesheets drawing a bit too much from the MARC21 to MODS transformation. To test: [1] In a MARC21 database, turn on XSLT display mode for staff and OPAC. [2] Create or identify a bib that has a 100 or 700 field with both a $a and a $c. [3] Before applying the patch, verify that the name is displayed in bib details and search results with the name and title squashed together. For example, "SeussDr" [3] After applying the patch, verify that the name displays in bib details and search results with a space and intervening punctuation between the name and the title. For example, "Seuss, Dr." Signed-off-by: Galen Charlton Signed-off-by: Jared Camins-Esakov Signed-off-by: Katrin Fischer Passes test plan, works nicely. Signed-off-by: Galen Charlton (cherry picked from commit 75959da681ae5f78e70dfd7205a22d16fd28ae38) Signed-off-by: Tomas Cohen Arazi commit e28f2f5ff680e8486fb70e4197c1f8c91d564249 Author: Tomas Cohen Arazi Date: Thu Jul 25 16:08:43 2013 -0300 Bug 10645: adding missing zebra languages to koha-create manpage There were some missing zebra language options in the man page for koha-create. Trivial string change. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Tested using the following commands: $ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \ debian/docs/koha-list.xml $ man -l koha-list.8 Also: prove -v xt/verify-debian-docbook.t Signed-off-by: Galen Charlton (cherry picked from commit 90cf2f3a265a741bc4d475077dc3a604a08e6192) Signed-off-by: Tomas Cohen Arazi commit 0de2e0b55876fa6de5efb981972c064c7aa5a75e Author: Galen Charlton Date: Mon Aug 19 18:22:00 2013 +0000 Bug 10766: unbreak reservoir search when UseQueryParser is OFF To test: [1] Turn UseQueryParser off. [2] Ensure that your database has records in the reservoir. Performing a Z39.50 search will do this. [3] Perform a broad cataloging (i.e., cataloguing/addbooks.pl search). Note that results are returned from the main catalog but that no reservoir results are returned. [4] Apply the patch. [5] Perform the search again. This time, there should be both catalog and reservoir results. [7] Enable QueryParser. Perform the search again, and verify that the catalog and reservoir results are the same. Signed-off-by: Galen Charlton Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Patch works nicely, passes all tests, and the QA script. Signed-off-by: Galen Charlton (cherry picked from commit 4309e5e6b4682b95db4ca26f7a49f96c2f6c2875) Signed-off-by: Tomas Cohen Arazi commit 7daec54dc80f2d1f7c3ea8b55416e18082c8f3fb Author: Galen Charlton Date: Fri Aug 23 15:58:01 2013 +0000 Bug 10741: (follow-up) add regression test Signed-off-by: Galen Charlton (cherry picked from commit 8e7379342d7cd8386baf884a77f54f95188bb85c) Signed-off-by: Tomas Cohen Arazi commit 65e0bbb2632611e8d9bd082aa882e7908350b9ee Author: Fridolyn SOMERS Date: Fri Aug 16 13:53:04 2013 +0200 Bug 10741: reformat test for displaying place hold link in OPAC search results To test: [1] Turn on the syspref for enabling OPAC holds. [2] Create an item and bring it up on the OPAC search results. Run through the following possibilities, by changing the item, and verify that the place hold link in OPAC search results appears only when the item is - not lost AND - not withdrawn AND - not damaged (or is damged and AllowHoldsOnDamagedItems is ON) AND - the item is not marked not-for-loan OR the item has a negative notforloan value (e.g., it is on order) Note that it is necessary to reindex the test bib after making each change to the test item. [3] Also verify that whether or not in the item is in transit does NOT affect whether the place hold link appears. [4] Verify that there is no regression on bug 8975 (i.e., if an item is on order, that status should be displayed in staff client search results). Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 397ba93f97855625865689ef0dd0c69a20c8a915) Signed-off-by: Tomas Cohen Arazi commit e143ff307286698575a41e943202c902f1493071 Author: Fridolyn SOMERS Date: Fri Aug 16 13:36:10 2013 +0200 Bug 10741: restore holdability of in-transit items on OPAC search results In search results, one could not place a hold on an item in transit and for loan (items.notforloan=0). This appears when AllowOnShelfHolds is allowed. This patch repairs a regression introduced by the patch for bug 8975. Test plan : - Set AllowOnShelfHolds to on - Create a record with a normal item : not lost, not withdrawn, not damaged, notforloan=0 - Index this record - Perform a search on OPAC that returns this record (and others) => You see in actions "Place hold" - Add this item in transit : /cgi-bin/koha/circ/branchtransfers.pl - Re-perform the search on OPAC => You see in actions "Place hold" and item "in transit" Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 239513dc7a13a1a31356b59ab8e36b120c0fa281) Signed-off-by: Tomas Cohen Arazi commit 4de32c9586e4615079cf3d0de801df2d38eb3f6c Author: Nicole C. Engard Date: Thu Aug 15 22:08:41 2013 -0400 Bug 10743: Add styles to 'my privacy' page in OPAC This patch does a couple things. Most importantly it adds a new div around the privacy rules summary so that it can be easily changed. It also moves the start of the form to right above the form's select box so that it's not in the new privacy rules div. To test: * Apply patch * Enable the use of privacy via the sys prefs * Log in to the OPAC * Visit the 'my privacy' tab * Make sure it looks okay * Submit the form and make sure it works * Repeat in the other theme Signed-off-by: Owen Leonard Edit: Replaced a few tabs with spaces to keep the QA script happy. Signed-off-by: Katrin Fischer Works nicely, privacy options can still be edited. Signed-off-by: Galen Charlton (cherry picked from commit 841fe4559f6264295ec4cfde6ddd6e22a151d6bf) Signed-off-by: Tomas Cohen Arazi commit 7c7aee054fa8af8e753d7f9391a27efb83f9b52c Author: Kyle M Hall Date: Tue Jul 23 08:05:22 2013 -0400 Bug 10628: make sure AutomaticItemReturn doesn't prevent holds queue from filling local holds with local items For some reason, C4::HoldsQueue::MapItemsToHoldRequests used the system preference AutomaticItemReturn to decide if an attempt to fill local holds with local items. No explanation of this behavior is provided. This patch removes this behavior, and also adjusts the calculation of the lead-cost library to always return the pickup library if it is on the list of libraries that could fill the hold -- on the basis that if the item is already at the pickup library, its transport cost is inherently zero. Signed-off-by: Srdjan Signed-off-by: Katrin Fischer Passes QA script and adds unit tests. Tested with some examples and those worked correctly. Signed-off-by: Galen Charlton (cherry picked from commit d46657f8af980524a4351e40abe0b901d1af3e6a) Signed-off-by: Tomas Cohen Arazi Small merge problem in the tests. ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 13 +++++--- C4/Search.pm | 28 ++++++++------------ cataloguing/addbooks.pl | 9 ++++-- debian/docs/koha-create.xml | 2 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 18 ++---------- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 19 ++----------- .../opac-tmpl/prog/en/modules/opac-privacy.tt | 7 +++-- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 18 ++---------- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 21 +++------------ t/db_dependent/HoldsQueue.t | 11 +++++--- t/db_dependent/Search.t | 24 ++++++++++++++++- 11 files changed, 73 insertions(+), 97 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 13 19:09:46 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Sep 2013 17:09:46 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-62-g5ff99f6 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 5ff99f63e32212071cc1e71749f93e943f005005 (commit) via afbc6e2e8a62ae2200e53ec61960e6297916dcc0 (commit) via 5f4c95947cc2512ec425bfabbd88d412a2e213f6 (commit) via 1190c1044413f1431d472f34469430434d4e64d7 (commit) via 46144ea08fd15636c65eef4a094c70ae4eeab9fc (commit) via 13936914dad62aa4cfa0c39e90544dec3e53f99b (commit) via 5ddc1f43fb18679fadd80d17bb4a45b2d2a6b87b (commit) via a1c831bf43a563a116e9161b2b9381c9434669da (commit) via 45f9a4a0385967f5e4dfd2ff4b77412353d77a83 (commit) via e647d4e3ed887510db6bf7754bbd37c0401c3999 (commit) via 1ad01972ca995bc938ffe55fd43e7a69e03aca5c (commit) from b64c9255fc14a8b812585990ad3bad2e726365c7 (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 5ff99f63e32212071cc1e71749f93e943f005005 Author: Kenza Zaki Date: Tue Jul 23 15:27:23 2013 +0200 Bug 10629: remove inappropriate uses of $sth->finish() in C4::Branch Test plan : Check if the regression tests still works prove t/db_dependent/Branch.t t/db_dependent/Branch.t .. 1/36 Using a hash as a reference is deprecated at t/db_dependent/Branch.t line 207. t/db_dependent/Branch.t .. ok All tests successful. Files=1, Tests=36, 0 wallclock secs ( 0.03 usr 0.01 sys + 0.12 cusr 0.00 csys = 0.16 CPU) Result: PASS Signed-off-by: Chris Cormack From the man page finsh() Indicate that no more data will be fetched from this statement handle before it is either executed again or destroyed. You almost certainly do not need to call this method. Adding calls to "finish" after loop that fetches all rows is a common mistake, don't do it, it can mask genuine problems like uncaught fetch errors. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit 4287fd9d1c3ae16a0496b6261de44642bc92ab9c) Signed-off-by: Tomas Cohen Arazi commit afbc6e2e8a62ae2200e53ec61960e6297916dcc0 Author: Galen Charlton Date: Wed Aug 28 14:24:34 2013 +0000 Bug 10508: (follow-up) remove Perl 5.14 construct Also added parentheses to bare function calls. Signed-off-by: Galen Charlton (cherry picked from commit 7fa8e92e8e261f822b610da65b28a094e21e452c) Signed-off-by: Tomas Cohen Arazi commit 5f4c95947cc2512ec425bfabbd88d412a2e213f6 Author: Chris Cormack Date: Tue Aug 27 10:29:42 2013 +1200 Bug 10508: (follow-up) fix a typo Signed-off-by: Katrin Fischer Thx for the follow-up Chris! Signed-off-by: Galen Charlton (cherry picked from commit 7a6bd88e497901bd7dc02e1964717da20313c0d8) Signed-off-by: Tomas Cohen Arazi commit 1190c1044413f1431d472f34469430434d4e64d7 Author: Kenza Zaki Date: Tue Jul 2 14:24:08 2013 +0200 Bug 10508: add unit tests for C4::Branch Unit tests are wrap in a transaction. To test: prove t/db_dependent/Branch.t t/db_dependent/Branch.t .. 1/36 Using a hash as a reference is deprecated at t/db_dependent/Branch.t line 207. t/db_dependent/Branch.t .. ok All tests successful. Files=1, Tests=36, 1 wallclock secs ( 0.02 usr 0.02 sys + 0.13 cusr 0.01 csys = 0.18 CPU) Result: PASS http://bugs.koha-community.org/show_bug.cgi?id=10508 Signed-off-by: Srdjan Signed-off-by: Katrin Fischer Passes all tests and QA script. Signed-off-by: Galen Charlton (cherry picked from commit 68bf770f9238d6b05b9383e521969a6782b068d5) Signed-off-by: Tomas Cohen Arazi commit 46144ea08fd15636c65eef4a094c70ae4eeab9fc Author: Magnus Enger Date: Tue Aug 6 16:00:01 2013 +0200 Bug 10690 - Warn about trailing slashes in description of OPACBaseURL and staffClientBaseURL The descriptions for OPACBaseURL and staffClientBaseURL are not explicit about including a trailing slash or not. This patch makes it explicit that the trailing slash should *not* be included. To test: - Apply the patch - Search for "baseurl" in the system preferences - Check that the description of both sysprefs includes a warning about not including a trailing slash. - Sign off If you want to check that the trailing slash is in fact superfluous you can do something like 'grep -r "BaseURL" *' and check that these sysprefs are usually concatenated with some string that starts with a slash. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Changes to the description appear correctly on both system preferences. Signed-off-by: Galen Charlton (cherry picked from commit da40fe77fc471cfe8e797a7be5f87a506cf9d921) Signed-off-by: Tomas Cohen Arazi commit 13936914dad62aa4cfa0c39e90544dec3e53f99b Author: Owen Leonard Date: Mon Aug 19 14:48:00 2013 -0400 Bug 10130: widen input fields for library configuration Most input fields in the library entry form (admin/branches.pl) have no explicit width, so they display with a browser-default width. This patch gives explicit widths to those fields, giving more room for entry. Other fields have been given an explicit width and/or maxwidth according to the database table structure. To test, add or edit a library in Administration -> Libraries and Groups. Form fields should be more comfortable for entry, and add/edit actions should complete correctly. Signed-off-by: Campbell Reid-Tait Signed-off-by: Katrin Fischer Template changes only, works nicely. Tested editing and adding libraries in administration. Signed-off-by: Galen Charlton (cherry picked from commit 08330ec05b8854df61bb28c2498b6ef0a727589e) Signed-off-by: Tomas Cohen Arazi commit 5ddc1f43fb18679fadd80d17bb4a45b2d2a6b87b Author: Owen Leonard Date: Fri Aug 9 11:41:41 2013 -0400 Bug 10587: fix HTML errors on authority detail page in OPAC A validator check of the OPAC's authority detail returns a few minor errors. This patch corrects the errors. To test, apply the patch and run an OPAC authority detail page through an HTML validator. There should be no errors which are specific to the authorities detail template (as opposed to header and footer includes). Signed-off-by: Galen Charlton Signed-off-by: Katrin Fischer All tests and QA script pass. Also checked using the W3C validator and testing the authority detail page in the OPAC is still correctly displayed. Signed-off-by: Galen Charlton (cherry picked from commit 452a4b7775ce10655543aa81f670e2fb497ccc9b) Signed-off-by: Tomas Cohen Arazi commit a1c831bf43a563a116e9161b2b9381c9434669da Author: Tomas Cohen Arazi Date: Mon Jul 15 11:56:14 2013 -0300 Bug 10593: make AuthoritiesLog default to yes This trivial patch set the default to 'yes' for this system preference. To test, On a clean install - Navigate Home > Administration > Global System preferences > Logs - AuthoritiesLog is set to "Don't log" Apply the patch, install koha on a new DB. - Navigate Home > Administration > Global System preferences > Logs - AuthoritiesLog should be set to "Log" Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer One line patch, changing the default for new installations only. Signed-off-by: Galen Charlton (cherry picked from commit 0cfe0fa92328e62d1fbca33ea69869ad4f034c1b) Signed-off-by: Tomas Cohen Arazi commit 45f9a4a0385967f5e4dfd2ff4b77412353d77a83 Author: Magnus Enger Date: Tue Jul 30 15:32:31 2013 +0200 Bug 9247 - Add two more usage examples to the manpage for koha-mysql It might not be immediately obvious that it is possible to send SQL queries "directly" to the koha-mysql command, or that files from mysqldump can be loaded with it. This patch adds these as "example usage" to the man page for koha-mysql. To test: Run these commands and look at the formatted man page: $?xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \ debian/docs/koha-mysql.xml $?man -l koha-mysql.8 Make sure this test passes: $?prove -v xt/verify-debian-docbook.t This patch also corrects a couple places where "Koha" was written as "koha". Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Test plan, all tests and QA script pass. Signed-off-by: Galen Charlton (cherry picked from commit 5b121593800088656a0430da641b4c12a4e53980) Signed-off-by: Tomas Cohen Arazi commit e647d4e3ed887510db6bf7754bbd37c0401c3999 Author: Kenza Zaki Date: Tue Jul 23 16:46:38 2013 +0200 Bug 10528: add unit tests for C4::Bookseller.pm The tests are wrapped in a transaction. NOTE: some tests should pass but doesn't because of incoherences in the code. These tests are in comments and preceded by FIXME Test plan: prove t/db_dependent/Bookseller.t t/db_dependent/Bookseller.t .. 15/53 [Some warnings about uninitialised values] t/db_dependent/Bookseller.t .. ok All tests successful. Files=1, Tests=53, 1 wallclock secs ( 0.02 usr 0.00 sys + 0.46 cusr 0.03 csys = 0.51 CPU) Result: PASS http://bugs.koha-community.org/show_bug.cgi?id=10528 Signed-off-by: Srdjan Signed-off-by: Katrin Fischer The new tests pass nicely, as do all old tests and the QA script. All patches marked as dependencies have been pushed to master already. Signed-off-by: Galen Charlton (cherry picked from commit dc7b5b10e737cc34452dfc6c061cd7c893f08983) Signed-off-by: Tomas Cohen Arazi commit 1ad01972ca995bc938ffe55fd43e7a69e03aca5c Author: Jonathan Druart Date: Tue Jul 9 12:02:00 2013 +0200 Bug 10557: remove unused branch parameter from GetBooksellersWithLateOrders C4::Booksellers::GetBooksellersWithLateOrders has an unused parameter. The $branch variable is never used in the routine. Test plan: Check that no behavior changes on the late orders page. Signed-off-by: Srdjan Signed-off-by: Katrin Fischer I couldn't find any use of the branch parameter apart from the one corrected by this patch. Also tested late orders, couldn't find any problems. Signed-off-by: Galen Charlton (cherry picked from commit 7f075448b8e00596ece780cca654471eebf949a3) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Bookseller.pm | 4 +- C4/Branch.pm | 10 - acqui/lateorders.pl | 2 +- debian/docs/koha-mysql.xml | 21 +- installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/branches.tt | 28 +- .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../en/modules/admin/preferences/staff_client.pref | 2 +- .../opac-tmpl/prog/en/modules/opac-auth-detail.tt | 9 +- t/db_dependent/Bookseller.t | 694 ++++++++++++++++++++ t/db_dependent/Branch.t | 297 ++++++++- 11 files changed, 1028 insertions(+), 43 deletions(-) create mode 100644 t/db_dependent/Bookseller.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 13 19:47:16 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Sep 2013 17:47:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-71-gbf84bf5 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via bf84bf5b55c8d378f8abc4fa0f82a804c2d933df (commit) via b7e3e0efa6611be9c2f8c4e7f3bb08de49af7900 (commit) via 41f12d9edaecb2857f8823ef59748f974a79879a (commit) via 0d97cee2f1b4eb9ca8e6ded917e019ea4bae68f5 (commit) via 637721585595de560ddaa48f2f93aef07bf0f65f (commit) via 328b1bef0f72538105a1463d1398aadce349310e (commit) via a6d9026f23dc2eb95188907dfc14f574c2305215 (commit) via b6e9c93514fcb85f4a86565761ec0d39ce766a83 (commit) via 4eb94db2daeab8aed65dc703b13b3e8d4d154abc (commit) from 5ff99f63e32212071cc1e71749f93e943f005005 (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 bf84bf5b55c8d378f8abc4fa0f82a804c2d933df Author: David Cook Date: Mon Aug 19 11:29:13 2013 +1000 Bug 10755 - Add "Keyword as Phrase" to staff client advanced search indexes This patch adds a "Keyword as Phrase" index to the search options in the staff client. Test Plan: 1) Go to the Advanced Search in the staff client and click on the "Keyword" drop-down list. 2) Note that there is only a "Keyword" not a "Keyword as Phrase" option 3) Apply the patch 4) Reload the Advanced Search 5) Note that there is now a "Keyword as Phrase" option as well If you want to test the functionality...it will depend on your catalogue data. Basically, a phrase search will allow you to find "Keyword Adjacent To Keyword" rather than a more scattershot search that finds the keywords regardless of their position to each other. Signed-off-by: Owen Leonard Template change is correct, and in my tests the searching behavior was correctly modified: Using "keyword as phrase" returned only results where the terms were adjacent. Signed-off-by: Kyle M Hall Passes koha-qa.pl, trivial patch with no possible side effects. Signed-off-by: Galen Charlton (cherry picked from commit a1a4ff2bef3c94bafbf55b5995bc92bb46cdfa02) Signed-off-by: Tomas Cohen Arazi commit b7e3e0efa6611be9c2f8c4e7f3bb08de49af7900 Author: Kenza Zaki Date: Thu Aug 8 11:40:13 2013 +0200 Bug 10699: add explicit return value for DeleteBranchTransferLimits() This patch adds return values to DeleteBranchTransferLimits: 1 if a Transfer Limit is deleted undef if no parameters is given 0E0 if a wrong parameter is given More, it fixes and adds some tests in t/db_dependent/Circulation_transfers.t To test : prove t/db_dependent/Circulation_transfers.t t/db_dependent/Circulation_transfers.t .. ok All tests successful. Files=1, Tests=14, 19 wallclock secs ( 0.02 usr 0.01 sys + 0.39 cusr 0.02 csys = 0.44 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Tested with patch for bug 10692 applied. Signed-off-by: Galen Charlton (cherry picked from commit 88f15db30a9da6a24cf575759a97e8765be61ad4) Signed-off-by: Tomas Cohen Arazi commit 41f12d9edaecb2857f8823ef59748f974a79879a Author: Galen Charlton Date: Wed Aug 28 15:16:28 2013 +0000 Bug 10693: (follow-up) fix parameter checking in CreateBranchTransferLimit() There is nothing prevent '0' from being used as a library code. To test: Run prove -v t/db_dependent/Circulation_transfers.t and verify that the tests pass. Signed-off-by: Galen Charlton (cherry picked from commit 6751c5dc7c963defd0a31adfd46d0665abf41cd6) Signed-off-by: Tomas Cohen Arazi commit 0d97cee2f1b4eb9ca8e6ded917e019ea4bae68f5 Author: Kenza Zaki Date: Wed Aug 7 16:35:35 2013 +0200 Bug 10693: CreateBranchTransferLimit's return value in C4::Circulation.pm should be more explicit This patch test if the parameters $toBranch and $fromBranch are given. If not, CreateBranchTransferLimit now returns undef. This patch also fixes and adds some regression tests in t/db_dependent/Circulation_transfers.t NOTE: Currently, we can add a transferlimit to nonexistent branches because in the database branch_transfer_limits.toBranch and branch_transfer_limits.fromBranch aren't foreign keys. To test: prove t/db_dependent/Circulation_transfers.t t/db_dependent/Circulation_transfers.t .. ok All tests successful. Files=1, Tests=15, 18 wallclock secs ( 0.02 usr 0.01 sys + 0.42 cusr 0.00 csys = 0.45 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer All tests and QA script pass. (cherry picked from commit 3c61f95fb41152994ca2807eee87dc8e13ba219d) Signed-off-by: Tomas Cohen Arazi commit 637721585595de560ddaa48f2f93aef07bf0f65f Author: Kenza Zaki Date: Wed Aug 7 15:54:01 2013 +0200 Bug 10692: add unit tests for C4::Circulation routines about transfers The tests are wrap in a transaction. NOTE: Currently, some tests should pass but don't because of incoherences in the code. These tests are in comments and preceded by FIXME. To test: prove t/db_dependent/Circulation_transfers.t t/db_dependent/Circulation_transfers.t .. ok All tests successful. Files=1, Tests=12, 18 wallclock secs ( 0.02 usr 0.01 sys + 0.37 cusr 0.06 csys = 0.46 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit a58c5334c96105315ee3bf1cbb62d8c1aab82f0c) Signed-off-by: Tomas Cohen Arazi commit 328b1bef0f72538105a1463d1398aadce349310e Author: Galen Charlton Date: Wed Aug 14 16:37:49 2013 +0000 Bug 10710: (follow-up) perltidy new code Also, I prefer the use of parentheses for function calls, even when no arguments are being passed. One missed comma turns is(GetOfflineOperation, ...) into is(GetOfflineOperation ...) Signed-off-by: Galen Charlton Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit 35b83e540ea6d2f9856de827cfcad7c3b2b07f82) Signed-off-by: Tomas Cohen Arazi commit a6d9026f23dc2eb95188907dfc14f574c2305215 Author: Kenza Zaki Date: Mon Aug 12 14:16:46 2013 +0200 Bug 10710: add unit tests for OfflineOperation's routines in C4/Circulation.pm This patch test AddOfflineOperation,GetOfflineOperation and DeleteOfflineOperation in C4/Circulation.pm. The tests are wrapped in a transaction. Note: Currently, GetOfflineOperations is not tested because we cannot mock C4::Context->userenv in unit tests To test: prove t/db_dependent/Circulation_OfflineOperation.t t/db_dependent/Circulation_OfflineOperation.t .. ok All tests successful. Files=1, Tests=7, 19 wallclock secs ( 0.01 usr 0.01 sys + 0.33 cusr 0.02 csys = 0.37 CPU Signed-off-by: Galen Charlton Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton (cherry picked from commit 87890bc366d566685f1484cb476200f5ca302e91) Signed-off-by: Tomas Cohen Arazi commit b6e9c93514fcb85f4a86565761ec0d39ce766a83 Author: Galen Charlton Date: Wed Aug 28 14:44:01 2013 +0000 Bug 10767: (follow-up) remove FIXME comments The FIXME comments in the new test script were based on an assumption that GetIssuingRules() should return multiple rules if no or only partial parameters are passed. This is not the intent of that routine, whose purpose is to return the *singular* rule that best applies to a given loan situation. In other words, GetIssuingRule() is not a traditional accessor function. Signed-off-by: Galen Charlton (cherry picked from commit c191532cc0c908ccbd5019a0d49c721e5702e7a6) Signed-off-by: Tomas Cohen Arazi commit 4eb94db2daeab8aed65dc703b13b3e8d4d154abc Author: Kenza Zaki Date: Tue Aug 20 10:18:04 2013 +0200 Bug 10767: add unit tests for C4::Circulation routines that use issuingrules The test are wrap in a transaction. To test: prove t/db_dependent/Circulation_Issuingrule.t t/db_dependent/Circulation_Issuingrule.t .. ok All tests successful. Files=1, Tests=9, 17 wallclock secs ( 0.02 usr 0.00 sys + 0.34 cusr 0.04 csys = 0.40 CPU) Result: PASS Signed-off-by: Bernardo Gonzalez Kriegel Comment: No koha-qa errors prove t/db_dependent/Circulation_Issuingrule.t run without errors Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 08d45913d68d85eea1a1b2bab604b184d323ded5) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 7 +- .../prog/en/includes/search_indexes.inc | 1 + t/db_dependent/Circulation_Issuingrule.t | 341 ++++++++++++++++++++ t/db_dependent/Circulation_OfflineOperation.t | 100 ++++++ t/db_dependent/Circulation_transfers.t | 205 ++++++++++++ 5 files changed, 651 insertions(+), 3 deletions(-) create mode 100644 t/db_dependent/Circulation_Issuingrule.t create mode 100644 t/db_dependent/Circulation_OfflineOperation.t create mode 100644 t/db_dependent/Circulation_transfers.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 13 20:34:07 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Sep 2013 18:34:07 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-76-g2d80d67 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 2d80d67e75ac37016f982afcbc643159ccde1e1e (commit) via 4afc06d76a39cff5471ae3e364357019334259f4 (commit) via 9a8d1a9b534a076087cb3463adeb83a60fe01d52 (commit) via f01248ae55beffae61f7fed36cbe046b65b96116 (commit) via 84873c2a6b62fce594bdd8c954ed2d6880903dfb (commit) from bf84bf5b55c8d378f8abc4fa0f82a804c2d933df (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 2d80d67e75ac37016f982afcbc643159ccde1e1e Author: David Cook Date: Wed Aug 21 12:12:36 2013 +1000 Bug 9603 - Fix layout of Patron Card Creator Layout screen for display in IE Currently, the layout for the Edit/Add Layout screen of the Patron Card Creator is in complete disarray, when viewed in Internet Explorer (of any version). The nav bar is pushed to the bottom of the page, every fieldset is empty (as their contents have been pushed out into different parts of the page), and the checkboxes don't work. The cause appears to be some extraneous mark-up (a few extra fieldset and li elements)and some missing mark-up (ol elements to wrap the list elements, especially when nesting lists within each other and within div elements). Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer I didn't test this in IE, but changes are fixing general problems with HTML validity. Checking the page with the W3C validator: Before: 27 Errors, 7 warning(s) After: 6 Errors, 7 warning(s) All tests and QA script pass, page looks alright. Would be nice to see the remaining problems fixed in a follow-up. Signed-off-by: Galen Charlton (cherry picked from commit 76a1a00977657132180f0715d96db5702565f1bf) Signed-off-by: Tomas Cohen Arazi commit 4afc06d76a39cff5471ae3e364357019334259f4 Author: Fridolyn SOMERS Date: Mon Jul 15 12:14:53 2013 +0200 Bug 10588: improve selection of default branch for OPAC popular items pag In OPAC most popular items page: With user is logged-in his branch should be selected by default. When a branch is manually selected and form is submitted, this branch should be selected in results page. When looking at HTML, you see that all options are selected in combobox. This patch corrects by using the hidden input 'do_it' to distinguish form display and no branch filter selected. Test plan : - Make sure there are issues on records created in the past 3 month - Go to OPAC not logged-in - Click on "Most popular" => You get to page with results, "All libraries" is selected - Select a branch and submit => You get to page with results, the branch is selected [testing opac-topissues.inc from] - Select a branch and perform a search that does not have results (for example an item type never issued) => You get to page without results, the branch is selected [testing opac-topissues.tt form] - Log-in with a user - Click on "Most popular" => You get to page with results, user's branch is selected - Select "All libraries" and submit => You get to page with results, "All libraries" is selected [testing opac-topissues.inc from] - Select "All libraries" and perform a search that does not have results (for example an item type never issued) => You get to page without results, "All libraries" is selected [testing opac-topissues.tt form] Signed-off-by: Srdjan Signed-off-by: Katrin Fischer Works nicely and passes all tests. Signed-off-by: Galen Charlton (cherry picked from commit 600e953dff44c29fe7a2996fbacbd8e57cd7eb35) Signed-off-by: Tomas Cohen Arazi commit 9a8d1a9b534a076087cb3463adeb83a60fe01d52 Author: Jonathan Druart Date: Tue Aug 27 12:04:14 2013 +0200 Bug 10786: fix Javascript error on the parcel page The include of the yui json file generates a js error: YAHOO is not defined. This file seems not to be in use (patches for bug 8382 remove the use). To test: - go on acqui/parcel.pl?invoiceid=XXX - verify the error occurs (with firebug) - apply this patch - refresh the page - verify this error does not appear anymore - Verify there is no regression on this page Signed-off-by: Katrin Fischer Patch fixes the javascript error pointed out by Firebug. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton (cherry picked from commit d1f8d8811b1d2d96f1b087edf42f395c89c8df0f) Signed-off-by: Tomas Cohen Arazi commit f01248ae55beffae61f7fed36cbe046b65b96116 Author: Jonathan Druart Date: Thu Jun 27 15:33:46 2013 +0200 Bug 5904: make patron search autocompletion respect IndependentBranches Test plan: - Add a staff user foo in a library A - Add a staff user bar in a library B - log in as foo and try to search 'bar' - Switch on (Prevent) the syspref IndependentBranches - the search returns no result - log in as a superlibrarian - Check that you are allowed to search all patrons. Signed-off-by: Srdjan Signed-off-by: Kyle M Hall Passes koha-qa.pl, works as advertised. Signed-off-by: Galen Charlton (cherry picked from commit 6b72f249082fc6be8811c3dacec15648f7c5ccd9) Signed-off-by: Tomas Cohen Arazi commit 84873c2a6b62fce594bdd8c954ed2d6880903dfb Author: Galen Charlton Date: Wed Aug 28 16:27:43 2013 +0000 Bug 7143: history.txt and about page updates - two new developers - releases Signed-off-by: Galen Charlton Signed-off-by: Jared Camins-Esakov Signed-off-by: Katrin Fischer Reads all ok. Signed-off-by: Galen Charlton (cherry picked from commit dd367efddf887e3197492f11996a36c0d6c5e4c4) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: circ/ysearch.pl | 26 +++++++--- docs/history.txt | 48 ++++++++++++------- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 1 - .../prog/en/modules/patroncards/edit-layout.tt | 32 +++++++++++-- .../opac-tmpl/prog/en/includes/opac-topissues.inc | 2 +- opac/opac-topissues.pl | 6 ++- 7 files changed, 85 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Sep 13 20:59:28 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 13 Sep 2013 18:59:28 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.04-79-g319efaf Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.12.x has been updated via 319efaf0957c7b7e3d2a7bae3964397e60d9a37f (commit) via 61baf514ef08e5d50acacb9cd6e1350f28c750d3 (commit) via f6d1d5cd6c4f93f6c592170f59241268dfff79cb (commit) from 2d80d67e75ac37016f982afcbc643159ccde1e1e (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 319efaf0957c7b7e3d2a7bae3964397e60d9a37f Author: Tomas Cohen Arazi Date: Fri Aug 2 18:36:19 2013 -0300 Bug 10678 - Update addbooks help page The button's name changed, and a caret was added. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Melia Meggs Signed-off-by: Katrin Fischer Passes all tests and QA script. If you click the button directly, the default framework is still used. If you use the split button functionality to select another framework, this framework will be used for the imported record. Signed-off-by: Galen Charlton (cherry picked from commit 6fcb6712fe5411b182b6f0d23c40d3ce6d44f3eb) Signed-off-by: Tomas Cohen Arazi commit 61baf514ef08e5d50acacb9cd6e1350f28c750d3 Author: Tomas Cohen Arazi Date: Fri Aug 2 15:22:43 2013 -0300 Bug 10678 - Allow framework selection when creating from Z39.50 If we are creating a new record, we are forced to use the default framework and then change it after we have the cataloguing form filled. This patch adds the option to choose (from a splitted button dropdown) which framework to use. To test: - Apply the patch. - Go to More > Cataloguing - Check there's a nice split button that says "New from Z39.50" a) Click the button, the usual Z39.50 search popup should appear and work as expected (check the URL parameters and see frameworkcode= has no value b) Click on the dropdown arrow, choose a framework and the usual Z39.50 search popup should appear, this time frameworkcode= should have the chosen value. Edit: fixed a small bug that prevented the default framework to be called. Thanks Owen for testing. Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Melia Meggs