[koha-commits] main Koha release repository branch 3.16.x updated. v3.16.08-24-g66c618f
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 27 03:17:52 CET 2015
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.16.x has been updated
via 66c618f274648c1502c521bce856b0055f196fb5 (commit)
via 3e5ce93c61e7c4243145b023f9b27c7c0ac21e2d (commit)
via fd9c42f16f6754efe1d05ea641edb8acb99b3598 (commit)
via 8de899bf5e84b9d6c23a905a0a038931348659f2 (commit)
via 7d20f176ce76784d7c81399e5555f436656fd25f (commit)
via 5e6352ca125c833158458c6f6a6f4f946e8ae73d (commit)
via fae0ac954a3cd7d8d90786a75c508fa158309313 (commit)
via e7cde4cc20b3326b044a8d334f4b928d70845115 (commit)
via 4acaa82fa101f892bab1e7e95db8d1ebcf286ea0 (commit)
from 28128c034f60e3e771409673133c6dfd27852965 (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 66c618f274648c1502c521bce856b0055f196fb5
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sat Mar 7 22:22:53 2015 +0100
Bug 13785: (QA followup) koha-disable should stop the indexer daemon
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 3e5ce93c61e7c4243145b023f9b27c7c0ac21e2d
Author: Larry Baerveldt <larry at bywatersolutions.com>
Date: Tue Mar 3 07:33:21 2015 -0800
Bug 13785: koha-disable should also stop SIP and zebra for instance
Currently koha-disable ONLY disables the instance in the apache conf
file. Presumably if you want to disable the instance, you also want
its processes to stop, so this patch will stop zebra, if running,
and SIP, if enabled.
Depends on Bug 13784.
To Test:
1) Have an enabled instance, with zebra and SIP running.
2) Run koha-disable INST. Note that after, both zebra and SIP
will still be running.
3) Re-enable INST.
4) Apply patch, and then copy debian/scripts/koha-disable to
package site, over /usr/sbin/koha-disable.
5) Run koha-disable INST. You should now see that both zebra
and SIP have been stopped.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit fd9c42f16f6754efe1d05ea641edb8acb99b3598
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date: Tue May 6 11:20:59 2014 +0300
Bug 11364: Label layout types and text justification types are not translatable
To test:
1) cd misc/translator
2) perl translate update xx-YY
3) check that there's no msgids that contain the layout types or
text justification types in po/xx-YY-i-staff-t-prog-v-3006000.po
4) apply patch
5) perl translate update xx-YY
6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
msgid for the frequencies. (search for "BLOCK translate_label_types"
and "BLOCK translate_justification_types")
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 8de899bf5e84b9d6c23a905a0a038931348659f2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Mar 6 11:08:41 2015 +0100
Bug 13804 - Returns via the checkouts tables uses the phrase "Returned" rather than "Checked in"
Test plan:
1) Apply this patch
2) Return an item via the checkouts table
3) Note the left most column now reads "Checked in" rather than "Returned"
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 7d20f176ce76784d7c81399e5555f436656fd25f
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Mon Jun 23 16:51:00 2014 +0200
Bug 12631: Inventory: fix "wrong place" and "item not scanned"
"item not scanned": when calling GetItemsForInventory, datelastseen should
be used when "compare barcodes list to result" is checked.
Otherwise, when loading multiple barcodes files for the same inventory, many
items will be marked as "item not scanned" when loading the last barcode file
("compare barcodes list to result" checked) even though they were scanned.
"wrong place": when searching for wrongly placed items, we should only check
for the location (callnumbers, location and branch). To fix this, A new call
to GetItemsForInventory has been made with location filters only.
Otherwise, any item with a different itemtype for instance will be marked as
wrong place even if the location is correct.
Test plan:
"item not scanned" status:
1) Split a barcode file in two.
2) Load the first barcode file without checking "compare barcodes list to result".
3) Load the second barcode file with "compare barcodes list to result" checked.
4) Check in the csv report that you have a lot of scanned items with the "item
not scanned" status.
Then apply the patch, do the same, and check that the false "item not scanned"
statuses are gone.
"wrong place" status:
1) Load a barcode file with barcode matching an item that has a correct
location, but a different itemtype than what you're looking for.
2) Check in the results that this item will be marked as "change item status"
and "wrong place".
Then apply the patch, do the same, and check that the only status for this item is "change item status", which is correct.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 5e6352ca125c833158458c6f6a6f4f946e8ae73d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Feb 25 12:24:20 2015 +0100
Bug 13750: Fix capitalization All vs ALL
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit fae0ac954a3cd7d8d90786a75c508fa158309313
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Feb 22 11:50:21 2015 +0100
Bug 13750: Holds queue - Show branch name instead of branch code
When the holds queue report is limited to one library, it shows
<cound> items found for <branchcode>
With the patch applied, the branch name is shown instead of the code.
To test:
- Go to circulation > Holds queue
- Limit to one branch with holds waiting to be processed
- Confirm the string has changed to show the branch name
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit e7cde4cc20b3326b044a8d334f4b928d70845115
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Sat Mar 7 21:35:36 2015 +0100
Bug 13784: (QA followup) allow running Zebra for disabled instances on packages
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
commit 4acaa82fa101f892bab1e7e95db8d1ebcf286ea0
Author: Larry Baerveldt <larry at bywatersolutions.com>
Date: Tue Mar 3 05:49:57 2015 -0800
Bug 13784: koha-stop-zebra should also work for disabled instances
Currently koha-stop-zebra will not stop zebra for disabled instances. It should
work more like koha-stop-sip, which does work for disabled instances. Also,
koha-stop-zebra is called by '/etc/init.d/koha-common stop' which clearly
should also apply to disabled instances.
To Test:
1) Disable a koha instance.
2) Run koha-stop-zebra INSTANCE. You should get message
"Instance INSTANCE disabled. No action taken."
3) Apply patch, and copy patched file debian/scripts/koha-stop-zebra
to package site over /usr/sbin/koha-stop-zebra.
4) Disable koha instance.
5) Run koha-stop-zebra INSTANCE. It should now stop zebra.
http://bugs.koha-community.org/show_bug.cgi?id=13784
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
-----------------------------------------------------------------------
Summary of changes:
debian/scripts/koha-disable | 9 ++++++++
debian/scripts/koha-restart-zebra | 19 ++++++----------
debian/scripts/koha-start-zebra | 12 ++++------
debian/scripts/koha-stop-zebra | 12 ++++------
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 2 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 2 +-
.../prog/en/modules/labels/label-edit-layout.tt | 24 ++++++++++++++++----
tools/inventory.pl | 12 ++++++++--
8 files changed, 56 insertions(+), 36 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list