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.18.x has been updated
via 9d7e88e32582c9561d20d5931a9864ccbc381b7f (commit)
via 2776573ba695b817cb7f30bc93437d63b5c85043 (commit)
via 7b224a7d3557956666e95553c4e04ce93e42e1e9 (commit)
via 79b2b65fdc0fb6895c9161b616ed4db181ce6cb5 (commit)
via 2b0cb5b918b3fb456421fbd1bbcdfbe81365bb58 (commit)
via bc72ef5ccae6c0b0c42feaba09a410e5185d5bd4 (commit)
via 1b686528f78d31afec8fe9a446e6851f6561bde8 (commit)
via 2968de1c4e5fe523f1ed23d219908df9d8dfe9a8 (commit)
from c8bc1335664511def17dc40be57cba058e26d44b (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 9d7e88e32582c9561d20d5931a9864ccbc381b7f
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Tue Aug 18 18:10:37 2015 +0100
Bug 14655: Add a warning if the checkin will fail
On the checkin and checkout page, the checkin will fail if the patron
has requested the privacy and the AnonymousPatron is not correctly set.
This patch adds a warning message on both pages.
Test plan:
0/ Be sure you don't have any patron with privacy=2 (Never)
1/ Set OPACPrivacy, not AnonymousPatron
2/ Go on the checkin, you should a warning (same as before this patch).
3/ Set the privacy=2 for a patron
4/ Go on the circulation page, a warning should appear (for this
specific patron)
5/ Check an item out to this patron
6/ Check the item in on the checkin page.
The item is not checked in and you get a specific message for this
patron.
Confirm other/correct situations don't trigger the messages.
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <ve...@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@unc.edu.ar>
(cherry picked from commit cb2151529e0c2d031a01e68bd5deab26d2ffbaff)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit 625aec5b8541f8e83fa3bbea473616f90ab1396d)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit 2776573ba695b817cb7f30bc93437d63b5c85043
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Tue Sep 1 16:11:54 2015 +0200
Bug 14683: [QA Follow-up] Similar change for staff
Script memberentry.pl contained a similar line.
Solution is simpler here.
Test plan:
[1] Add, change or clear the sms number at staff side.
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit bdf4894c507f4bac6b2b79c7ca3b7a556d246ed5)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit c323e07c0c7ec403af15e40da7d82b997cb3eefc)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit 7b224a7d3557956666e95553c4e04ce93e42e1e9
Author: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Date: Fri Aug 28 09:13:09 2015 +0200
Bug 14683: [QA Follow-up] Mixup between mobile and smsalertnumber
This is an issue discussed on older reports already in the past.
Column mobile in borrowers is actually 'Other phone', not necessary a
mobile number. The name of the field is confusing. (Renaming it is
outside the scope of this report.)
The field that we are editing here is smsalertnumber. It should not be
compared with mobile at all.
What could be the side-effect of this correction?
===
First, the change is only relevant for libraries with pref SMSSendDriver
enabled.
In the past patrons editing their message preferences saw mobile (read:
other phone) in their smsalertnumber field (if the latter was still empty).
If they saved it, it was copied to smsalertnumber.
This change does not affect these patrons. They just have the same number
in two columns. No big deal.
What if a patron does not yet have a smsalertnumber? In that case no sms
is sent in Letters.pm. So no change in behavior. If he submits
opac-messaging now, he will no longer copy his other phone to smsalert [we
cannot assume that it was mobile anyway!]. If he enters a mobile number,
it will be saved correctly in the right field.
Conclusion: this change will not break things or hurt anyone. It only
prevents unwanted copying other phone to smsalertnumber.
Also modified the compare to prevent uninitialized warnings.
And removed a commented warn.
Test plan:
[1] Add, edit or delete the SMS number on opac-messaging regardless of
the value of Other Phone (in the badly named mobile field).
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 9b8d7168beb27342c4c483a0812e3a6789fabced)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit bc720464216eca9d5283596af23d2c2c926e7093)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit 79b2b65fdc0fb6895c9161b616ed4db181ce6cb5
Author: Joonas Kylmälä <j.kylm...@gmail.com>
Date: Wed Aug 19 11:42:50 2015 +0000
Bug 14683: Unable to clear SMS number
Enables to clear SMS number.
To test:
1. Go to opac-messaging.pl
2. Insert SMS number and submit
3. Clear SMS number and submit
4. Observe that the sms number did not change
5. Apply patch
6. Clear SMS number and submit
7. Observe that the sms number changes
Sponsored-by: Vaara-kirjastot
Signed-off-by: Marcel de Rooy <m.de.r...@rijksmuseum.nl>
Adding a follow-up.
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 5b1c7e4c359e974e5aca801579db72b356741a0f)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit 227d7b950e682300a7697ada4f6837a950f098e6)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit 2b0cb5b918b3fb456421fbd1bbcdfbe81365bb58
Author: Lari Taskula <la...@student.uef.fi>
Date: Thu Jul 30 18:34:49 2015 +0300
Bug 14621: Messaging preferences table needs to be sorted
I have been working with messaging preferences and I noticed a weird issue
in Firefox on Ubuntu.
On messaging preferences page, the table is unsorted and the content in
rows are generated randomly
on every page refresh. When you select/deselect checkboxes and refresh the
page (without posting the changes),
Firefox will remember your choices. Now the issue is that when the table is
unsorted and the rows keep
changing on page refresh, Firefox has trouble remembering your choices.
This makes it appear as if the
checkboxes are magically changing values on each page refresh.
Here is a patch that prevents this problem by sorting the messaging
settings.
Signed-off-by: Chris Cormack <chr...@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 46ac35f8e11c06a784ca309b0dc876aff9469edb)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit 6c44d1f4645b4c98577d6af23b05b9608b421253)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit bc72ef5ccae6c0b0c42feaba09a410e5185d5bd4
Author: Kyle M Hall <k...@bywatersolutions.com>
Date: Mon Aug 31 09:36:02 2015 -0400
Bug 14760: Disabled courses display in the course reserves list for items
If an item is on reserve for two courses but one of those courses is
disabled, both courses are still listed on opac-detail.pl!
Test Plan:
1) Enable course reserves
2) Create two courses
3) Place one item on reserve for both courses
4) Disable one of the two courses
5) View the record details for that record/item
6) You should see both courses listed in the course reserves column
7) Apply this patch
8) Reload the page
9) You should now only see the active course in the course reseves column
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <ve...@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 73e9dcb70fcf24dc87af7c5af6f38102206863ae)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit 9c31f1af9bb7b87dd794f40dd2bc7673b720c674)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit 1b686528f78d31afec8fe9a446e6851f6561bde8
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Tue Aug 4 10:38:29 2015 +0100
Bug 14470: Do not allow renew for on-site checkouts
At the opac, the renew checkbox should not be displayed if it's an
on-site checkout (same on the intranet).
On the way, this patch adds a specific message to the intranet if the
librarian try to renew an on-site checkout.
Indeed before this patch a renew was allowed if the barcode was scanned.
Test plan:
1/ Create an on-site checkout for a patron
2/ Confirm that the checkbox 'renew' is not displayed on the checkout
list tables
3/ At the OPAC, the renew should not be allowed (no checkbox)
4/ Try to check the item out to the same patron, confirm that you get a
specifig message to inform you the renew is not allowed for on-site
checkouts.
Signed-off-by: Mirko Tietgen <mi...@abunchofthings.net>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Changed 'issue' to 'item' in the error message.
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit ea92a92f5384c3256de55b770d31342f796edc47)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzy...@gmail.com>
Conflicts:
t/db_dependent/Circulation.t
(cherry picked from commit d1ce272dd2a5c75862db16d2b0682b0a9d654565)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
commit 2968de1c4e5fe523f1ed23d219908df9d8dfe9a8
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date: Wed Jul 15 11:50:18 2015 +0100
Bug 12525: Prevent adding several patron lists with the same name
If you add patron to a patron list, from the patron search result, a
list is created when you click on "Save".
The list is considered as new each time.
To reproduce:
1/ Launch a patron search
2/ Select 1 patron, and create a new list 'aaa'
3/ Select another patron and click Save again
2 lists are created
Test plan:
1/ Launch a patron search
2/ Select 1 patron, and create a new list 'aaa'
The dropdown list should be populated with this new list, and should be
selected
3/ Select another patron and click Save again
Only 1 list should be created
Signed-off-by: Chris Cormack <chr...@catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
Signed-off-by: Tomas Cohen Arazi <tomasco...@theke.io>
(cherry picked from commit 7f65aaac748833b57f9f1c8ae754d66c7e144d81)
Signed-off-by: Chris Cormack <ch...@bigballofwax.co.nz>
(cherry picked from commit faab5c4c2445b8a3454c17d2ab29fb65b601c0c9)
Signed-off-by: Liz Rea <wizzy...@gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 8 +++-
C4/Members/Messaging.pm | 3 ++
circ/returns.pl | 1 +
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 26 ++++++-------
.../prog/en/modules/circ/circulation.tt | 9 +++++
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 9 +++--
.../prog/en/modules/members/member.tt | 10 +++++
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 18 +++++----
members/memberentry.pl | 14 +++----
opac/opac-messaging.pl | 10 ++---
t/db_dependent/Circulation.t | 39 +++++++++++++++++++-
11 files changed, 105 insertions(+), 42 deletions(-)
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
