[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.02-62-g6fe65f1
Git repo owner
gitmaster at git.koha-community.org
Fri Feb 1 13:44:53 CET 2019
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, 18.11.x has been updated
via 6fe65f120ffcce7e182feb5bb7f9b425774857f7 (commit)
via 23665e562e9b7d9e5c27cb2cab8fa8fc59f54071 (commit)
via 17231a2c35f13bef2fc19551cb7c3c7110e5c438 (commit)
via 81c6172ee224f7432ec809f8a9cd17f9c4971ecc (commit)
via f087b9895eb97f29a5a712dfcb3d0946fd570afd (commit)
via ddbfc92aa601e672535c4478eb8e65e624a7d53f (commit)
via 582a84a6c7328efe78bbacaad293e4e21e6785ca (commit)
via 30895e2c561215fa7c094c9838021a0095a578ba (commit)
via c22928630ac2c00501b2bb17d60a3b2ba99481c5 (commit)
via fe56745739adcec6a7cb441ced3c359369aacca1 (commit)
via 80ebbb60996ac744f8717f8e68440b66964e1fc7 (commit)
from 2b8ba2e55874d2837c98a213afca0f4458767b05 (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 6fe65f120ffcce7e182feb5bb7f9b425774857f7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Feb 1 12:26:59 2019 +0000
Bug 21089: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5c547ffff2ca04a87695a57e972171cd76cc828c)
(rmaint recompiled for 18.11.x series)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 23665e562e9b7d9e5c27cb2cab8fa8fc59f54071
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jan 7 13:48:55 2019 +0000
Bug 21089: Overlapping elements in ordering information on acqui/supplier.pl
This patch changes the HTML structure of the vendor edit page so that
the markup is a little simpler. CSS is modified to match. This structure
should serve as a model for other similar form structures:
<fieldset class="rows">
<ol>
<li>
<label>General label:</label>
<label class="radio">
Specific label 1 <input type="radio" />
</label>
<label class="radio">
Specific label 2 <input type="radio" />
</label>
</li>
</ol>
</fieldset>
To test, apply the patch and regenerate the staff client CSS.
- Go to Acquisitions -> Vendor search -> Vendor -> Edit vendor
- In the "Ordering information" section, confirm that the position of
radio buttons looks correct.
- Confirm that radio button labels work correctly.
- Confirm that the adjacent dropdown menus work well.
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5c547ffff2ca04a87695a57e972171cd76cc828c)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 17231a2c35f13bef2fc19551cb7c3c7110e5c438
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jan 28 12:23:35 2019 -0300
Bug 21478: (QA follow-up) Make sure tests don't fail randomly
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit e33f125384694dd825965dffae8d2ca31840aecf)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 81c6172ee224f7432ec809f8a9cd17f9c4971ecc
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 25 13:49:37 2019 -0300
Bug 21478: Make Koha::Hold->suspend reject found holds
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 1d5934cae52dd96d9c5b8685a5f5531c69e92df8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f087b9895eb97f29a5a712dfcb3d0946fd570afd
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 25 13:48:54 2019 -0300
Bug 21478: Unit tests
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 92db2e74fd3cd761ae67d2f7573ee03d32d0a8ed)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ddbfc92aa601e672535c4478eb8e65e624a7d53f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Jan 25 12:48:04 2019 -0300
Bug 21478: Add Koha::Exceptions::Hold
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 11ce911915a237047d8168876849de3df2b3b2e0)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 582a84a6c7328efe78bbacaad293e4e21e6785ca
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 28 11:32:55 2019 +0000
Bug 21877: (RM follow-up) Move space into conditional
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5b4cbb1643aa20ada17c3f73df3e59dfc5a3dbd8)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 30895e2c561215fa7c094c9838021a0095a578ba
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jan 22 09:45:02 2019 +0100
Bug 21877: Use AuthorisedValues.GetDescriptionByKohaField for notforloan in checkout
Using only TT plugin for authorised value description is a better code.
Test plan :
Part 1:
1.1) On a catalog with items.notforloan defined with authorized values category NOT_LOAN
1.2) Define in NOT_LOAN an authorized values 1 with description 'at the beach'
1.3) Define in NOT_LOAN an authorized values 2 with description empty
Part 2:
2.1) Set preference 'AllowNotForLoanOverride' to 'Don't allow'
2.2) Edit an item with notforloan=1
2.3) Checkout this item => You see 'Item not for loan (at the beach)'
2.4) Edit an item with notforloan=2
2.5) Checkout this item => You see 'Item not for loan'
Part 3:
3.1) Set preference 'AllowNotForLoanOverride' to 'Allow'
3.2) Edit an item with notforloan=1
3.3) Checkout this item => You see 'Item is normally not for loan (at the beach)'
3.4) Edit an item with notforloan=2
3.5) Checkout this item => You see 'Item is normally not for loan'
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 36df53ad8d4987e938e478d934d553b73e7450f2)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit c22928630ac2c00501b2bb17d60a3b2ba99481c5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Jan 22 09:47:22 2019 +0100
Bug 21877: Show authorized value description for withdrawn in checkout
During checkout the withdrawn information is displayed in a message :
"Item has been withdrawn".
Like in other pages and like notforloan, we should display the withdrawn authorized value description.
This patch adds this display.
Add <span> so that translation does not change.
Also adds class 'co-withdrawn' (like in checkin 'ci-*' classes) to ease hidding this new information via CSS.
Test plan :
1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN
2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash'
3) Define in WITHDRAWN an authorized values 2 with description empty
4) Edit an item with withdrawn=1
5) Checkout this item => You see 'Item has been withdrawn (dropped in trash)'
6) Edit an item with withdrawn=2
7) Checkout this item => You see 'Item has been withdrawn'
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit cfd59672bb09c4766632de4c6f11cf9cf4bea3f9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fe56745739adcec6a7cb441ced3c359369aacca1
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Jan 24 14:57:46 2019 +0000
Bug 22203: Holds modal does not link to patorn account
To test:
1 - Place a hold for a patron
2 - Check the item in at the pickup location
3 - Note the holds modal does not link to patron
4 - Apply patch
5 - Check in item again
6 - Patron name in modal is a link
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 258c538e76914e6c2023242b555bb38c6f1970b9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 80ebbb60996ac744f8717f8e68440b66964e1fc7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jan 14 14:17:23 2019 +0000
Bug 21989: JS error in "Add orders from MARC file" - addorderiso2709.pl
This patch undoes the changes to addorderiso2709.tt introduced by Bug
19753. The item information tab can include embedded JavaScript for
cataloging plugins, and these don't currently work with JS in the
footer.
To test, apply the patch and test the JavaScript driven features of the
"Add to basket from a staged file" page:
- Acquisitions -> Vendor -> Basket -> Add to basket from a staged file
- MARC and Card previews, select all/clear all
- Item information tab: Cataloging plugins for fields like date
acquired, barcode
- Default accounting details tab: Show inactive control
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5ab46bc24573165e540a1a287ea3438637c938e3)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/Exceptions/Hold.pm | 69 ++++++++
Koha/Hold.pm | 24 ++-
circ/circulation.pl | 4 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 7 +
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 182 ++++++++++----------
.../prog/en/modules/acqui/supplier.tt | 110 +++++++-----
.../prog/en/modules/circ/circulation.tt | 14 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 4 +-
t/Koha/Exceptions.t | 23 ++-
t/db_dependent/Hold.t | 105 ++++++++++-
11 files changed, 383 insertions(+), 161 deletions(-)
create mode 100644 Koha/Exceptions/Hold.pm
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list