From gitmaster at git.koha-community.org Tue Apr 1 15:33:29 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 01 Apr 2014 13:33:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-644-g3bc1021 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 3bc1021deb851db8965e9ac3a8ff89aba71f6acc (commit) from 7378d488414d1859c75f0d3b40e5ce99cde67cb7 (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 3bc1021deb851db8965e9ac3a8ff89aba71f6acc Author: Dan Scott Date: Tue Feb 18 13:29:35 2014 -0500 Bug 11786: Improve RDFa structured data schema.org mappings This patch updates both the prog and bootstrap themes to provide better schema.org mappings for catalogue elements in the following ways: * More granular author attributes (one "author" property per author in records with multiple contributors; wrap in a Person or Organization type instead of using a simple literal value) * Use "byArtist" instead of "author" for music recordings to respect schema.org preferences * Use alternateName instead of alternativeHeadline, as the former is a better parallel to the "name" property Signed-off-by: Dan Scott Signed-off-by: Chris Cormack Only covers MARC21, but that is no reason not to move it forward Signed-off-by: Katrin Fischer Passes all tests. Looked at the source code of a few records in both prog and bootstrap and took a look at the properties using http://www.google.com/webmasters/tools/richsnippets. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 35 ++++++++++++++++---- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 35 ++++++++++++++++---- 2 files changed, 58 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 3 17:01:37 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 03 Apr 2014 15:01:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-645-gb785963 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 b78596311bb23eb4e81356cc07c12868d9a90b96 (commit) from 3bc1021deb851db8965e9ac3a8ff89aba71f6acc (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 b78596311bb23eb4e81356cc07c12868d9a90b96 Author: Owen Leonard Date: Wed Apr 2 10:13:31 2014 -0400 Bug 12018 - add table sorting to patron card batches When viewing batches of patrons in the patron card creator module the table is not sortable. This patch adds table sorting. The patch also makes some corrections of invalid markup and moves informational/error messages to the top of the page rather than in a sidebar. This change lets the table and sorting controls expand into a wider space. This patch also corrects a translation issue with table headers identical to that addressed by Bug 11505. To test, go to Tools -> Patron card creator -> Manage batches. View an existing batch or create a new batch and populate it with patrons. Table sorting controls should work correctly. Batch management operations should work correctly. Signed-off-by: Nicole C. Engard Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/patroncards/edit-batch.tt | 92 ++++++++++++-------- 1 file changed, 56 insertions(+), 36 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 3 17:10:09 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 03 Apr 2014 15:10:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-646-g5da480b 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 5da480b61b689c7497d386fdd0b9bd30f260d2db (commit) from b78596311bb23eb4e81356cc07c12868d9a90b96 (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 5da480b61b689c7497d386fdd0b9bd30f260d2db Author: Bernardo Gonzalez Kriegel Date: Thu Mar 27 00:32:33 2014 -0300 Bug 11993: fix untranslatable confirm popup in request.tt This patch makes confirm popup text translatable. It implements a similar function as used on OPAC deleteConfirm() and a JS var message. This function, or variants, can also be found on other files on intranet, I think that the only valid places are staff-global.js and help-top.inc Redefinitions of this function: prog/en/modules/serials/subscription-frequencies.tt:6 prog/en/modules/tools/marc_modification_templates.tt:158 prog/en/modules/virtualshelves/shelves.tt:92 Last case is a little different To test: 1) Confirm that the "cancel hold" link correctly prompts for confirmation: a) Place an item-level hold on a title. b) Check in the item and confirm the hold. c) Return to the place hold screen for that title and submit another patron to place a hold for. d) On the place hold screen for that patron, look at the table of items. There should be a "cancel hold" link next to the item for which the hold was confirmed in step (b). e) Click "cancel hold." You should see a confirmation message. Cancelling this dialog should cancel the operation. Confirming it should cancel the hold. 2) Check the string is not present on staff PO file 3) Apply the patch 4) Update translation files (cd misc/translator; perl translate update xx-YY) 5) Verify the string is now present Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 3 17:19:40 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 03 Apr 2014 15:19:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-647-gfe205c9 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 fe205c907a6ec1959add1b24a5bf3ff09ee5149c (commit) from 5da480b61b689c7497d386fdd0b9bd30f260d2db (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 fe205c907a6ec1959add1b24a5bf3ff09ee5149c Author: Bernardo Gonzalez Kriegel Date: Thu Mar 27 10:26:41 2014 -0300 Bug 11393: fix display of Thai in language menu when Thai translation is installed The problem is with the name of PO files Currently Koha expect, among other variants, that PO filenames began with (using as example *-pref.po): {lang}-pref.po {lang}-{region}-pref.po {lang}-{script}-pref.po {lang}-{script}-{region}-pref.po and expect 2 chars for lang and region, and 4 for script So the problem with Thai translation files are that it's names do not match that convention. This patch only rename Thai files as th-THA-* to th-TH-*. In that way language description is right. translate script use that chars to make dirs, and use dirs to find description. To test: 1) Go to I18N/L10N sysprefs 2) Install th-THA language (or simply mkdir koha-tmpl/intranet-tmpl/prog/th-THA) 3) Reload page, wrong description 4) Apply patch 5) Install th-TH language (or simply mkdir koha-tmpl/intranet-tmpl/prog/th-TH) 6) Reload page, right description 7) If you want do "mkdir koha-tmpl/intranet-tmpl/prog/th-Thai", reload, also right description To the reporter of this Bug: the rename of the folder is a good workaround, when this patch is pushed to stable I'll rename Thai files Signed-off-by: Mark Tompsett This does not correct existing problems which need human intervention. It does, however, allow for a correct installation of Thai after the patch is made. If we really want a patch for fixing an existing install. I wrote it, but have not tested it. Signed-off-by: Katrin Fischer As pointed out by Mark, this does not fix existing installations. Putting a note in the release notes might be something we can do here. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: ...THA-i-opac-t-prog-v-3006000.po => th-TH-i-opac-t-prog-v-3006000.po} | 0 ...A-i-staff-t-prog-v-3006000.po => th-TH-i-staff-t-prog-v-3006000.po} | 0 .../po/{th-THA-opac-bootstrap.po => th-TH-opac-bootstrap.po} | 0 misc/translator/po/{th-THA-opac-ccsr.po => th-TH-opac-ccsr.po} | 0 misc/translator/po/{th-THA-pref.po => th-TH-pref.po} | 0 misc/translator/po/{th-THA-staff-help.po => th-TH-staff-help.po} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename misc/translator/po/{th-THA-i-opac-t-prog-v-3006000.po => th-TH-i-opac-t-prog-v-3006000.po} (100%) rename misc/translator/po/{th-THA-i-staff-t-prog-v-3006000.po => th-TH-i-staff-t-prog-v-3006000.po} (100%) rename misc/translator/po/{th-THA-opac-bootstrap.po => th-TH-opac-bootstrap.po} (100%) rename misc/translator/po/{th-THA-opac-ccsr.po => th-TH-opac-ccsr.po} (100%) rename misc/translator/po/{th-THA-pref.po => th-TH-pref.po} (100%) rename misc/translator/po/{th-THA-staff-help.po => th-TH-staff-help.po} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 4 17:09:03 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 04 Apr 2014 15:09:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-648-g0f7b896 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 0f7b89633ed9e5be611a4d6c981bf3065670ba1a (commit) from fe205c907a6ec1959add1b24a5bf3ff09ee5149c (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 0f7b89633ed9e5be611a4d6c981bf3065670ba1a Author: Owen Leonard Date: Thu Apr 3 08:38:08 2014 -0400 Bug 12034: standardize alerts referring to lists and list items The staff client lists template contains a warning which differs from the same warning in the OPAC. The OPAC version is correct because it refers to a list rather than a shelf. This patch copies the OPAC version to the staff client template. This patch also corrects a few of other instances where the incorrect term "shelf" is used. To test, apply the patch and view a list in the staff client which is populated with items. Check the box next to one or more items on the list and click the "Remove selected" button. You should see the message, "Are you sure you want to remove these items from the list?" Signed-off-by: Bernardo Gonzalez Kriegel Work as described, no koha-qa errors Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 4 17:24:52 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 04 Apr 2014 15:24:52 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-649-g15b4f9b 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 15b4f9bbe990224067aea8ac9ddfd02d524c84ad (commit) from 0f7b89633ed9e5be611a4d6c981bf3065670ba1a (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 15b4f9bbe990224067aea8ac9ddfd02d524c84ad Author: Bernardo Gonzalez Kriegel Date: Sat Mar 22 12:02:12 2014 -0300 Bug 10818: improve display and translatability of sysprefs OAI-PMH:ConfFile's description This patch correct english display for OAI-PMH:ConfFile syspref, and makes it's strings translatable To test: 1) On Administration > System preferences > Web Services OAI-PMH:ConfFile syspref doesn't have description before file box. Text after that box is not translated. 2) Choose your prefered language, xx-YY, update po files cd misc/translator perl translate update xx-YY 3) Look into xx-YY-pref.po for any occurence of "YAML", there is none 4) Apply the patch 5) Update po files again 6) Look into xx-YY-pref.po, now there are 2 entries 7) Also reload page from 1) and check for text before file box. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Works for me as described, only changes YAML pref file. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/preferences/web_services.pref | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 7 17:22:15 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Apr 2014 15:22:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-653-gaa722ab 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 aa722ab694e1fc3141cda47f00f9b553e152265a (commit) via 5935654bacddfaba2b8019817d857f0f092cd20d (commit) via b5ae30cd6376ded9c7e63f0e3fcc34d043640e0e (commit) via 3fc5aeb7456fbda97b6fbc0fb66ddbc3aa253439 (commit) from 15b4f9bbe990224067aea8ac9ddfd02d524c84ad (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 aa722ab694e1fc3141cda47f00f9b553e152265a Author: Owen Leonard Date: Wed Jan 15 14:51:11 2014 -0500 Bug 11570 - Upgrade jQueryUI to latest version in the staff client This patch upgrades the version of jQueryUI included in the Koha staff client from v1.8.23 to v.1.10.4. The upgrade introduces a few minor API changes which require the updates in this patch: - In CSS, the term "active" is used instead of "selected" - Autocomplete functions use slightly changed parameters Changes to the default jQueryUI CSS allows us to remove some instances of "!important" from jQueryUI-related CSS in the staff client's main CSS file. To test: Testing changes to autocomplete: - Enable the CircAutocompl system preference. Try searching in the header's "Check out" tab. Autocomplete should look correct and function correctly. - In Circulation -> Overdues: The patron attribute authorized value filter (must have patron attributes enabled, and a patron attribute defined which uses authorized values. - Course reserves -> Course -> Edit: Searching for an instructor - In the unimarc_field_210c_bis.pl plugin: 1. Link the publisher name field in your MARC structure to the unimarc_field_210c_bis.pl plugin. 2. Open a MARC record for editing and click the "tag editor" link to launch the plugin. 3. Type the first few letters of a publisher which exists in your database. You should get an autocomplete menu of publishers which match your search. 4. Select one and click the "choose" button to fill the field in the MARC editor. - Tools -> Patron lists: Add a list or choose an existing list and add patrons. Perform a search for a patron. - Placing a hold: After choose a title and clicking "Place hold," search for a patron. - Tags management: The sidebar filter for "reviewer" should let you search by patron name. Other jQueryUI widget changes: - Check tabs appearance in header search, biblio detail, cataloging, and circulation patron fines pages. To confirm other jQueryUI widgets still function correctly: - Check accordion (collapsing sections) in Patrons -> Patrons requesting modifications and the MARC subfield structure edit screen. - Check datepickers, especially in Circulation with the added timepicker. Test a linked datepicker, for example in Reports -> Stats wizards -> Circulation where the value in one date field affects what dates are available in the matching field. - Check the calendar interface in Tools -> Calendar To confirm that the new jQueryUI default CSS is more flexible (fixing Bug 11042), add the following CSS to your IntranetUserCSS system preference and confirm that the header search active tab border color changes (hash mark escaped so that it will appear in commit msg): \#header_search ul.ui-tabs-nav li.ui-tabs-active { background-color: #FFFFF1; border: 1px solid #800000; border-top: 0 !important; top: -2px; } Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 5935654bacddfaba2b8019817d857f0f092cd20d Author: Matthias Meusburger Date: Wed Feb 26 16:59:14 2014 +0100 Bug 11850: Add -append option to bulkmarcimport.pl to append to logfile Signed-off-by: Magnus Enger Keeps current behaviour as default. The -append option is described in the POD and works as expected. Signed-off-by: Katrin Fischer Works as described. Adding a date/time to the output might be good, to make it easier to find the entry you were looking for. Signed-off-by: Galen Charlton commit b5ae30cd6376ded9c7e63f0e3fcc34d043640e0e Author: Pasi Kallinen Date: Wed Apr 2 14:30:03 2014 +0300 Bug 12024: fix add to list opening the list adding UI in two windows In Item details, when using the menu toolbar for Add To > List, the list adding UI opens in a popup window, and also in the original window. The original window should stay showing the item details page. This patch corrects this behavior, which has been observed in Chromium on Ubuntu and Chrome on Windows. Signed-off-by: Bernardo Gonzalez Kriegel Works fixing problem. No koha-qa errors. Test: 1. On staff, go to detail of some biblio, click add to List, described behavior 2. With patch applied, original windows stay on item detail Signed-off-by: Katrin Fischer Patch passes all tests and QA script, works as described. Signed-off-by: Galen Charlton commit 3fc5aeb7456fbda97b6fbc0fb66ddbc3aa253439 Author: Liz Rea Date: Thu Apr 3 16:25:35 2014 +1300 Bug 12032: disable automatic URL conversion by TinyMCE in news To test: * create a news item with a link in it that is within the same domain example: my koha was at http://demo.mykoha.co.nz, I created a link in a news item to http://demo-intra.mykoha.co.nz * note that when the item is saved, the url changes to ../../../../ (or something like) * apply the patch * edit the link again, and save it * note that the link is saved correctly Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 212 bytes .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 208 bytes .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 335 bytes .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 207 bytes .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 262 bytes .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 262 bytes .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 280 bytes .../lib/jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 6922 bytes .../lib/jquery/images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 4549 bytes .../lib/jquery/images/ui-icons_454545_256x240.png | Bin 4369 -> 6992 bytes .../lib/jquery/images/ui-icons_888888_256x240.png | Bin 4369 -> 6999 bytes .../lib/jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 4549 bytes koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui.css | 539 +------------------- koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui.js | 76 +-- .../intranet-tmpl/prog/en/css/staff-global.css | 27 +- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 4 +- .../prog/en/includes/patron-search-box.inc | 4 +- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 2 +- .../value_builder/unimarc_field_210c_bis.tt | 4 +- .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 +- .../prog/en/modules/course_reserves/course.tt | 4 +- .../prog/en/modules/patron_lists/list.tt | 4 +- .../prog/en/modules/reserve/request.tt | 4 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 4 +- .../prog/en/modules/tools/koha-news.tt | 2 + misc/migration_tools/bulkmarcimport.pl | 10 +- 27 files changed, 56 insertions(+), 632 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 7 17:28:03 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Apr 2014 15:28:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-654-g04e4fc9 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 04e4fc9751332f08ada8da7814652dcddbee72c9 (commit) from aa722ab694e1fc3141cda47f00f9b553e152265a (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 04e4fc9751332f08ada8da7814652dcddbee72c9 Author: Bernardo Gonzalez Kriegel Date: Wed Mar 19 22:25:07 2014 -0300 Bug 10790: fix misalignment in item type form when noItemTypeImages is off This patch fixes the odd behavior when noItemTypesImages is set to 'Don't show'. Just a misplaced To test: 1) Set syspref noItemTypeImages to 'Don't show' 2) Go to Admininstration > Item types 3) Edit some item type, you will view a display similar to the attached image 4) Apply the patch 5) Reload the page, now the display is fixed 6) Change syspref to 'Show' to check that the display is also good Also fixed a missing '/' on a closing select Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 7 19:54:09 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 07 Apr 2014 17:54:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-671-gc095003 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 c095003b865a9405014d8567bdccfaf7048fd929 (commit) via c3c07d93760afa4eada4ee7080f273d53990dcd8 (commit) via d49ae54b953b50ffdbf0635f995c4e8a796fdd01 (commit) via 8d4d4550aa01645bb4f565857597b81a33f046c2 (commit) via ab47d48488f65cca08871bff69a1561e10740945 (commit) via ea6cffdd9f04bd855f9b763776d44ae4702a8116 (commit) via 53f15f678f3e64156f9c969b3b019a73e9691cbd (commit) via 49381cc45bef043c104e848aa536fa8c58f4e3da (commit) via b4c3f23c0bfe4d55fc3bd171585070c9420027b9 (commit) via 2f2a0cf53e64a02f65cc0797bdcf6c0fd9a8dc2a (commit) via d3eaa627176d3945888da33082bfb12e05e5ee25 (commit) via beb74124f292954b727231290f44d27f5565a5cf (commit) via 1094f7fefe59457cd2e689969e58ee6ddc84e44a (commit) via 82a36947f72c542dae4edd967291e7ffe7d8b037 (commit) via 8a9bfd0a1c17cb5dc4b1e9cbd6cb79b349fe9c1b (commit) via b56f09229956b964db36567a49c139e138867b97 (commit) via a6213abe019bf05b92a0df765cf4e3200dd3b42a (commit) from 04e4fc9751332f08ada8da7814652dcddbee72c9 (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 c095003b865a9405014d8567bdccfaf7048fd929 Author: Galen Charlton Date: Mon Apr 7 18:10:38 2014 +0000 Bug 7567: (follow-up) construct values clause in SQL statement more idiomatically To test: [1] Verify that prove -v t/db_dependent/NewsChannels.t passes Signed-off-by: Galen Charlton commit c3c07d93760afa4eada4ee7080f273d53990dcd8 Author: Galen Charlton Date: Mon Apr 7 17:45:44 2014 +0000 Bug 7567: (follow-up) make tests of get_opac_new more readable This patch updates two of the tests cases to directly compare the results returned by get_opac_new with the expected value by using is_deeply(). Consequently, it removes the use of magic numbers (which do not stop being magic numbers if they're wrapped in constants named F1, F2, etc.). To test: [1] Verify that prove -v t/db_dependent/NewsChannels.t passes. Signed-off-by: Galen Charlton commit d49ae54b953b50ffdbf0635f995c4e8a796fdd01 Author: Galen Charlton Date: Mon Apr 7 17:01:18 2014 +0000 Bug 7567: DBRev 3.15.00.027 Signed-off-by: Galen Charlton commit 8d4d4550aa01645bb4f565857597b81a33f046c2 Author: Owen Leonard Date: Thu Mar 27 09:30:24 2014 -0400 Bug 7567: (follow-up) Modify DataTables configuration This follow-up corrects a JavaScript error by converting the sorting configuration to be class-based (http://wiki.koha-community.org/wiki/DataTables_HowTo#Sorting_dates_regardless_of_date_format_preference). I have also changed the DataTables configuration to allow for pagination and JS-based filtering. To test, apply the patch and view the list of News items. Your browser should report no JavaScript errors. Table sorting, pagination, and filtering should work correctly. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit ab47d48488f65cca08871bff69a1561e10740945 Author: Jonathan Druart Date: Thu Mar 27 13:15:14 2014 +0100 Bug 7567: QA followup: remove useless $parameters hashref This hashref is useless, it is only used once. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit ea6cffdd9f04bd855f9b763776d44ae4702a8116 Author: Jonathan Druart Date: Thu Mar 27 13:14:08 2014 +0100 Bug 7567: QA followup: FIX SQL query The WHERE clause should not erase $query. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 53f15f678f3e64156f9c969b3b019a73e9691cbd Author: Mark Tompsett Date: Thu Dec 19 22:59:28 2013 -0500 Bug 7567 - Use, display, filter News by library This adds the ability to specify whether staff, OPAC, or slip news entries apply to all libraries or just a particular library. With the branch parameter added to key functions in C4/NewsChannels.pm, function calls in C4/Members.pm, mainpage.pl, opac/opac-main.pl, tools/koha-news.pl, and t/db_dependent/NewsChannels.t were needed. Some license texts were updated. Templates were modified to display, allow for entry and editing of the branches selected. TEST PLAN --------- 1) Having logged into the staff client, is the news displaying correctly? Have you entered a news item which should not display for this branch of logged in user? 2) Find a patron (with some items checked out?) 3) Print a slip - News which is labelled 'All Branches' or for the same branch as the one printing the slip should display on the slip. - THIS DOES NOT AFFECT QUICK SLIPS 4) Home -> Tools -> News - Can you edit a news item? - Does the change save correctly? - Can you filter based on location and branch correctly? - Can you add a new entry correctly? - Can you delete an entry correctly? 5) Open an OPAC client. - Does only the news for all branches display? 6) Log into the OPAC client. - Does the news for all branches and the specific branch display? 7) prove -v t/db_dependent/NewsChannels.t - Does it run and all succeed? - Does the code seem to catch the required cases? 8) Comparing the patched and unpatched versions of files affected, are the license changes missing anything? Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 49381cc45bef043c104e848aa536fa8c58f4e3da Author: Mark Tompsett Date: Sun Feb 16 22:40:28 2014 -0500 Bug 7567 - Schema update for opac_news This was generated by: Reset hard to master. Restore old DB Apply the patches for 7567 ./installer/data/mysql/updatedatabase.pl ./misc/devel/update_dbix_class_files.pl -db_name=... -db_user=... -db_passwd=... git add Koha/Schema/Results/OpacNews.pm This should provide the necessary changes to the schema files for Koha 3.16 and forward. Had to generate under Debian, because Ubuntu's was broken by comparison. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit b4c3f23c0bfe4d55fc3bd171585070c9420027b9 Author: Mark Tompsett Date: Thu Dec 19 17:51:34 2013 -0500 Bug 7567 - Added branchcode to opac_news This patch merely adds branchcode varchar(10) DEFAULT NULL to the opac_news table. TEST PLAN --------- 1) backup your kohadata base if you care about the data. 2) use the koha database 3) describe opac_news; 4) show create table opac_news; -- No branchcode constraint will exist. 5) apply the patch 6) upgrade the database (either staff client or script) 7) use the koha database 8) describe opac_news; 9) show create table opac_news; -- The branchcode constraint should be listed. 10) drop that koha database 11) create the koha database 12) use the koha database 13) source ~/kohaclone/installer/data/mysql/kohastructure.sql -- there should be no errors in creating the database. 14) describe opac_news; 15) show create table opac_news; -- The branchcode constraint should be listed. 16) restore your koha database if you backed it up. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 2f2a0cf53e64a02f65cc0797bdcf6c0fd9a8dc2a Author: Mark Tompsett Date: Mon Dec 16 00:41:47 2013 -0500 Bug 7567: convert news add/update routines to take hashref; fix bugs Changed the add and update functions to use a hash reference for the parameter, so that adding or subtracting parameters should be easier. Added some POD for the add_opac_news and upd_opac_news functions, so that developers would know how to call it. The hashref changes resulted in being able to return 0 for failure and 1 for success. This meant adding a couple tests to the test file. And while testing, there was some sort of logic problem with the matter of '' being all, but selecting all only showed things set for all, and excluded particular languages, or other interfaces. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit d3eaa627176d3945888da33082bfb12e05e5ee25 Author: Mark Tompsett Date: Sun Dec 15 22:33:32 2013 -0500 Bug 7567: (code cleanup) remove finish calls "When all the data has been fetched from a SELECT statement, the driver will automatically call finish for you. So you should not call it explicitly except when you know that you've not fetched all the data from a statement handle and the handle won't be destroyed soon." (http://search.cpan.org/~timb/DBI-1.627/DBI.pm#finish) All the $sth variables were scoped within the functions, and would be destroyed immediately. Additionally, there was one after a SELECT, for only a single idnew, and so it was not necessary. TEST PLAN --------- 1) prove -v t/db_dependent/NewsChannels.t 2) apply patch 3) prove -v t/db_dependent/NewsChannels.t Signed-off-by: Chris Cormack ok 1 - use C4::NewsChannels; ok 2 - Successfully added the first dummy news item! ok 3 - Successfully added the second dummy news item! ok 4 - Successfully updated second dummy news item! ok 5 - Successfully tested get_opac_new id1! ok 6 - Successfully tested get_opac_new id2! ok 7 - Successfully tested get_opac_news! ok 8 - Successfully tested GetNewsToDisplay! Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit beb74124f292954b727231290f44d27f5565a5cf Author: Mark Tompsett Date: Fri Dec 13 22:12:37 2013 -0500 Bug 7567 - Correct Filtering and Default dropdown values In the staff client, when you went to Home -> Tools -> News the default 'Display location' is 'All'. Everything is correctly displayed. However, if you change the filter it filters the table correctly, but does not set the dropdown value to match. This patch corrects this. TEST PLAN --------- 1) Home -> Tools -> News 2) Change 'Display location' value and click 'Filter'. - Is the 'Display location' value the same now? (no) - Are the correct values displayed? 3) Click 'New entry' - Is it anything other than 'All'? (no, and is this correct?) 4) Click 'Cancel' 5) Click 'Edit' for various news items with different locations. - Does the 'Display location' get proper set? (no) 6) Apply patch 7) Change the 'Display location' value and click 'Filter'. - Does the 'Display location' value stay the same? (this should be correct now) - Are the correct values displayed? 8) Change the 'Display location' value to 'All' and click 'Filter'. - Does everything display? 9) Change the 'Display location' value and click 'Filter'. 10) Click 'New entry' - Does it match what the filter was? (should match now) 11) Click 'Cancel' 12) Click 'Edit' for various news items with different locations. - Does the 'Display location' get proper set? (this should be correct now) Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 1094f7fefe59457cd2e689969e58ee6ddc84e44a Author: Mark Tompsett Date: Fri Dec 13 16:17:04 2013 -0500 Bug 7567: (code cleanup) remove excess line The template parameter { $lang => 1 } does not seem used in master. It is unconfirmed whether this is used in earlier versions of Koha. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 82a36947f72c542dae4edd967291e7ffe7d8b037 Author: Mark Tompsett Date: Fri Dec 13 15:51:36 2013 -0500 Bug 7567 - Clean up sample news files Some files had truncate. Some files had foreign key checks. Other files had foreign key checks disabled. Some files gave the column names expressly, and others assumed the fields in a particular order. Everything was modified to: - not truncate - not say utf8 (because it should already be by default) - not disable foreign key checks (because it should work) - expressly name the fields (adding fields shouldn't break it) TEST PLAN --------- 0) Backup opac_news if you care about your news. 1) open mysql client 2) use the koha database 3) Run the following script TRUNCATE opac_news; source ~/kohaclone/installer/data/mysql/uk-UA/optional/sample_news.sql source ~/kohaclone/installer/data/mysql/it-IT/necessari/sample_news.sql source ~/kohaclone/installer/data/mysql/de-DE/optional/sample_news.sql source ~/kohaclone/installer/data/mysql/nb-NO/2-Valgfritt/sample_news.sql source ~/kohaclone/installer/data/mysql/en/optional/sample_news.sql source ~/kohaclone/installer/data/mysql/pl-PL/optional/sample_news.sql source ~/kohaclone/installer/data/mysql/es-ES/optional/sample_news.sql source ~/kohaclone/installer/data/mysql/ru-RU/optional/sample_news.sql source ~/kohaclone/installer/data/mysql/fr-FR/2-Optionel/sample_news.sql - Were there errors? - Did everything add nicely? - Not likely, by expressly stating the idnew field, the news items in some files would not be added. 4) apply patch 5) try running the script again - Were there errors? - Did everything add nicely? 6) Log into the staff client 7) Tools->News - Do you see the news items added? Signed-off-by: Chris Cormack Much needed clean up, making for much more robust and less error prone sql Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 8a9bfd0a1c17cb5dc4b1e9cbd6cb79b349fe9c1b Author: Mark Tompsett Date: Fri Dec 13 15:13:49 2013 -0500 Bug 7567: (code cleanup) update License tools/koha-news.pl Updated license text using http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence for the base text. TEST PLAN --------- 1) less tools/koha-news.pl 2) apply patch 3) less tools/koha-news.pl - was any contributor information lost? Signed-off-by: Chris Cormack Safe no op action Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit b56f09229956b964db36567a49c139e138867b97 Author: Mark Tompsett Date: Fri Dec 13 14:49:56 2013 -0500 Bug 7567: (code cleanup) update license and use Modern::Perl Grabbed the current license from http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence and changed the use strict; use warnings; into a use Modern::Perl instead. TEST PLAN --------- 1) Log into staff client. - Does news look okay? 2) Apply patch 3) Refresh staff client. - Does news look the same? Signed-off-by: Chris Cormack Safe no op action Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit a6213abe019bf05b92a0df765cf4e3200dd3b42a Author: Mark Tompsett Date: Thu Dec 12 23:19:18 2013 -0500 Bug 7567: add tests for C4::NewsChannel Testing was lacking, this tests every function call. As a side effect, this moved the stub of a test file from t/NewsChannels.t to t/db_dependent/NewsChannels.t, since the table opac_news must exist. Signed-off-by: Chris Cormack Passes all 8 tests Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 2 +- C4/NewsChannels.pm | 182 +++++++++++++------- Koha/Schema/Result/OpacNews.pm | 35 +++- .../data/mysql/de-DE/optional/sample_news.sql | 4 +- installer/data/mysql/en/optional/sample_news.sql | 4 +- .../data/mysql/es-ES/optional/sample_news.sql | 4 +- .../data/mysql/fr-FR/2-Optionel/sample_news.sql | 3 +- .../data/mysql/it-IT/necessari/sample_news.sql | 10 +- installer/data/mysql/kohastructure.sql | 5 +- .../data/mysql/nb-NO/2-Valgfritt/sample_news.sql | 4 +- .../data/mysql/pl-PL/optional/sample_news.sql | 4 +- .../data/mysql/ru-RU/optional/sample_news.sql | 36 ++-- .../data/mysql/uk-UA/optional/sample_news.sql | 34 ++-- installer/data/mysql/updatedatabase.pl | 15 ++ .../prog/en/modules/tools/koha-news.tt | 130 ++++++++++---- koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt | 4 +- kohaversion.pl | 2 +- mainpage.pl | 36 ++-- opac/opac-main.pl | 33 ++-- t/NewsChannels.t | 14 -- t/db_dependent/NewsChannels.t | 138 +++++++++++++++ tools/koha-news.pl | 69 ++++++-- 22 files changed, 548 insertions(+), 220 deletions(-) delete mode 100755 t/NewsChannels.t create mode 100644 t/db_dependent/NewsChannels.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 01:07:24 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Apr 2014 23:07:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-684-g6813e56 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 6813e560f70c5efa2e7697876ba52e47c83c447d (commit) via 26c79241868e981a0e3a90f9ce83d28f286ee285 (commit) via 9d9ae48a0c75d6c5dbe65c21ecf250a86cd46ffc (commit) via f4efda5bc58e619e42493ac635cdaab78f53a950 (commit) via ef25c3665bcde5278512225297100f26d3dc531a (commit) via 39be2613a1fafd9a2d2805aa4c662088e53fad53 (commit) via 7c4a00a00981a88e29fe7f2996e094f83566accb (commit) via e005f0f9110be8fa7b66df48fb6f63084a10cc96 (commit) via f71aa0768c596b0f9a10afb1dc06c4580b93c1ef (commit) via acf862ba6261c8f64bd0e7c8e5a1762eecefd703 (commit) via 065926d224005f03c6730f8fb62dfcaddb1ab0a0 (commit) via 6fd4b4f05ae99c5850654646d81e5fde21b01dcc (commit) via 069bf086fbc3bb5bab4527c4b7a0cf31970b184d (commit) from c095003b865a9405014d8567bdccfaf7048fd929 (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 6813e560f70c5efa2e7697876ba52e47c83c447d Author: Galen Charlton Date: Tue Apr 8 23:28:21 2014 +0000 Bug 7413: (follow-up) tweak description of the AllowRenewalLimitOverride syspref As it happens, the AllowRenewalLimitOverride serves to both allow operators to override renewal blocks when the renewal exceed the maximum renewal count or when the renewal is premature. This patch adjust the wording to reflect the expansion in meaning; if it turns out that folks want to distinguish between overriding the maximum renewal count and overriding premature renewals, a new system preference can be added later. Signed-off-by: Galen Charlton commit 26c79241868e981a0e3a90f9ce83d28f286ee285 Author: Galen Charlton Date: Tue Apr 8 23:22:05 2014 +0000 Bug 7413: (follow-up) teach renew interface about too_soon This patch ensures that the new staff interface for renewals recognizes when premature renewals are requested. If the AllowRenewalLimitOverride system preference is enabled, staff members are able to override the block: To test: [1] Set up a loan policy with a "no renewal before" value and check out an item. [2] In the renewal page, verify that attempting to renew the loan results in an error forbidding the renew. [3] If AllowRenewalLimitOverride is enabled, the operator should also be given the option to override the block. Signed-off-by: Galen Charlton commit 9d9ae48a0c75d6c5dbe65c21ecf250a86cd46ffc Author: Galen Charlton Date: Tue Apr 8 23:05:13 2014 +0000 Bug 7413: (follow-up) add direct unit tests This patch adds a direct unit test of GetSoonestRenewDate() and verifies that CanBookBeRenewed() returns a 'too_soon' error as expected. To test: [1] Verify that prove -v t/db_dependent/Circulation.t passes. Signed-off-by: Galen Charlton commit f4efda5bc58e619e42493ac635cdaab78f53a950 Author: Galen Charlton Date: Tue Apr 8 22:52:01 2014 +0000 Bug 7413: (follow-up) improve return of GetSoonestRenewDate() This patch modifies GetSoonestRenewDate() so that it returns undef if the patron, item, or loan cannot be found. This better reflects the usage of this routine GetSoonestRenewDate(), as none of its callers tried to check the second return value containing an error code. This patch also updates the POD to match. Signed-off-by: Galen Charlton commit ef25c3665bcde5278512225297100f26d3dc531a Author: Galen Charlton Date: Tue Apr 8 22:46:28 2014 +0000 Bug 7413: (follow-up) validate norenewalbefore values better This patch ensures both both '0' and strings consisting of zero or more blanks are recognized by the circ rules editor as specifying clearing the "no renewal before" value. Concretely, this fixes warnings of the following form when clearing this field: Argument "" isn't numeric in numeric eq (==) Signed-off-by: Galen Charlton commit 39be2613a1fafd9a2d2805aa4c662088e53fad53 Author: Galen Charlton Date: Tue Apr 8 22:40:52 2014 +0000 Bug 7413: update DBIC schema classes Note that this patch also incorpates updates for the new branches <-> opac_news relationship. Signed-off-by: Galen Charlton commit 7c4a00a00981a88e29fe7f2996e094f83566accb Author: Galen Charlton Date: Mon Apr 7 18:30:17 2014 +0000 Bug 7413: DBRev 3.15.00.028 Signed-off-by: Galen Charlton commit e005f0f9110be8fa7b66df48fb6f63084a10cc96 Author: Holger Mei?ner Date: Fri Feb 14 10:01:19 2014 +0100 Bug 7413: Unit test This patch makes the new parameter norenewalbefore known to unit test Circulation_Issuingrule.t. To test: 1) Before applying the patch: prove t/db_dependent/Circulation_Issuingrule.t 2) Notice that the test fails with: $got->{norenewalbefore} = undef $expected->{norenewalbefore} = Does not exist 3) Apply the patch. 4) Run test again and it should pass. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Martin Renvoize Signed-off-by: Brendan Gallagher commit f71aa0768c596b0f9a10afb1dc06c4580b93c1ef Author: Holger Mei?ner Date: Fri Feb 14 09:56:10 2014 +0100 Bug 7413: OPAC prog theme changes This patch makes the prog version of opac-user.tt handle the new renewal error "too_soon". To test: 1) Set global syspref "opacthemes" to prog. 2) Test the same things as in previous patch. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Martin Renvoize Signed-off-by: Brendan Gallagher commit acf862ba6261c8f64bd0e7c8e5a1762eecefd703 Author: Holger Mei?ner Date: Fri Feb 14 09:11:19 2014 +0100 Bug 7413: OPAC bootstrap theme changes This patch makes opac-user.pl and the bootstrap version of opac-user.tt handle the new renewal error "too_soon". To test: 1) Set global syspref "opacthemes" to bootstrap. 2) Set global syspref "OpacRenewalAllowed" to Allow. 3) Test the same things as in previous patch, this time for the OPAC summary page. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Martin Renvoize Signed-off-by: Brendan Gallagher commit 065926d224005f03c6730f8fb62dfcaddb1ab0a0 Author: Holger Mei?ner Date: Thu Feb 13 17:05:08 2014 +0100 Bug 7413: Code and intranet template changes This patch modifies CanBookBeRenewed, so that based on issuingrules.norenewalbefore a new error "too_soon" can be returned. Also adds a new subroutine GetSoonestRenewDate. To test: 1) Create an issuing rule with "No renewal before" set to value X and "Unit" set to days. 2) Test the following steps for both: Home > Patron > Patron details Home > Circulation > Checkouts 3) On the checkout page, test for today's issues as well as previous issues. (Check something out on one day and something else on the next day, then do the testing.) 4) Confirm that items can't be renewed if current date is more than X days before due date. 5) Confirm that the date and time of the soonest possible renewal are displayed in the format specified by global sysprefs "dateformat" and "TimeFormat". 6) Confirm that items can be renewed if "No renewal before" is undefined or current date is X or less days before due date. 7) Confirm that if the number of allowed renewals is exceeded "Not renewable" is displayed, no matter what "No renewal before" is set to. 8) Test the same things with "Unit" set to hours. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Martin Renvoize Signed-off-by: Brendan Gallagher commit 6fd4b4f05ae99c5850654646d81e5fde21b01dcc Author: Holger Mei?ner Date: Wed Feb 12 17:16:40 2014 +0100 Bug 7413: Add "No renewal before" to the circulation and fine rules This patch adds a column "No renewal before" to the circulation and fine rules table. To test: 1) Add or edit some issuing rules. 2) Confirm that an empty entry, zero and non-numerical values for "No renewal before" are saved as undefined. 3) Confirm that numerical values can be entered and saved. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Martin Renvoize Signed-off-by: Brendan Gallagher commit 069bf086fbc3bb5bab4527c4b7a0cf31970b184d Author: Holger Mei?ner Date: Wed Feb 12 16:53:06 2014 +0100 Bug 7413: Add issuingrules.norenewalbefore to database Currently multiple renewals can be done in immediate succsession. To optionally prevent this, a new parameter "No renewal before" is introduced. This patch adds issuingrules.norenewalbefore to the database. Default value is NULL. To test: 1) Run installer/data/mysql/updatedatabase.pl 2) Create a SQL report like: SELECT * FROM issuingrules 3) Confirm that norenewalbefore was added after renewalperiod. Sponsored-by: Hochschule f?r Gesundheit (hsg), Germany Signed-off-by: Martin Renvoize Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 75 ++++++++++++++++++-- Koha/Schema/Result/Branch.pm | 19 ++++- Koha/Schema/Result/Issuingrule.pm | 11 ++- admin/smart-rules.pl | 10 +-- circ/circulation.pl | 6 ++ circ/renew.pl | 10 ++- installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 8 +++ .../en/modules/admin/preferences/circulation.pref | 2 +- .../prog/en/modules/admin/smart-rules.tt | 3 + .../prog/en/modules/circ/circulation.tt | 32 +++++---- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 ++++ .../prog/en/modules/members/moremember.tt | 12 ++-- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 26 ++++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 19 +++-- kohaversion.pl | 2 +- members/moremember.pl | 8 +++ opac/opac-user.pl | 17 ++++- t/db_dependent/Circulation.t | 16 ++++- t/db_dependent/Circulation_Issuingrule.t | 9 ++- 20 files changed, 241 insertions(+), 57 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 01:12:40 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Apr 2014 23:12:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-687-gea5040b 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 ea5040bad2d3d0d298a9b27a95b81e2a3d7a9ad0 (commit) via 007c94ff20a5c9d9c3121849b42f820a0da5b869 (commit) via 4bdd8d9a69f72751f0429be5bc58afdd218a4bb0 (commit) from 6813e560f70c5efa2e7697876ba52e47c83c447d (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 ea5040bad2d3d0d298a9b27a95b81e2a3d7a9ad0 Author: Jesse Weaver Date: Thu Mar 20 11:20:40 2014 -0600 Bug 11978 - Fix URLs displayed in OverDrive search OverDrive has recently changed its APIs to include "http://" in the URLs it returns. This patch removes the "http://" on the Koha end so they aren't doubled. Test plan: 1. Run an OverDrive search on the OPAC. 2. Check the links, they should start with "http://http://" 3. Apply this patch. 4. Rerun the search, the links should now be correct. Signed-off-by: Owen Leonard I can reproduce the problem and confirm that this patch fixes it. Signed-off-by: Katrin Fischer Patch removes hardcoded http:// from URLs in the Overdrive code. Trusting Jesse and Owen to have tested this with Overdrive, code review reveals no additional changes or possible problems. Signed-off-by: Galen Charlton commit 007c94ff20a5c9d9c3121849b42f820a0da5b869 Author: Marcel de Rooy Date: Fri Apr 4 17:11:15 2014 +0200 Bug 9075: Rename "type" to "material type" on OPAC XSLT detail and results The label Material type better describes what the icon presents. It is based on leader values of the MARC record. Revised Test Plan ----------------- 1) In the staff client, set the OPAC system preference OPACXSLTDetailsDisplay to 'default' and save. 2) In the staff client, set the OPAC system preference OPACXSLTResultsDisplay to 'default' and save. 3) In the staff client, set the OPAC system preference opacthemes to 'bootstrap' and save. 4) In the OPAC, search for biblio used in previous patch testing. -- It should display "Type:" 6) Look at the biblio details -- It should also display "Type:" 7) In the staff client, set the OPAC system preference opacthemes to 'prog' and save. 8) In the OPAC, search for biblio used in previous patch testing. -- It should display "Type:" 9) Look at the biblio details -- It should also display "Type:" 10) Apply the patch 11) In the staff client, set the OPAC system preference opacthemes to 'bootstrap' and save. 12) In the OPAC, search for biblio used in previous patch testing. -- It should display "Material type:" this time. 13) Look at the biblio details -- It should display "Material type:" this time. 14) In the staff client, set the OPAC system preference opacthemes to 'prog' and save. 15) In the OPAC, search for biblio used in previous patch testing. -- It should display "Material type:" this time. 16) Look at the biblio details -- It should display "Material type:" this time. 17) Run the koha qa test tool. Signed-off-by: Mark Tompsett Note: Just a simple string change. Signed-off-by: Katrin Fischer String change, works as advertised in staff, prog and bootstrap OPAC. Signed-off-by: Galen Charlton commit 4bdd8d9a69f72751f0429be5bc58afdd218a4bb0 Author: Marcel de Rooy Date: Mon Apr 11 11:46:44 2011 +0200 Bug 9075: Rename "type" to "material type" on staff XSLT detail and results The label Material type better describes what the icon presents. It is based on leader values of the MARC record. Revised Test Plan ----------------- 1) Set the Staff system preference XSLTDetailsDisplay to 'default' and save. 2) Set the Staff system preference XSLTResultsDisplay to 'default' and save. 3) Click 'Search the catalog' tab in the search area. 4) Search for something 5) Look for a biblio that has 942$c set to some type. -- It should display "Type:" Or take a result and modify it to have a 942$c. 6) Look at the biblio details -- It should also display "Type:" 7) Apply the patch 8) Search for the same biblio again. -- It should display "Material type:" this time. 9) Look at the biblio details -- It should display "Material type:" this time. 10) Run the koha qa test tool. Signed-off-by: Mark Tompsett Note: This is a simple string substitution. Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-overdrive-search.tt | 6 +++--- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 01:22:39 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Apr 2014 23:22:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-689-gf081537 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 f08153775f3ed210b219a3498395fa98a481d820 (commit) via fad3d646ff9f9ef3b9808e245f7d8b4077e63fa5 (commit) from ea5040bad2d3d0d298a9b27a95b81e2a3d7a9ad0 (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 f08153775f3ed210b219a3498395fa98a481d820 Author: Jonathan Druart Date: Tue Mar 18 16:01:07 2014 +0100 Bug 11855: remove unused template file members/search.tt is not in use anymore. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit fad3d646ff9f9ef3b9808e245f7d8b4077e63fa5 Author: Marcel de Rooy Date: Thu Feb 27 09:12:25 2014 +0100 Bug 11855: Tiny code cleanup in members [1] Template variable actionname is not used in the associated template. This could be a copy-paste from serials/member-search.pl. Consequently, the module is no longer needed in member.pl. Template members/search.tt still contains actionname; it seems that this emplate is not used too. [2] $template_name not used in members-home.pl. Test plan: [1] Go to Patrons. If you reach that page, you tested members-home.pl [2] Add a new patron. [3] Search for a patron. Edit one. Followed test plan. No problems found. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/search.tt | 21 -------------------- members/member.pl | 2 -- members/members-home.pl | 1 - 3 files changed, 24 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 01:26:12 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Apr 2014 23:26:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-690-g612b33a 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 612b33ae69adbed63e55c91f7314f6c2888f6d71 (commit) from f08153775f3ed210b219a3498395fa98a481d820 (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 612b33ae69adbed63e55c91f7314f6c2888f6d71 Author: Owen Leonard Date: Fri Feb 7 14:06:50 2014 -0500 Bug 11711 - Use new DataTables include in circ templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to all circ-related pages which use DataTables. Apply the patch and test the following pages to confirm that table sorting works correctly: - Circulation - The UseTablesortForCirc system preference must be enabled. - Check out to a patron with existing checkouts. Choose a patron who is a guarantor to another patron with checkouts in order to test the relatives' checkouts table. - The checkouts and relatives' checkouts tables have been modified to exclude articles when sorting of titles. - Hold ratios - The title column has been configured to exclude articles from sorting - Transfer to receive - Holds queue - The title column has been configured to exclude articles when sorting - The date column has been modified to use the title-string filter for sorting. An unformatted date is now passed from C4::HoldsQueue.pm to the template, where the KohaDates filter is used for formatting. Sorting is based on the unformatted date. - Holds awaiting pickup - The "available since" column has been configured for sorting on an unformatted date. waitingreserves.pl now passes the unformatted date to the template, and formatting is done using the KohaDates filter. - The title column has been configured to exclude articles when sorting. Edit: Rebased on current master following commit of Bug 11605 Signed-off-by: A. Sassmannshausen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 1 - circ/waitingreserves.pl | 2 +- .../prog/en/modules/circ/circulation.tt | 8 +++----- .../prog/en/modules/circ/reserveratios.tt | 7 +++---- .../prog/en/modules/circ/transferstoreceive.tt | 6 ++---- .../prog/en/modules/circ/view_holdsqueue.tt | 20 +++++++++----------- .../prog/en/modules/circ/waitingreserves.tt | 14 ++++++++------ 7 files changed, 26 insertions(+), 32 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 01:27:59 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 08 Apr 2014 23:27:59 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-691-g7349f84 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 7349f847fad28ada0eb98cd5ebb44d563d7ee0f7 (commit) from 612b33ae69adbed63e55c91f7314f6c2888f6d71 (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 7349f847fad28ada0eb98cd5ebb44d563d7ee0f7 Author: Owen Leonard Date: Mon Feb 10 12:26:34 2014 -0500 Bug 11734 - Use new DataTables include in batch modification templates Bug 10649 introduced a new include file for adding DataTables-related JavaScript assets. This patch adds use of this include file to the batch modification and batch deletion pages. Minor text changes: Corrected capitalization. Apply the patch and test the following: - On batch modification and batch deletion, submit multiple barcodes or item numbers. On the results page the title column has been configured to use the "anti-the" filter to exclude articles from sorting. Sorting on all columns should work correctly. Edit: Put back checkboxes plugin which was accidentally removed. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/js/pages/batchMod.js | 3 ++- .../intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 10 ++++------ .../intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 10 ++++------ 3 files changed, 10 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 23:37:58 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 09 Apr 2014 21:37:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-692-g7382bee 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 7382bee7cdcf289487dd8770add5412b7d44d11e (commit) from 7349f847fad28ada0eb98cd5ebb44d563d7ee0f7 (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 7382bee7cdcf289487dd8770add5412b7d44d11e Author: Mark Tompsett Date: Wed Apr 9 14:34:21 2014 -0400 Bug 12060: remove extraneous tags from header.inc By correcting the indentation, it became more apparent the two markup errors (stray and tags) that were generated by pasting the page source of PROTOCOL://STAFFCLIENT/cgi-bin/koha/tools/holidays.pl into http://validator.w3.org/check TEST PLAN --------- 1) Home -> Tools -> Calendar in the staff client 2) In another tab open http://validator.w3.org/check 3) Select Validate by Direct Input 4) In the staff client, view the page source 5) Copy the page source to the Validation text box in the other tab. 6) Click the 'Check' button. -- There will be 3 errors. 7) Apply the patch. 8) Refresh the staff client page. 9) Copy the revised page source into the validation text box. 10) click the 'Check' button. -- There will be 1 error. 11) Run the koha qa test tool. NOTE: This error is not in the intended file to fix. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer git diff --color -w HEAD^ reveals, that only a and a are removed by this patch, all other changes are whitespace. Passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/header.inc | 176 ++++++++++---------- 1 file changed, 87 insertions(+), 89 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 9 23:50:31 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 09 Apr 2014 21:50:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-693-g0837954 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 0837954cdda85549f5552dacefd3a5bc3e58292e (commit) from 7382bee7cdcf289487dd8770add5412b7d44d11e (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 0837954cdda85549f5552dacefd3a5bc3e58292e Author: Owen Leonard Date: Wed Apr 9 09:08:27 2014 -0400 Bug 12056: fix untranslatable strings in calendar In the calendar there are some strings in a JavaScript function which are not properly wrapped in a function for translation. This patch corrects this. This patch also corrects some minor validation issues and spelling and grammar issues, including those covered by Bug 12055. To test, apply the patch and view the calendar in Tools -> Calendar. When you hover your mouse over a day in the calendar you should see a title tooltip indicating what kind of day/holiday it is and showing the title of the holiday, if any. To test that the strings are now being picked up for translation, run translate update on a po file and confirm that the affected strings are now present: "Weekly holiday," "Yearly holiday," etc. Signed-off-by: Bernardo Gonzalez Kriegel Works well. New strings on translation file. No koha-qa errors. Signed-off-by: Katrin Fischer Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/holidays.tt | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 10 00:02:16 2014 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 09 Apr 2014 22:02:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.14.00-697-g9094b4a 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 9094b4a1bbff95e0f8e5747a805dacede165bc9a (commit) via 7dd0e9a41fd639e86ed32d98d863d605a6ba63e8 (commit) via c8085cb9c38f60b1152f4cf86c7ffcc82d3e8106 (commit) via 9bb5238bcf55c1dabb3c1e41eee582df888ea80b (commit) from 0837954cdda85549f5552dacefd3a5bc3e58292e (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 9094b4a1bbff95e0f8e5747a805dacede165bc9a Author: Owen Leonard Date: Wed Apr 9 12:41:24 2014 -0400 Bug 10865: (Follow-up) Add CSS style for form hints This patch adds a new "hint" class for displaying information relating to a form field. On the list edit screen the hint also has an alert class to highlight it. Signed-off-by: Katrin Fischer Passes all tests and QA script. Works as advertised. Tested with Bootstrap and prog theme. Some notes: - When OpacAllowPublicListCreation is turned off, the permissions don't show. - When OpacAllowPublicListCreation is turned off, we could also hide the Category pull down in the [new list] pop up, as there is only Private left as an option. - Maybe we should move the new list link outside of the tabs? When OpacAllowPublicListCreation is turned off, but public lists exist, the link 'new list' will still show on the public list tab, but a private list will be created. Signed-off-by: Galen Charlton commit 7dd0e9a41fd639e86ed32d98d863d605a6ba63e8 Author: Galen Charlton Date: Fri Feb 21 20:44:24 2014 +0000 bug 10865: (follow-up) allow patrons to make their public lists private when OpacAllowPublicListCreation is off This patch ensures that patrons continue to have the ability to make their public lists private for any public lists they control that were created before the library turned the OpacAllowPublicListCreation system preference off. To test: [1] Ensure OpacAllowPublicListCreation is on. [2] As a patron, create a public list in the OPAC. Also, create a private list. [3] Turn OpacAllowPublicListCreation off. [4] Back in the OPAC, verify that the public list can be edited and that there are drop-downs for category and permissions. Also verify that there is a warning that the patron cannot change it back if they convert a public list to private. [5] Edit the private list created in step 2. Verify that the category and permissions drop-downs are not displayed. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Broust Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit c8085cb9c38f60b1152f4cf86c7ffcc82d3e8106 Author: Jonathan Druart Date: Wed Feb 12 11:33:21 2014 +0100 Bug 10865: (follow-up) Move a li tag to avoid overlapping tags With this patch, a li tag is empty (only using the bootstrap theme) if the pref is disabled. Signed-off-by: Jonathan Druart Signed-off-by: Broust Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton commit 9bb5238bcf55c1dabb3c1e41eee582df888ea80b Author: Owen Leonard Date: Fri Sep 13 10:50:27 2013 -0400 Bug 10865: Don't show list permissions when adding public lists/sharing lists is not allowed If patron creation of public lists is disallowed by the OpacAllowPublicListCreation system preference the "category" option should be hidden altogether instead of showing a