[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-53-gb8c5192
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 8 09:47:35 CEST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.22.x has been updated
via b8c5192ec70e3b87644dd84cf87144370c2410bf (commit)
via 4ec4e13ed7a443c631943eeb57c9c591ece886b2 (commit)
via 120ee9461d780142832e455d316031b8fa88f285 (commit)
via 304b35fce9db1c53f3718b136eef249636526ce7 (commit)
via c45c6a3e6bef27410790dc50953c5aefd423a49f (commit)
via a14515ee0d768b0fe5e0cdb1569daa82adc4f714 (commit)
from c6a049167f9f1b4d4df81520900b23d2b9e0ea46 (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 b8c5192ec70e3b87644dd84cf87144370c2410bf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Mar 4 11:25:27 2016 +0100
Bug 13871: [QA Follow-up] Add $server for FID_SCREEN_MSG
When you are ready, you still see that small detail.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 617b72a54eb80fd7ea5e55be9484cf1dbf5e292f)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 4ec4e13ed7a443c631943eeb57c9c591ece886b2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Feb 27 14:40:44 2016 +0100
Bug 13871: [QA Follow-up] Adjust Patron Info Request
Conform QA comment, Patron Info request is slightly adjusted to be
consistent with changes to Patron Status request.
If the cardnumber is ok and the password is wrong, BL=N is reported but
also add 'Invalid password' in AF.
Additionally, an invalid card number is reported in AF.
Test plan:
[1] Send patron info request for invalid card.
[2] Idem for valid card, no password.
[3] Idem for valid card, good password.
[4] Idem for valid card, wrong password.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Verified by telnetting SIP server.
And tested additionally with the new unit test of bug 15956.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit b02aa7c4217ed75c42b95bd6af11a49472737144)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 120ee9461d780142832e455d316031b8fa88f285
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sat Feb 27 14:26:51 2016 +0100
Bug 13871: [QA Follow-up] Adjust Patron Status Request
Conform QA comment on Bugzilla, we do this:
[1] Attribute for overdrive mode/invalid credentials is not really needed.
We can always pass a screen message that card or password is invalid.
[2] If the cardnumber is correct and the password is wrong, we should
still honour the request. The bad password is recognized by BLN and
an additional message in AF.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Verified by telnetting SIP server.
And tested additionally with the new unit test of bug 15956.
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a32a5c4e0843ec8e08e8c75118f648cbbfdb762c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit 304b35fce9db1c53f3718b136eef249636526ce7
Author: Mason James <mtj at kohaaloha.com>
Date: Mon Mar 23 12:06:27 2015 +1300
Bug 13871 - OverDrive message when user authentication fails
NOTE: apply this patch after the additional perltidy patch
this patch is basically a small work-around to fix some confusing login text,
when users enter incorrect auth details via Overdrive's website
with this option disabled (default) there is no change to SIP's behaviour
to test...
1/ configure your overdrive account to talk to your Koha's SIP service
2/ start Koha's SIP
3/ enter a correct username and correct password in overdrive
see overdrive display '(1) Greetings from Koha' (good)
4/ enter a correct username and *incorrect* password in overdrive
see overdrive display '(1) Greetings from Koha' (bad)
5/ enter an incorrect username in overdrive
see overdrive display '(1)' (badder)
6/ apply patch, enable 'overdrive-mode' in Koha's SIPConfig.xml
example...
---------------------
<accounts>
<login id="kohasip" password="xxxxx" delimiter="|"
error-detect="enabled" institution="YYY" overdrive-mode="1" />
</accounts>
---------------------
7/ restart SIP
8/ enter a correct username and correct password
see overdrive display '(1) Greetings from Koha'
9/ enter a correct username and *incorrect* password
see overdrive display '(1) Invalid patron or patron password'
10/ enter an incorrect username and incorrect password
see overdrive display '(1) Invalid patron or patron password'
http://bugs.koha-community.org/show_bug.cgi?id=1387
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 8637627dc9c99b2f1e47b4748c7e4360dbaac5f1)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit c45c6a3e6bef27410790dc50953c5aefd423a49f
Author: Mason James <mtj at kohaaloha.com>
Date: Mon Mar 23 14:30:26 2015 +1300
Bug 13871: [TITLE_AMENDED] Additional changes
The original perltidy patch from Mason has been amended.
The perltidy itself has been moved to a separate patch with the current
perltidyrc applied.
As noted on Bugzilla, the original perltidy patch included some extra
changes:
[1] You prefix timestamp with Sip
This is not actually needed (it is imported), but if we should prefix it,
we should prefix now with C4::SIP::Sip. But you only changed two
occurrences (out of 26). So I remove these two changes.
[2] You remove the $server parameter from two calls of maybe_add:
A closer look at the remaining code tells me that $server is always
passed to maybe_add for FID_SCREEN_MSG. So this only left me the
current whitespace change.
But at least we documented what we did or did not, and why..
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit 42e731857d53134f91ecf0099ae6b7c13393166c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
commit a14515ee0d768b0fe5e0cdb1569daa82adc4f714
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Feb 26 09:42:13 2016 +0100
Bug 13871: Adjusted perl tidy on MsgType.pm
Run perltidy pro=xt/perltidyrc on the file.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
(cherry picked from commit a5babb0effb760aa1d0d9de83ce8bb690099678c)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/Sip/MsgType.pm | 2128 ++++++++++++++++++++++++-------------------------
1 file changed, 1064 insertions(+), 1064 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list