[koha-commits] main Koha release repository branch master updated. v3.16.00-219-g5d6c092
Git repo owner
gitmaster at git.koha-community.org
Mon Jul 7 15:31:07 CEST 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 5d6c092921919526ade501facb1220f8a108a08f (commit)
via ac277edaaf3ece692146d669c94e1fd8c681ea68 (commit)
via 5dcb7435b7d0e720edc334c8eef7be875f2eb5d9 (commit)
via c53520d58d9073ab6ad2fbf74a1d1cccf7d8918d (commit)
via ebac54dfea4731eef0e5f7385aaf248d7adc0d35 (commit)
from 47de926463c7f50cde887dfa36895a125a09b7c8 (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 5d6c092921919526ade501facb1220f8a108a08f
Author: David Roberts <david.roberts at ptfs-europe.com>
Date: Mon Jun 30 12:22:46 2014 +0100
Bug 12495 - Include streetnumber in hold alert address
Steetnumber is not included in the addess in the hold alert add the
field to those displayed
To test this, place a hold on an item that is on-loan, having first made
sure that the requesting user has a value in the street number field of
his address. Check the item in, and an alert should appear giving the
name and address of the requesting user. This address should include the
contents of the street number address field.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I was able to confirm three of the four template changes for the
following cases:
- Item placed on hold for a patron at the current library, not waiting
- Item placed on hold for a patron at the current library, already
waiting
- Item placed on hold for a patron at another library, not waiting
I don't know how to trigger the case [% IF ( diffbranch ) %].
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes QA script and tests.
Note: Maybe sample slip templates should also include street number?
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ac277edaaf3ece692146d669c94e1fd8c681ea68
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Jul 1 11:29:56 2014 -0400
Bug 12511 - Novelist Select not using https in bootstrap
In prog we have:
[% IF ( NovelistSelectProfile ) %]
<script type="text/javascript"
src="https://imageserver.ebscohost.com/novelistselect/ns2init.js"></script>
[% END %]
but in bootstrap we have
[% IF ( NovelistSelectProfile ) %]
<script type="text/javascript"
src="http://imageserver.ebscohost.com/novelistselect/ns2init.js"></script>
[% END %]
Because bootstrap isn't using https, we get an error like this:
[blocked] The page at
'https://koha.mylibrary.com/cgi-bin/koha/opac-detail.pl?biblionumber=105315&query_desc=kw%2Cwrdl%3A%20home'
was loaded over HTTPS, but ran insecure content from
'http://imageserver.ebscohost.com/novelistselect/ns2init.js': this
content should also be loaded over HTTPS.
Test plan would require having a subscription to Novelist Select.
I think this is trivial enough to go without.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Very small change, trusting Kyle and the sign-off here.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5dcb7435b7d0e720edc334c8eef7be875f2eb5d9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Jul 6 19:04:15 2014 +0200
Bug 12062: Follow up - adds missing )
With this patch, patches pass QA script and unit tests.
Tested printing different slips successfully.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c53520d58d9073ab6ad2fbf74a1d1cccf7d8918d
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue Apr 29 16:31:15 2014 -0300
Bug 12062: Follow up to fix more untraslatable cases
This patch modifies staff printslip.tt to take into account
caller. Also fixes similar problem on opac printslip.tt
To test:
staff
1. Print hold transfer slip
2. Print transfer slip
3. Print member slip
opac
4. Print self checkout slip
5. Update translation files, check new strings are present
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ebac54dfea4731eef0e5f7385aaf248d7adc0d35
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue Apr 22 08:22:14 2014 -0300
Bug 12062: Untranslatable "Reserve not found"
This patch rewrites transfer slip code to make some
strings translatable.
Also simplifies some code and parameters.
To test:
1) Produce a transfer slip, no changes must be noted.
2) Update PO file, new strings
msgid "%s %s%s%sNo hold found%s %s %s "
msgid "%s%s%sNo hold found%s "
msgid "Koha › Circulation › Transfers"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
circ/hold-transfer-slip.pl | 15 +++------------
circ/returns.pl | 2 ++
circ/transfer-slip.pl | 2 +-
.../intranet-tmpl/prog/en/modules/circ/printslip.tt | 17 ++++++++++++-----
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 8 ++++----
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 4 ++--
members/printslip.pl | 3 ++-
opac/sco/printslip.pl | 2 +-
9 files changed, 28 insertions(+), 27 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list