[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.00-39-g1be884f
Git repo owner
gitmaster at git.koha-community.org
Fri Dec 13 15:56:21 CET 2013
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.14.x has been updated
via 1be884fe173c8b9d01e9038a1e74237db76f32fd (commit)
via a158c041c013fa5757a96c00b77abb79eea49a6a (commit)
via 0085c124c15d5bfa043bc06549026fd4a4c1b076 (commit)
via 7f0de3d0bbad4d3ffe34e39f8372d5e65a2fc921 (commit)
from d173c41a869f60ba89077f2a3425d66919d80e81 (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 1be884fe173c8b9d01e9038a1e74237db76f32fd
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Dec 2 16:17:21 2013 +0000
Bug 7791: (follow-up) adjust wording of basket deletion confirmation dialog
This patch uses "bib" and "bibliographic record" rather than just
"record"; "record" is not quite specific enough in this context.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 15b86a38edd26eb03fb6d2d7b1b28f47df19370e)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit a158c041c013fa5757a96c00b77abb79eea49a6a
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Fri Oct 18 11:44:39 2013 +0200
Bug 7791: (follow-up) add warning after deletion if some records were not deleted
This followup add some warnings after deletion if some items were not
deleted.
4 types of messages are possible :
- x item(s) attached.
- x subscription(s) attached.
- x order(s) attached.
- Unknown error.
To test :
test a
1. create a basket with
- an order using a record A which has already an item, which is used in
a subscription, and in other order (in an other basket)
- an order using a record B used nowhere elese
2. click on "Delete basket"
3. choose button "Delete basket, orders and records"
4. you should see a page anouncing basket deletion, and that record A was
not deleted because of its item, subscription and order.
5. check the link around the title of record B takes you to the record
6. check the link under the warning box ("Click here to go back to
booksellers page") takes you to booksellers page
5. check record B is deleted
test b
1. suppress the subscription linked with record A
2. create an other basket using record A
3. delete the basket on the same way as for test a
4. you should see a page anouncing basket deletion, and that record A was
not deleted because of its item and order
test c
1. suppress the item attached under record A
2. create an other basket using record A
3. delete the basket on the same way as for test a
4. you should see a page anouncing basket deletion, and that record A
was not deleted because of its orderBug 7791 Followup: add warning
after deletion if some records were not deleted
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit de2bfb6799f718a75eb338490b1cee8f8145b6a8)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit 0085c124c15d5bfa043bc06549026fd4a4c1b076
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Thu Sep 19 10:57:44 2013 +0200
Bug 7791: (follow-up) tidy up some cruft in the main patch
This patch
- delete warns
- add a missing }
- add a condition in template of avoiding asking to delete orders or
records if the basket is empty
To test :
1. Make the same tests as defined in test plan of main patch. It should
behave the same way
2. Try to delete a basket with no records inside. You will only have a
"Delete basket" button, with fewer warnings
Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2c307f3e92d6e4051a37f19bb17f60f45fded9d9)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
commit 7f0de3d0bbad4d3ffe34e39f8372d5e65a2fc921
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date: Thu Sep 19 09:59:31 2013 +0200
Bug 7791: add ability to delete records when deleting a basket
Currently, when a basket is deleted, all the orders are deleted (there
is a foreign key in aqorders table on basketno).
This could be dangerous, and there is no warning.
After the deletion, unused biblios are left in the catalogue.
This patch
- adds a more detailed message describing the consequences of deletion
- give the choice of also deleting biblio records if possible
To test :
Test A :
1. create a basket with 4 orders:
- an order from a new record A
- an order from a record B which has already an item
- an order from a record C used in a subscription
- an order from a record D used in an other order
2. note the biblionumbers of the records used (or open them in other
tabs in your browser)
3. click on "Delete basket"
4. choose button "Delete basket and orders"
5. check the catalogue : records A,B,C,D should still be there
Test B:
1. create a basket with 4 orders:
- an order from a new record A
- an order from a record B which has already an item
- an order from a record C used in a subscription
- an order from a record D used in an other order
2. note the biblionumbers of the records used (or open them in other
tabs in your browser)
3. click on "Delete basket"
4. choose button "Delete basket, orders and records"
5. check the catalogue : records B,C,D should still be there. Record A
should be deleted
Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 09953f836de01a68a3117227965719b74f543844)
Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
acqui/basket.pl | 38 ++++++++++-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 68 ++++++++++++++++----
2 files changed, 93 insertions(+), 13 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list