[koha-commits] main Koha release repository branch master updated. v3.16.00-944-g1cabaa3
Git repo owner
gitmaster at git.koha-community.org
Fri Nov 7 15:20:55 CET 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 1cabaa32b40f225dedfc969db02af596d7d22994 (commit)
via c96ab7d19dfe0733f924ba6bb4026c62a53e2a75 (commit)
via f12d7e6792fc9e3f44daf6c361f4c4b792ca34b6 (commit)
via f73add3d48d33eaf6d932068f8968d7eede34632 (commit)
via a503474346182f0cfdd35557fabefddee5ec80bb (commit)
via e26c8efbdbd4e240dc43f453a86277e55ae184f3 (commit)
via 1d7622a90ff73280e5e8bfa720963526c4ab2c0a (commit)
via 45eb7e6d4f55f66c7d0e1550d5d668844be8f4d4 (commit)
via 938ec10a4ae9ae8218e4a0bd88ede3e77b6f8ecd (commit)
via bb505d77f4acfde0d26974473d0099f31c2decc2 (commit)
via c4d3f572794704441ca4f42ac99887e1d0d4fd74 (commit)
via 4aa0e21f864ce0acd2895eddf127a133b9ae4d54 (commit)
via d14a0cf5be3f6d31a9d5d23748285d077426c300 (commit)
from 5a82616ab7fcaee9764d340756c6a2afe851658f (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 1cabaa32b40f225dedfc969db02af596d7d22994
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Nov 7 11:09:14 2014 -0300
Bug 8836: (RM followup) unit tests should use the new API
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c96ab7d19dfe0733f924ba6bb4026c62a53e2a75
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Nov 6 15:28:19 2014 -0300
Bug 8836: Update DBIx
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f12d7e6792fc9e3f44daf6c361f4c4b792ca34b6
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Nov 6 15:25:12 2014 -0300
Bug 8836: DBRev 3.17.00.047
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f73add3d48d33eaf6d932068f8968d7eede34632
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Nov 6 15:13:18 2014 -0300
Bug 8836: (RM followup) fix updatedatabase.pl rebase problem
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a503474346182f0cfdd35557fabefddee5ec80bb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 31 06:46:53 2014 -0400
Bug 8836 [QA Followup] - Prevent multiple collections from having the same title
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
This works, and so I'll sign off, but I'm not crazy about the workflow.
Having the error message display on an otherwise empty page is not user
friendly. The entry form should be redisplayed so that the user can
modify the data they submitted.
That really should be changed in a follow-up.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit e26c8efbdbd4e240dc43f453a86277e55ae184f3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Oct 31 09:04:43 2014 -0400
Bug 8836 [Alt QA Followup] - Add confirmation dialog for deleting collections
The previous patch for adding a confirmation dialog didn't work to make
the confirmation message translatable. This alternate patch uses a
progressive-enhancement method recycled from Guided Reports to trigger a
warning and highlight the row which was clicked.
To test, apply the patch and try to delete an existing rotating
collection. You should get a confirmation dialog, and the corresponding
row in the table should be highlighted red.
Clicking cancel should cancel the deletion. Clicking OK should complete
the deletion.
To test the translatability of the confirmation message:
Run perl translate update [a language code, e.g. 'en-GB']
Search [lang]-i-staff-t-prog-v-3006000.po for the message string
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1d7622a90ff73280e5e8bfa720963526c4ab2c0a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 31 08:18:28 2014 -0400
Bug 8836 [QA Followup] - Don't transfer in items already in transit
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 45eb7e6d4f55f66c7d0e1550d5d668844be8f4d4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 31 06:50:41 2014 -0400
Bug 8836 [QA Followup] - Sort transfer branches alphabetically
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Libraries sort correctly now.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 938ec10a4ae9ae8218e4a0bd88ede3e77b6f8ecd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Oct 31 06:24:20 2014 -0400
Bug 8836 [QA Followup] - Allow collection description to be optional
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Description is no longer made required by the template and an empty
description is saved correctly.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit bb505d77f4acfde0d26974473d0099f31c2decc2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Oct 30 12:42:07 2014 -0400
Bug 8836 [Template follow-up] Resurrect Rotating Collections
This follow-up makes drastic changes to the templates in order to bring
them into compliance with established patterns and markup guidelines.
Only minor changes are made to perl scripts.
Changes:
- Add a toolbar include for displaying new, edit, transfer, and delete
buttons.
- Improve title and breadcrumbs with collection titles and better
specificity.
- Correct page structure which was inconsistent with the markup of
similarly-structured pages.
- Correct styling of error and informational messages.
- Added detailed error messages for a couple of conditions which were
not defined in the template.
- Add link to the detail page of titles which are in a collection using
the view defined in the IntranetBiblioDefaultView preference.
- Add a link to remove an item from a collection directly without having
to scan the barcode.
- Add client-side validation to collection creation form.
- In RotatingCollections.pm, add biblionumber to the list of columns
returned by GetItemsInCollection.
- In rotating_collections/*.pl, remove obsolete declaration of system
preference variables.
To test, perform all the operations associated with Rotating
Collections:
- Add a new collection
- Edit an existing collection
- Add items to a collection
- Remove items from a collection (via barcode and link)
- Test the behavior of all new toolbar buttons
- Verify that titles and breadcrumbs look correct and links work
correctly.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c4d3f572794704441ca4f42ac99887e1d0d4fd74
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Oct 30 06:58:42 2014 -0400
Bug 8836 [QA Followup 2]
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4aa0e21f864ce0acd2895eddf127a133b9ae4d54
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 15 10:46:28 2014 -0400
Bug 8836 [QA Followup] - Fix koha-qa.pl errors reported
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Trusting the sign off on the other page, I only tested the QA changes
Signed-off-by: Cindy Murdock Ames <cmurdock at ccfls.org>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit d14a0cf5be3f6d31a9d5d23748285d077426c300
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Aug 15 16:46:03 2014 +0300
Bug 8836 - Resurrect Rotating Collections
Test Plan:
In "Tools" -> "Rotating Collections" -> "Add/Remove items":
When adding item barcodes to the collection, the input field
<input type="text" id="barcode" name="barcode">
should become active
automatically so it is easy to add multiple barcodes rapidly without touching the
mouse or keyboard.
Enter-press is dealt by the barcode reader so automatic form submittal should be handled
by the barcode reader.
In "Rotating collections" -> "Transfer Collection":
When the collection is initially transferred, items are set to trasfer correctly.
When the collection is transferred while items are still being transferred, the transfer
destination library doesn't change from the original one.
The holding library changes for all items in the collection to the destination library on
retransfers as well.
This is tricky if a user accidentally places the wrong destination.
When I try to checkin these items to their new retransfer location, I get the following messages:
-"This item is part of a rotating collection and needs to be transferred to <original transfer destination>"
-"Please return Valkoinen ihmissyj / to <original transfer destination>"
-"Print slip or Cancel transfer"
When I checkin a Item to a arbitrary branch, I get the following messages:
"This item is part of a rotating collection and needs to be transferred to <retransfer destination>"
"Please return Valkoinen ihmissyj / to <original trasfer destination>"
Bug 8836 - Resurrect Rotating Collections - QA Followup
Bug 8836 - Resurrect Rotating Collections - Followup 2 - Perltidy rotating collections scripts
Bug 8836 - Resurrect Rotating Collections - Followup 3
* Fix bad TT Tag
* Fix bad sql query
* Fix capitalization ( HTML4 )
* Allow a rotating collection's location to keep AutomaticItemReturn
from sending it back to the branch of origin
* Fix bad query
Bug 8836 - Resurrect Rotating Collections - Followup 4 - Autofocus on barcode field
Bug 8836 - Resurrect Rotating Collections - Followup 5 - Don't transfer issued and waiting items
Items in a rotating collection are automatcially transferred when a
collection is transferred. This is a problem for currently checked out
items and items on hold marked as "Waiting".
This patch resolves this issue by skipping the transfer for those items.
When the items are then returned, the librarian will be alerted to
transfer the item to the library currently holding that rotating
collection.
Bug 8836 - Resurrect Rotating Collections - Followup 5 - Link collections.colBranchcode to branches.branchcode
Signed-off-by: jmbroust <jean-manuel.broust at univ-lyon2.fr>
Signed-off-by: Cindy Murdock Ames <cmurdock at ccfls.org>
http://bugs.koha-community.org/show_bug.cgi?id=8835
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 5 +-
C4/RotatingCollections.pm | 477 +++++++++++---------
Koha/Schema/Result/Branch.pm | 19 +-
Koha/Schema/Result/Collection.pm | 34 +-
circ/returns.pl | 32 +-
installer/data/mysql/kohastructure.sql | 8 +-
installer/data/mysql/updatedatabase.pl | 84 ++--
.../intranet-tmpl/prog/en/css/staff-global.css | 4 +-
.../en/includes/rotating-collections-toolbar.inc | 17 +
.../intranet-tmpl/prog/en/includes/tools-menu.inc | 2 -
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../en/modules/rotating_collections/addItems.tt | 180 +++++---
.../rotating_collections/editCollections.tt | 229 +++++-----
.../rotating_collections/rotatingCollections.tt | 92 ++--
.../rotating_collections/transferCollection.tt | 88 ++--
.../prog/en/modules/tools/tools-home.tt | 4 +-
kohaversion.pl | 2 +-
rotating_collections/addItems.pl | 127 +++---
rotating_collections/editCollections.pl | 154 ++++---
rotating_collections/rotatingCollections.pl | 33 +-
rotating_collections/transferCollection.pl | 80 ++--
t/db_dependent/RotatingCollections.t | 130 ++++--
22 files changed, 1008 insertions(+), 795 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/rotating-collections-toolbar.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list