[koha-commits] main Koha release repository branch master updated. v3.16.00-776-gca756f4
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 27 15:11:19 CET 2014
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 ca756f44d76df3074b4b53c97898f26ede65a711 (commit)
via 5ff9f513ed6b901099571c89cd716f9248332729 (commit)
via 42efe724f778c6db0c3147776564bf16264b2c87 (commit)
via 84be3e77091b99c60b244d8981301f18a73c0995 (commit)
via 61ad4b235777e5eaa82c265b96e90fccf472e3be (commit)
via 8c6cc211b5b3fc6140b2f82cada29565a10b4dbd (commit)
via 75a9f6a4a0e17c18f8a1bd805f9e0ed5f59ccec7 (commit)
via b99a99b45c15b06c5f0985685818c6a8d8bf65ff (commit)
via a063067b91f3d08e7e58fdc9d059fcaee4ab4225 (commit)
via a40dc1758f7566ee767cf3ffa8a67a25786db02d (commit)
via 9a2553625ec93119f4c7cec1a9a3bb9df12d7231 (commit)
via 0c161a9a66c3353a14240490471e17c816d8a5be (commit)
via 49fee3a72d22ce4982ceac7ba047fb43d547d538 (commit)
via 57c9ec4854e2bee18724a7a87151c0d019b21f21 (commit)
via 8c8fb358640b38bacb0200cd5c5c11c45affdd21 (commit)
via 2d9fbadcad7710ed7616cf0ee376812102936163 (commit)
via cf8dcf8e0c37450f98befa4f841afe1482c8c8ca (commit)
via e949eba409338efc68432fb47c8f9c9902679c78 (commit)
via 9b01fd97ea323b00629709d04f50cdd27e45dfa5 (commit)
via f918d29e38825ca2c8f69c362c61d1c8f0b517b7 (commit)
from 91eb4252c7a120a6137123175e331dbe2f79dd77 (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 ca756f44d76df3074b4b53c97898f26ede65a711
Author: Petter Goksoyr Asen <boutrosboutrosboutros at gmail.com>
Date: Thu Jul 17 10:55:20 2014 +0200
Bug 12590 - Support deletion of biblio in svc API
The /svc endpoint allows you to create and update biblio records.
This patch extends it so that it is also possible to delete a biblio.
Test plan
* Create a new biblio by sending a POST request to /svc/new_bib with a
marcxml record as request body. Note the biblionumber it gets assigned.
* Make some changes to the marcxml record, and update it by sending
a POST request to /svc/bib/{bibilonumber}
* Observe that the changes are persisted on the biblio record.
* Now delete the bilblio by sending a DELETE request to
/svc/bib/{biblionumber}
* Observe that the biblio is indeed gone from the db.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
This works as described and passes tests and QA script.
I tested using curl for a record with and one without items:
curl -X DELETE 'http://localhost:8080/cgi-bin/koha/svc/bib/2' --cookie /tmp/svc.cookies
<?xml version='1.0' standalone='yes'?>
<response>
<error>This Biblio has items attached, please delete them first before deleting this biblio </error>
</response>
curl -X DELETE 'http://localhost:8080/cgi-bin/koha/svc/bib/3' --cookie /tmp/svc.cookies
<?xml version='1.0' standalone='yes'?>
<response>
<status>OK, biblio deleted</status>
</response>
The deletion is processed correctly and the indexes are updated.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5ff9f513ed6b901099571c89cd716f9248332729
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Sep 4 10:26:51 2014 +0200
Bug 12871 - wthdrawn instead of withdrawn in ILSDI
Bug 10550 as renamed items.wthdrawn into items.withdrawn.
This change was missing in ILSDI/Services.pm
Test plan :
Test ILSDI webservice GetAvailability on a item with items.withdrawn > 0.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixes what seems to be the last occurence of wthdrawn.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 42efe724f778c6db0c3147776564bf16264b2c87
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Sep 15 10:02:10 2014 -0300
Bug 12900: (consistency followup) add buildBiblioDefaultViewURL to MARC21 XSLT
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Works as described, tested in UNIMARC and MARC21.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 84be3e77091b99c60b244d8981301f18a73c0995
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Sep 15 10:16:31 2014 -0300
Bug 12900: IntranetBiblioDefaultView doesn't do anything with NORMARC or UNIMARC XSLT
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 61ad4b235777e5eaa82c265b96e90fccf472e3be
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 23 14:26:39 2014 -0400
Bug 13138: Remove jQuery plugins which were used by Solr
This patch removes two jQuery plugins which were used only by
Solr-related templates. With the removal of Solr these plugins are
obsolete.
To test, search the Koha code for references to the two plugins:
jquery.textarea-expander.js
tablednd.js
There should be none.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Couldn't find any references. Also passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8c6cc211b5b3fc6140b2f82cada29565a10b4dbd
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Oct 27 10:46:05 2014 -0300
Bug 9530: Update DBIx
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 75a9f6a4a0e17c18f8a1bd805f9e0ed5f59ccec7
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Oct 27 10:43:23 2014 -0300
Bug 9530: DBRev 3.17.00.032
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b99a99b45c15b06c5f0985685818c6a8d8bf65ff
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Sep 30 06:18:27 2014 +0000
Bug 9530: Replace tabs with spaces
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a063067b91f3d08e7e58fdc9d059fcaee4ab4225
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 10:18:47 2014 +1200
Bug 9530 Making changes to misc/cronjobs/runreport.pl
Note: mail from this doesnt work in current master, so you may not
be able to test this fully
To Test
1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault)
2/ Optionally edit the branch the mail will be sent from, adding email addresses
3/ Test sending a mail from scheduled reports, note you will need to have the fix
for 12031 applied
4/ Check that the mails have the correct From, Replyto and ReturnPath set
The rules are
If the values are set in the branch use that, else use the syspref
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a40dc1758f7566ee767cf3ffa8a67a25786db02d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 10:21:32 2014 +1200
Bug 9530 making changes to virtualshelves/sendshelf.pl
To Test
1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault)
2/ Optionally edit the branch the mail will be sent from, adding email addresses
3/ Send a list from the staff client
4/ Check that the mails have the correct From, Replyto and ReturnPath set
The rules are
If the values are set in the branch use that, else use the syspref
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9a2553625ec93119f4c7cec1a9a3bb9df12d7231
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 10:19:39 2014 +1200
Bug 9530 making changes to opac/opac-sendshelf.pl
To Test
1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault)
2/ Optionally edit the branch the mail will be sent from, adding email addresses
3/ Send a list from the public (OPAC) interface
4/ Check that the mails have the correct From, Replyto and ReturnPath set
The rules are
If the values are set in the branch use that, else use the syspref
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 0c161a9a66c3353a14240490471e17c816d8a5be
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 10:19:14 2014 +1200
Bug 9530 making changes to opac/opac-sendbasket.pl
To Test
1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault)
2/ Optionally edit the branch the mail will be sent from, adding email addresses
3/ Send a cart from the public site (OPAC)
4/ Check that the mails have the correct From, Replyto and ReturnPath set
The rules are
If the values are set in the branch use that, else use the syspref
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 49fee3a72d22ce4982ceac7ba047fb43d547d538
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 10:18:12 2014 +1200
Bug 9530 making changes to basket/sendbasket.pl
To Test
1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault)
2/ Optionally edit the branch the mail will be sent from, adding email addresses
3/ Test some mails, test sending a cart email from the staff client
4/ Check that the mails have the correct From, Replyto and ReturnPath set
The rules are
If the values are set in the branch use that, else use the syspref
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 57c9ec4854e2bee18724a7a87151c0d019b21f21
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 09:54:48 2014 +1200
Bug 9530: Making changes to C4::Letters
So notices using it (circulation, holds etc) will now use the new behaviour
To test:
1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault)
2/ Optionally edit the branch the mail will be sent from, adding email addresses
3/ Test some mails, a circulation alert, an acquisitions claim, or a newly created borrower alert
4/ Check that the mails have the correct From, Replyto and ReturnPath set
The rules are
If the values are set in the branch use that, else use the syspref
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8c8fb358640b38bacb0200cd5c5c11c45affdd21
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 09:57:06 2014 +1200
Bug 9350: Making changes so that you can add the new fields to branches
To test
1/ Apply patch
2/ Add or Edit a branch, filling out the new fields
3/ Check that the changes saved
http://bugs.koha-community.org/show_bug.cgi?id=9530
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 2d9fbadcad7710ed7616cf0ee376812102936163
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Aug 12 09:53:44 2014 +1200
Bug 9530: Adding a new Koha::Email module
To test
1/ Apply patch
2/ run t/Koha_Email.t
No changes to behaviour have been implemented yet
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit cf8dcf8e0c37450f98befa4f841afe1482c8c8ca
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed May 28 12:12:00 2014 +1200
Bug 9530: Adding sysprefs and making changes to the branch table
To allow for separate Reply To and From email addresses for notices
This patch will make no functional changes, it just sets up the db
changes needed.
To Test:
Apply patch, upgrade DB, make sure everything still works fine
(Or wait to test with following patches)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e949eba409338efc68432fb47c8f9c9902679c78
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 4 10:56:34 2014 +0200
Bug 12031: [QA Follow-up] Undefined routine and change to koha-conf.xml
[1] Routine add_cron_job was added in 2007 but has not been defined.
Parameter Recurring is not used.
[2] Made some changes to koha-conf.xml. Instead of an example to edit,
I replaced it by the SCRIPT_NONDEV_DIR install variable.
[3] SCRIPT_NONDEV_DIR had to be included in rewrite-config.pl and the
path had to be corrected for dev installs in Makefile.PL
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested single and dev install for supportdir change.
Compared installations with and without the patches for this report.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9b01fd97ea323b00629709d04f50cdd27e45dfa5
Author: Liz Rea <liz at catalyst.net.nz>
Date: Thu Jul 10 12:08:40 2014 +1200
Bug 12031: (QA followup) adding supportdir to koha-conf.xml
By adding a supportdir, this allows for configuring use in a
non-package install environment, such as git.
Seeing as I only tested git, I clearly had this defined.
Further testing should include packaging up an installation, and
installing a package version without setting the supportdir
configuration value.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f918d29e38825ca2c8f69c362c61d1c8f0b517b7
Author: Liz Rea <liz at catalyst.net.nz>
Date: Thu Apr 3 14:49:16 2014 +1300
Bug 12031: Task Scheduler not sending mail
At some stage the runreport.pl cronjob was changed to accept longopts, but the scheduler script wasn't changed along with it. This patch fixes the mismatch.
To test:
1. make sure that your user is not in at.deny, and (if applicable/necessary) is in at.allow
1.5 test this on a package install, sending mails will still not work for git installs, even with this patch.
Useful, but not required step: make sure email can be sent from your server, also helpful is access to the Koha user's mail box (to see the bounce messages)
2. create a saved sql report to run
3. Go to Tools -> Task Scheduler and schedule a job to be run, and results emailed to you
4. note that you do not (without the patch) get an email. Make a note of the command it reports it is going to run.
5. apply the patch
6. schedule another job, you will notice that the command to run the scheduled job is slightly changed compared to the one in step 4.
7. Receiving an email when your job runs means the patch worked. Seeing --format= and --to= in the command also means the patch worked, as this is the command that runreport.pl is expecting.
8. Run the koha QA test tool.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
NOTE: The line that changes is visible in the bottom section,
"Jobs already entered", with the corrected parameters and
path used. If you do not have the <supportdir> config
parameter set up in koha-conf.xml, it defaults to the
typical package path. If you have the parameter set up,
the path given matches what you tell it. Only tested in
git.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Branch.pm | 10 +-
C4/ILSDI/Services.pm | 2 +-
C4/Letters.pm | 91 +++--
Koha/Email.pm | 65 ++++
Koha/Schema/Result/Branch.pm | 18 +-
Makefile.PL | 4 +-
admin/branches.pl | 2 +
basket/sendbasket.pl | 9 +-
etc/koha-conf.xml | 4 +
installer/data/mysql/kohastructure.sql | 2 +
installer/data/mysql/updatedatabase.pl | 15 +-
.../lib/jquery/plugins/jquery.textarea-expander.js | 95 -----
.../prog/en/lib/jquery/plugins/tablednd.js | 382 --------------------
.../prog/en/modules/admin/branches.tt | 2 +
.../prog/en/modules/admin/preferences/admin.pref | 10 +
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 29 +-
.../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 21 ++
.../prog/en/xslt/NORMARCslim2intranetResults.xsl | 12 +-
.../prog/en/xslt/NORMARCslimUtils.xsl | 21 ++
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 16 +-
.../prog/en/xslt/UNIMARCslimUtils.xsl | 21 ++
kohaversion.pl | 2 +-
misc/cronjobs/runreport.pl | 26 +-
opac/opac-sendbasket.pl | 18 +-
opac/opac-sendshelf.pl | 12 +-
rewrite-config.PL | 1 +
svc/bib | 25 +-
t/Koha_Email.t | 11 +
tools/scheduler.pl | 36 +-
virtualshelves/sendshelf.pl | 54 +--
30 files changed, 404 insertions(+), 612 deletions(-)
create mode 100644 Koha/Email.pm
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.textarea-expander.js
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/tablednd.js
create mode 100755 t/Koha_Email.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list