[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.01-33-g37d3810
Git repo owner
gitmaster at git.koha-community.org
Tue Jan 15 07:40:30 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.10.x has been updated
via 37d3810b496154b98419cd1fcdb07764d5890de3 (commit)
via affdc494888c28981b492bcd613c62169d71ede0 (commit)
via fd264ee585da8ef28b1f14d398132876af9c5cd4 (commit)
via ac08c9c7bb3620968ad4c56b3244189b8829f608 (commit)
via b7f0b6ed770ec2b72877f9cfaef80e59ac336a2b (commit)
via a9409025c0f7598d8d6c01edfbc24e28a75ea664 (commit)
via 4e52eedb525a8389ee5f53e18b309a3f5e344e10 (commit)
via 592b8c333611b6d3348d4900d1a2c73f0f4a8c1c (commit)
from e57c3c8bcb3d030cd8f7ca2b84800241e5d58123 (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 37d3810b496154b98419cd1fcdb07764d5890de3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Dec 31 11:41:19 2012 -0500
Bug 9215 - non translatable string in manage-marc-import
Status information about staged MARC record batches was being pulled
directly from the import_batches table where they are stored as English
strings. This patch puts a check on the status value into the template
so that translatable strings can be embedded.
To test, apply the patch and view both the table of staged MARC record
batches and details about individual batches. In the default 'en'
translation you should see import statuses displayed with a capital
letter ("Staged"). This indicates that the status is now being pulled
from the template.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit affdc494888c28981b492bcd613c62169d71ede0
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Fri Jan 4 17:07:40 2013 +0100
Bug 9182: fix on sortable columns on Saved reports
When displaying the Saved reports, since 3.10 the number of columns is
higher but the datasorter parameters have not been changed accordingly.
It's thus impossible to sort on the author or the creation date, for
example.
TEST PLAN :
1) Check sortable columns before applying : some useful columns are not
sortable, while the last columns are sortable (but don't need to be).
2) Once the patch is applied, the "non sortable" columns are the correct
ones.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Colums for saved reports are all sortable correctly now.
All tests and qa script pass.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit fd264ee585da8ef28b1f14d398132876af9c5cd4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Dec 28 09:51:46 2012 +1300
Bug 7143 updating history and about page
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
Changes look to be correct
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Conflicts:
docs/history.txt
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit ac08c9c7bb3620968ad4c56b3244189b8829f608
Author: Liz Rea <liz at catalyst.net.nz>
Date: Fri Dec 28 13:24:45 2012 +1300
Bug 6574 - js error in en-GB and en-NZ translations due to improper quoting
To replicate:
* install en-NZ translation (or en-GB)
* activate the new language, and select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* without the patch, the toolbar will be incorrect. The toolbar will also be incorrect on moremember.pl.
To test:
* apply the patch
* re-generate the en-NZ or en-GB translation
* activate the new language, or select it for use
* pretend you are going to issue a book to a member (search for a member from "check out" in header)
* with the patch, the toolbar will appear to be correct. It will also be correct on moremember.pl.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit b7f0b6ed770ec2b72877f9cfaef80e59ac336a2b
Author: Liz Rea <liz at catalyst.net.nz>
Date: Wed Dec 12 15:09:27 2012 +1300
Bug 8557 - Unexpected behavior with scanners
This is an alternative to the original implementation - this one works in chrome as well as firefox.
To test:
1)
Set syspref 'AcqCreateItem' to 'Create Item when receiving an order.'
2)
Create a basket for a vendor, add an order line.
3)
Search for this vendor using Vendor search
4)
Receive Shipment for this vendor and choose the title you ordered in 2)
5) You will get the dialog to create related item(s)
6)
Fill in Item 0 through o (see screenshot)
7)
Scan Barcode for field p - Barcode
7)
Result: Scanner sends a [return], form closes and you had no chance to fill in fields t - z
Signed-off-by: Marc Veron <veron at veron.ch>
Tested with Chrome Version 23.0.1271.97 m and Firefox 17.0.1, both behave as expected.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Tested with Firefox and Chromium in Ubuntu.
Additional test done:
1) Add a new subscription, choose 'receive adds items'
2) Receive an issue, fill out $p with a barcode
3) Make sure hitting enter in the barcode field does not send the form.
All tests pass and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit a9409025c0f7598d8d6c01edfbc24e28a75ea664
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Wed Nov 21 17:38:28 2012 +0100
Bug 9126: Do not return from Check too early.
If there is no errors, it should continue instead of returning true.
+ move a block of code at the end of Check function. This avoid
detaching and re-attaching a HTML block if there are errors.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
The following queries show us the issues:
select count(*) from items;
select * from aqorders_items where ordernumber=XX;
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
To test:
AcqCreateItem = receive
UniqueItemFields = barcode
1) Create a new basket
2) Create a new order with quantity > 1
3) Close the basket and create a new invoice/shipment
4) Receive only 1 item.
- Fill out the first item form with item type only. Click add.
- Don't change second item form at all.
- Click save.
Before patch:
2 items are created on the record, both with the selected itemtype.
After patch:
Only 1 item is created, which is correct.
Signed-off-by: Elliott Davis <elliott at bywatersolions.com>
Seems to work as described by the test plan
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 4e52eedb525a8389ee5f53e18b309a3f5e344e10
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Dec 14 14:40:14 2012 -0500
Bug 9292 - Remove dead code related to 'publictype'
This patch removes the superflous code related to 'publictype' which
is a key set for item hashes in some perl files. This key is never
used or stored.
Test Plan:
1) Apply patch
2) Test catalogue/detail.pl, opac/opac-detail.pl and opac/opac-user.pl
3) You should not see any changes in behavior
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
commit 592b8c333611b6d3348d4900d1a2c73f0f4a8c1c
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jan 9 10:40:24 2013 +0100
Bug 9065 - set correct permission for upload local cover image
This patch fixes a problem where if a staff user has the
upload_local_cover_images permission (and is not a superlibrarian
and does not have all of the tools permissions), trying to use the
"Tools -> Upload local cover image" will fail with "You do not have
permissions [...]".
To test after applying the patch:
- Create a staff uesr that has just the catalogue and
upload_local_cover_images permission.
- Log in as that staff user.
- Go to "Tools -> Upload local cover image".
- Verify that one is given the form to upload a cover image.
- Without the patch, one will be presented with the login
form instead.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
mysql> select * from permissions where code="upload_cover_images";
Empty set (0.00 sec)
mysql> select * from permissions where code="upload_local_cover_images";
+------------+---------------------------+---------------------------+
| module_bit | code | description |
+------------+---------------------------+---------------------------+
| 13 | upload_local_cover_images | Upload local cover images |
+------------+---------------------------+---------------------------+
1 row in set (0.00 sec)
"git grep upload_cover_images" returns 0 result.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
-----------------------------------------------------------------------
Summary of changes:
catalogue/detail.pl | 4 -
docs/history.txt | 163 ++++++++++----------
.../prog/en/includes/members-toolbar.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 +-
.../prog/en/modules/acqui/orderreceive.tt | 40 +++--
.../en/modules/reports/guided_reports_start.tt | 9 +-
.../prog/en/modules/serials/serials-edit.tt | 19 ++-
.../prog/en/modules/tools/manage-marc-import.tt | 38 ++++-
opac/opac-detail.pl | 5 -
opac/opac-user.pl | 7 -
tools/upload-cover-image.pl | 2 +-
11 files changed, 172 insertions(+), 122 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list