Owen Leonard [Tue, 25 Oct 2011 14:16:02 +0000 (10:16 -0400)]
Fix for Bug 7085 - Problems with searching for orders in acquisitions
Changing "if ( defined $input )" to "if ( $input )" in the section
of the script which builds the order search query seems to give
successful searches where they didn't exist before. Searches from
the advanced order search screen work with title, author, vendor,
basket number, date, etc.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Searches for date ranges, title and author keywords give
me the correct results now.
(cherry picked from commit 0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 31 Oct 2011 00:06:17 +0000 (01:06 +0100)]
Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
To test:
1) Add some suggestions
2) Go to suggestions in staff
3) Choose from filters 'suggested by' or 'managed by'
4) Compare names shown on tabs with names in list of suggestions
Before patch: tab name has the wrong order, while list name is correct.
After patch: all names should be consistent and correct.
Marcel de Rooy [Thu, 3 Nov 2011 12:41:24 +0000 (13:41 +0100)]
7146 (Update timestamps when deleting a biblio)
Currently, when you delete an item, the timestamp column in deleteditems is
updated with current time. (This comes from an [unintentional] additional
update statement in DelItem.) It makes deletion time visible.
In the past, the marcxml was updated too at that moment, resulting in an
updated timestamp in biblioitems too. The timestamp in biblio was not touched.
If you delete a biblio however, the timestamps in deletedbiblio and
deletedbiblioitems do not reflect time of deletion. They still show the time of
last update before the record was deleted. This last update can be extracted
from MARC field 005 too.
This behavior is not consistent nor logical. I would suggest to add a statement
in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
makes the time of deletion visible in the record too. The time of deletion of a
biblio can be very useful for e.g. synchronizing purposes.
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Wed, 19 Oct 2011 00:17:17 +0000 (20:17 -0400)]
Bug 7061: unnecessary global variables declared in C4::SQLHelper
Removes $tablename and $hash from global scope of C4/SQLHelper.pm. They are never used;
all instances of $table are locally scoped to the subroutines, and $hash is never used.
This may help with persistance; if not, it's at least a bit of trivial cleanup.
To test:
1. Search for a patron
2. Create a Contract in Acquisitions
3. Modify that Contract
4. Delete that Contract
All instances should return error free. This checks the subroutines of SQLHelper
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 36d8e5df96d17df3d19a4693fff2ba52504fae51)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6989 Patron categories not properly displayed if not pure ASCII
C4::Category module returns badly encoded patron categories when they are
containing non pure-ASCII characters.
To reproduce this bug:
- Go in Administration > Patron Categories
- Add a new category. Give it this code for example:
Café
- Click on Patrons link on top menu
- Click on New button
=> You get 'Café' displayed without accent
Signed-off-by: Piotr Wejman <ropuch@bagno.be> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d998166ea30e9d798c97d457afe39c748eed38ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Paul Poulain [Wed, 15 Dec 2010 13:05:04 +0000 (14:05 +0100)]
Bug 5885 : UNIMARC XSLT changes
dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I can't test this works ok for UNIMARC, but it does not cause any
problems with the translation scripts or MARC21 so signing off
(cherry picked from commit cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 21 Oct 2011 15:43:17 +0000 (11:43 -0400)]
Bug 7076: Lists render OPAC XSLT on staff side
Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
OPACResultsXSLT if the $type is 'opac'. Since parsing the XML is such an expensive
thing, and the resulting XSLTBloc is not used on the staff side, this will increase
performance for Lists in the intranet
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a0a9368beccd1748e720966f25869259a30e68f2)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
If the AcqCreateItem preference is set to "ordering" and the barcode for
the new item is already in use, no error is returned, but an invalid
itemnumber is saved in the aqorders_items table and the item is never
created.
This patch adds a duplicate barcode verification in neworderempty.pl
_koha_add_item is also modified so it won't return an invalid ID when
an item can't be added.
http://bugs.koha-community.org/show_bug.cgi?id=6963 Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan on second patch.
(cherry picked from commit 327be442bd6e63e5ff8c0a5e2461ae836e8deffb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Wed, 5 Oct 2011 03:39:08 +0000 (16:39 +1300)]
Bug 6895 : First attempt at fixing the diacritics bug
This is a fairly hacky solution, a counter patch would be more than
welcome
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Updated, translated and installed German po files after applying this patch.
No problems found.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes '' to "" to make it work for strings which contain '.
Patch does NOT add new strings to the po files.
Owen Leonard [Mon, 3 Oct 2011 12:59:18 +0000 (08:59 -0400)]
Fix for Bug 6955, Toolbar on reading history broken
Table sorter script causes error if there is no <tbody> to sort.
JS errors cause the YUI toolbar js to abort, causing the problem
observed. When there are no results the whole table should be
omitted and a message displayed in its place.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- check toolbar on top of patron reading history with no entries
- check toolbar on top of patron reading history after a few checkouts
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 54226b60f3e31ba52d6be88eeebcaf534ada296f)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Maxime Pelletier [Wed, 21 Sep 2011 18:15:39 +0000 (14:15 -0400)]
Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
http://bugs.koha-community.org/show_bug.cgi?id=6414 Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed off with a note: this doesn't fix everything mentioned in the bug.
It also might clash with bug 4831 and should be tested with that patch.
Ian Walls [Tue, 18 Oct 2011 14:18:14 +0000 (10:18 -0400)]
Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
was improperly scoped with 'my' inside a conditional. The changes followup to 5995
made this more apparent, causing logins to fail.
Also added "parts copyright" statement to the script, since ByWater Solutions did make some
significant contributions to the operations of the page
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 6483 - Paging in opac-detail when coming from a search
Add paging in opac-detail when coming from a search to be
able to continue viewing the previous and next register
from the detail without returning to the results.
The partial list pagination can be showed to increase forwarding
or rewinding in the pagination.
It's implemented for Zebra search and not build_grouped_results.
The param busc with all the information from the search is stored
on the session when running opac-search and opac-detail, outside these
pages the busc param is removed from the session.
A list of the biblionumbers inside the OPACnumSearchResults range
is passed to avoid repeating the searching everytime we see the
previous or next biblio. The searching will be run again when
we are going to exceed the list and a new one will be calculated
from the new search.
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 6854: Correct a double password encryption problem in import_borrowers.pl
When the CSV file has no password column and no default value was set for
the password :
If we try to modify an existing user, the password from the BD is sent
to ModMember, which then encrypts the already-encrypted password a
second time.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug on current master.
1) Import new patron with password provided
> OPAC login works
2) Overwrite patron record, password provided
> OPAC login works
3) Overwrite patron record, password not provided
Before patch: OPAC login broken, password in database changed
After patch: OPC login works with same password as before
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Marcel de Rooy [Mon, 17 Oct 2011 09:32:50 +0000 (11:32 +0200)]
7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter
Improving the cleanup_database.pl script in two aspects:
1) In some cases CGI::Session seems to place quotes around the atime and ctime
data in the a_session field. Two regexps now take this into account.
2) If the --sessdays parameter is used, the --sessions parameter is now
implicitly enabled too.
With thanks to Ian Bays and Tom Hanstra.
Signed-off-by: Ian Bays <ian.bays@ptfs-europe.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Tue, 18 Oct 2011 23:55:22 +0000 (19:55 -0400)]
Bug 7060: GetMemberDetails unnecessary in C4::Circulation
Replaces all instances of GetMemberDetails with the more efficient GetMember. Since
no hash values other than the borrowers table's fields are used in this module, the
transition is safe.
To test:
1. Checkout a material; the page should load without error
2. Renew a material: the page should load without error
3. Return a material: the page should load without error
The above test plan invokes all the subroutines affected by this patch; any call to an undefined
value in a hashref should give a warning
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Tue, 18 Oct 2011 22:31:00 +0000 (18:31 -0400)]
Bug 7059: Remove GetMemberDetails from reserve/request.pl
Replaces all four usages of GetMemberDetails with GetMember, since none of the
hashref fields used were anything other than those in borrower table, which GetMember
returns.
To Test:
1. Apply patch
2. Go to reserve/request.pl; the page should load without error
3. Search for a cardnumber: the page should load without error
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This little script, given a --days numeric parameter, will anonymise checkouts
before that many days ago. Useful for sites that want to automatically do this on
a periodic (cronnable) basis.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 4 Oct 2011 14:20:52 +0000 (10:20 -0400)]
Follow-up fix for Bug 4473 - Recent comments view for the OPAC
This follow-up adds a system preference which controls display
of a link to recent comments in the OPAC masthead alongside
"Advanced search," "Tag cloud," etc.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 17 Oct 2011 20:04:53 +0000 (22:04 +0200)]
Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
The item form on the order receive page (AcqCreateItem = on receive) contains a
lot of blank space which makes it hard to read and fill out.
To test:
- set AcqCreateItem = on receive
- create basket, order something, receive shipment
- check item form is nicely formatted and doesn't include lots of blank space
Note: It will be easier to test if you have an ACQ framework created to hide some
unnecessary subfields, because the hidden fields create the blank space.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Created an ACQ framework and hid some of the fields (hidden = 5). Before the
patch there were gaps between the fields as shown in the screenshot from
Katrin. After the patch fields line up nicely, with no extra space between
them.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
CanBookBeReserved uses the very heavy-weight function GetItemsInfo to simply retrieve
the itemnumbers attached to a given biblio. The function get_itemnumbers_of() is much
lighter-weight and returns the required information; switching to it will reduce the overall
system resource cost of placing a hold.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Does not break the web-installer and I'm assuming
Katrin is doing the right thing when it comes to
the German text, so signing off!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 6 Oct 2011 18:27:16 +0000 (14:27 -0400)]
Fix for Bug 6980, Patron attributes are shown when ExtendedPatronAttributes is disabled
This patch adds a check for the value of the ExtendedPatronAttributes
preference to the scripts and corresponding logic to the templates
controlling the sidebar menu.
The patch also corrects a duplication of attributes code in moremember.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Added extended patron attributes in configuration, turned ExtendedPatronAttributes on
2) Altered patron details, added values for patron attributes
> Verified patron attributes show show correctly
3) Turned off ExtendedPatronAttributes
> Verified patron attributes were hidden everywhere
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 3 Oct 2011 14:43:35 +0000 (10:43 -0400)]
Fix for Bug 6957, authors disappearing when emailing lists
Standard author information wasn't even in the template markup, only
"additional author." Added standard author and improved output of
additional authors (hiding label when empty).
Also added subtitle via GetRecordValue (see bug 3550).
Also added check for and output of OPACBaseURL in order
to make OPAC links in the email clickable.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
QA revision: renamed OPACBaseurl to OPACBaseURL for consistency
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Only contains db revision to insert new table need_merge_authorities.
You can apply the revision by running
cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
your version while testing.)
Oct 19, 2011: Rebased after functionality patch signoff.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
(AuthoritiesMarc.pm).
Instead of folder modified_authorities, now introducing a table for this
purpose: need_merge_authorities. This eliminates several permissions and
security issues. This change applies to AuthoritiesMarc.pm and
merge_authority.pl.
POD lines added for ModAuthority. Deprecated parameter $merge removed.
Test this patch by applying the db revision first from the second patch.
August 4, 2011: Rebased.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Thanks Marcel. It works as advertised. Both modes are functionnal
(back):
- Immediate with dontmerge=0: After modifying an authority record, its
linked biblios are immediately modified. This isn't the case in 3.4.5.
- Delayed with dontmerge=1: After modifying an authority record, its
linked biblios are not modified. But an entry is added to
need_merge_authority new table and 'merge_authorities.pl -b' script
updates biblios.
Comment: need_merge_authority, like zebraqueue, should be cleared
from time to time.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Mon, 3 Oct 2011 15:22:30 +0000 (11:22 -0400)]
Bug 6553: parentheses in authors break tracings
If an author's name includes parentheses or other escape-characters, the tracing links
produced in the OPAC and staff client fail in XSLT mode. This patch wraps the author names
in double-quotes, providing the necessary escapement.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- Create a new framework, delete Thesaurus from 700 and other fields
- Create a new record in this framework
- Add 700$a - use parentheses
- Check the search links in OPAC and staff detail pages
> before patch link was broken, after it works
Note: Links are only broken when no authorities are being used.
When using authorities the link uses the auth number instead of the text
for linking, so the parentheses don't matter for search.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Wed, 19 Oct 2011 15:46:21 +0000 (11:46 -0400)]
Bug 6253 followup: explicitly check ref value for ARRAY before casting
in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
if the incoming $operand is not a ref. However, the incoming $operand could be some other
kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.
Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.
To test, run t/db_dependent/Members.t. Before, it fails after test 3. After, it completes all tests.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I verified that the new files works with the web installer, permissions
can be set and removed.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 5680: Follow Up for Order cancelling improvement : the same for parcel.pl
The same scope than in basket.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Detailed information about possible deletion of orders on parcel page.
1) Delete order for record with 1 other item and item level hold
OK. Record, item and hold remain, only on order item is deleted.
2) Delete order for ordered record with 1 item and title level hold
OK. Deletion is not possible, before hold is cancelled.
3) Delete order for new record with only items connected to this order
OK. Cancelling the order deletes record and item or only order,
depending on link used.
4) Delete order for record with subscription.
OK. Subscription remains untouched, item is deleted.
Also checked:
AcqCreateItem = on receive / in cataloging
Links show and it's possible to delete the order or only the record
using different links.
Comments:
There is a table sorter option for the last column with the delete links.
I am not sure it is useful here, but it does work.
Before patch is applied, the links use 'cancel' instead of 'delete'.
I am not sure which is better and if it should be different on
basket summary and order receive or the same on both.
QA Comment:
Made a small change to template language; blocking deletion because of items referred to
holds instead. Changed text to refer to items. Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 5680: Order cancelling improvement : delete attached items & biblio if avalaible
- all items attached to the order are deleted
- if there is no more items, and if the biblio is not in other orders and no subscriptions and no holds then the biblio is proposed to deletion
Now whe have 2 links : "delete order" and "delete order and catalog record", the second one appears only if the deletion is possible.
Note that if an hold is related to the item or if the item is unique for the biblio the link "Delete order" is canceled due to hold remaining.
On mouse over explanations are shown with count.
More lines of warnings with count are shown depending of the case.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Configuration:
AcqCreateItem = on order
Test cases and results:
1) Order new record with 2 items
a) From basket
- delete order: only deletes items, OK!
- delete order and catalog record: deletes record and items, OK
b) From shipment/receive
- delete order: only deletes items, OK!
2) Order 1 additional item for existing record with 1 item
a) From basket:
- delete order: works, existing item and record remain, OK
- Can't delete order and catalog record, 1 item left, OK!
3) Order new record with 1 item, title level hold on record
a) From basket:
- delete order: not possible, OK!
- delete orer and catalog record: not possible, OK!
b) From shipment/receive page
- Cancel: Deletes order, record and hold silently.
NO WARNING. NOT OK. See note below.
4) Order 1 additional item for existing record with 1 item,
item level hold on existing item
a) From basket:
- delete order: works, hold and existing item remain, OK!
- delete order and catalog record: not possible, OK!
b) From shipment/receive page
- Cancel: on order item is deleted, other item and hold remain.
5) Order new serial record, create subscription
a) From basket:
- delete order: works, record and subscription remain, OK!
- delete order and catalog record: not possible, OK!
b) From shipment/receive page:
- Cancel: Subscription and record are silently deleted. NOT OK.
6) Order additional item for existing record with other on order items
a) From basket:
- delete order: works, existing on order items remain, OK!
- delete order and catalog record: not possible, OK!
b) From shipment:
- Cancel: deletes order and ordered item. OK.
Changes made:
I changed the wording of the error messages a bit in the template.
I changed the message 'Can't delete order and catalog record' to not be
shown as a link, as the link does nothing. Tooltip still appears.
I attached a screenshot to the bug showing some of my changes.
Hope that's ok.
Necessary enhancements:
Cancelling orders when receiving items should work the same as from the
basket summary page. We need the same checks and messages there before
deleting records and items automatically.
I am signing off on this, but to go into Koha it needs a follow-up for the
order receive page. Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Fri, 7 Oct 2011 11:38:15 +0000 (13:38 +0200)]
Bug 6982 - Don't show MARC tag documentation links for NORMARC
Links to UNIMARC documentation were being shown when marcflavour =
NORMARC. This patch hides the doc link functionality for NORMARC
by hiding:
1. The checkbox for turning doc links on/off
2. The hyperlinked questionmarks
This patch does not hide e.g. the JavaScript functions related to
the doc link functionality, in order to make it easy to add
doc links for NORMARC in the future (hopefully).
The doc link functionality was passing a variable called MARC21
(based on the contents of the marcflavour syspref) to the
template and testing the value of this to decide if MARC21 or
UNIMARC doc links were to be shown. I have replaced this variable
with he standard/full marcflavour syspref, in order to make it
possible to test for more then two MARC dialects.
To test:
- Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one
after the other.
- Check that correct doc links are shown for MARC21 and UNIMARC
on the cataloguing screen, and that no checkbox and no doc links
are displayed for NORMARC.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described - thx for the great test plan!
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Fri, 29 Apr 2011 17:31:40 +0000 (19:31 +0200)]
Bug 6285 strange order in CSV upload
uploading the circ overdues result in a csv with columns in a strange order
and not the order of the screen
This patch reorder the column by putting the usefull ones first
Signed-off-by: Magnus Enger <magnus@enger.priv.no> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 28 Sep 2011 06:09:01 +0000 (19:09 +1300)]
Bug 6929 - ensure that koha-stop-zebra will try to stop everything
Currently, if it attempts to stop a zebra process that doesn't exist,
the script will abort, which leaves things running. This patch prevents
it from aborting.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Removed SearchMembers() and replaced with more generic Search()
Amended Search() to try cardnumber first
Replaced SearchMembers() calls with Search()
Replaced SELECT with Search() where appropriate
C4::SQLHelper:
- added support for '' key for search filter.
- when passing an array to filter, join with OR (rather than AND)
- added support for key => [val1, val2] in filter
- did not document - there was no input documentation to start with,
and SQLHelper should be replaced with something better anyway
Signed-off-by: Liz Rea <lrea@nekls.org>
(again - testing merge issue)
The functionality of the patch seems to be maintained with Biblibre's changes.
I tested the following:
Extended attribute searching: works
3 part name searching: works
2 part name searching: works
1 part name searching: works
From:
mainpage.pl
members-home.pl
Patron search limited by branch: Works
Patron search limited by patron category: works
Ordering by cardnumber instead of surname: works
The "Check Out" field in the masthead.
Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch. Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 7007: 490 series statements should appear when not traced
Although the MARC21 standard requires libraries to set the first indicator to
'0' when a 490 field is untraced, many libraries leave it blank. Previously,
this resulted in a blank line with the label "Series:" but no actual series
information. This patch fixes that by showing untraced series headings for
490s whenever the first indicator is not set to '1'
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked that series shows correctly when first indicator is 0, 1 or not set.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Mon, 17 Oct 2011 06:03:29 +0000 (08:03 +0200)]
Bug 7026 Web installer does not switch language
Language installer should switch to template files of language selected in
first step. It used to do that, but the feature seems to be broken now. Web
installer remains English after selecting a different language.
To reproduce:
- make sure your database is empty
- run 'perl translate install <some language>
- access web installer
- select language other then en on the first page
=> templates should change to translated templates
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan provided works, correct language and sample files are selected.
In a second test I deleted the staff templates for de-DE and repeated
the steps. de-DE is not offered in the language selection of the web installer
now, but does appear in the opaclanguages list after running the web installer.
(Bug 5660)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Fri, 16 Sep 2011 22:32:54 +0000 (00:32 +0200)]
Bug 7051 de-nesting C4::Reserve, 1st step
C4::Search is not used, so removing it from C4::Reserves Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Fri, 16 Sep 2011 16:09:57 +0000 (18:09 +0200)]
Bug 7034: de-nesting C4/Branch.pm
use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of
the sub get_branchinfos_of was used nowhere
(checked with "grep -R get_branchinfos_of *")
only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)
This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test
The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Thu, 13 Oct 2011 14:11:46 +0000 (10:11 -0400)]
Bug 6949: cannot remove owner from fund
The Javascript to remove an owner from a budget cleared the name from the screen, but did not remove
the actual value in the form, so when saving, the original owner was retained.
This patch adds the command to set the value to ''.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could reproduce the bug on current master. Patch fixes the problem, fund
owners can now be added and removed without any problems.
Thx for providing a test plan!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Tue, 4 Oct 2011 16:46:24 +0000 (12:46 -0400)]
Bug 6954: z39.50 results highlighting not sticking
Moves the highlighting call of the JS up to right after 'row' is defined, so the
highlighting will stick even after you click on of the popup menu options
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Sun, 16 Oct 2011 19:50:24 +0000 (21:50 +0200)]
Bug 7038 Contextual help is always in English
When another language than English is selected in pro interface, the software
strings are in this language, but when clicking ?, on the top right of any
page, the contextual help page which pop-up is always in English.
This patch fixes this bug and another side bug affecting editing contextual
help when not in English. help.pl script were in sync with the recently
patched/improved theme/language/template selection.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Context help now matches the selected template language.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Thu, 13 Oct 2011 20:21:52 +0000 (22:21 +0200)]
Bug 7022: Move sample_notices* sql files from optional to mandatory
Sending messages will not work correctly without correct data in sample_notice_message_transports
and sample_notice_message_attributes tables. There is no way to configure those tables in Koha.
SQL files should be in the mandatory part of the web installer.
Signed-off-by: MJ Ray <mjr@phonecoop.coop> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Code written by Edgar Fuß <ef@math.uni-bonn.de>,
Mathematisches Institut der Uniersität Bonn
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- rebased on current master, fixed a conflict in booksellers.pl
- reworked permission checks to account for general acq permissions and
superlibrarian permission
- rephrased text of system preference (Thx to Jared Camins-Esakov)
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Code written by Edgar Fuß <ef@math.uni-bonn.de>,
Mathematisches Institut der Uniersität Bonn
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- rebased on current master, fixed a conflict in booksellers.pl
- reworked permission checks to account for general acq permissions and
superlibrarian permission
- rephrased text of system preference (Thx to Jared Camins-Esakov)
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Nicole C. Engard [Sat, 15 Oct 2011 02:39:56 +0000 (22:39 -0400)]
Bug 7044 OPAC Branch Selector Fix
There was a typo in the OPAC branch selector added by
the OpacAddMastheadLibraryPulldown preference where the
current branch wasn't selected. This patch fixes that typo.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Srdjan Jankovic [Mon, 17 Oct 2011 02:31:29 +0000 (15:31 +1300)]
bug_5533: Slightly improved marking items as lost
Call LostItem() whenever item is lost.
LostItem() new arg - mark returned.
Disabled Lost Status on catalogue item edit.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
For follow up we need to explain how to hide the 952$1 (lost) from
the framework by putting it in the 'ignore' tab.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 13 Oct 2011 14:02:38 +0000 (10:02 -0400)]
Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
The display of messages "to the patron" on the checkout screen
lacked the same logic controlling messages "to other librarians,"
affecting conditions under which the [Delete] link would be shown.
This match makes the two categories consistent with each other:
A delete link will be shown if the logged in branch matches the
branch where the message was set OR if AllowAllMessageDeletion
is turned on.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 13 Oct 2011 15:59:48 +0000 (11:59 -0400)]
Fix for Bug 7019 - Circulation History Sort Order Wrong
The return column sort was not using the right sort algorithm
because it was confused by the combination of date data and
text data ("Checked out"). I've added an explicit instruction
to sort by date. The downside to this change is that checked
out items are sorted with the oldest checkouts rather than
the newest:
Checked Out
Checked Out
10/14/1988
07/14/2005
Not perfect, but an improvement over completely incorrect
sorting. This patch also adds the necessary check for system
dateformat preference to properly sort metric dates.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Thu, 13 Oct 2011 05:33:39 +0000 (07:33 +0200)]
Bug 6904: Changes 'asked' to 'pending' in suggestions for more consistency
In some places the suggestions were 'pending' in others the same status
was named 'pending'. This patch changes the status to 'pending' in all
places on the suggestion page to make it more consistent.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl
Widen module name allowance in the format statement, adjust other
columns to be generous but not-so-much as before, modify report
header and footer print statements to align and clarify. Very very
long module names or version numbers are still subject to possible
truncation.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Sign off comment: With this patch module names are not truncated, which is an
improvement. Lines are still too long to fit an 80 column display, and so they
wrap around, but tht is a minor annoyance compared to the truncated names.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Tue, 30 Aug 2011 13:58:36 +0000 (14:58 +0100)]
Bug 6806 Fix encoding of title in subscription-add
Port of Maxime Pelletier <maxime.pelletier@libeo.com>'s patch for
3.2 to TT
Stops the mangling of titles containing accented characters
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Thu, 25 Aug 2011 22:32:51 +0000 (18:32 -0400)]
Bug 6789: biblios with many items can result in broken search results link
This patch fixes an issue whereby biblios with many items (often > 500) would index,
but not the biblionumber itself, resulting in search results with a) inaccurate item counts
and b) no biblionumber to use in the link to the details page. This is due to Net::Z3950::ZOOM not providing
a mechanism for specifying different connection attributes; the maximumRecordSize ZOOM connection attribute,
if not specified, defaults to 1MB, which is less than the size of a MARC record with many, many 952 fields. Since
it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch aims to build a workaround on the Koha end.
This patch changes EmbedItemsInMarcBiblio to use append_fields instead of insert_ordered_fields,
so the 999$c will come before the item records. It's VERY unlikely we will encounter more than 1MB of biblio-level MARC
content, as this would break the ISO-2709 standard by a large factor.
To this end, it also moves the fix_biblio_ids portion of get_corrected_marc_record out of rebuild_zebra.pl,
and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio, so the 952s still come last). fix_biblio_ids
is kept as a subroutine for the deletion portion of rebuild_zebra.pl, which still uses it.
It also uses the subroutine parameter in GetMarcBiblio to do the EmbedItemsInMarcBiblio action, rather than having
rebuild_zebra.pl perform it on the itemless record returned from GetMarcBiblio. Simpler and cleaner that way.
To verify bug issue:
1. Find a biblio with over 700 items (or enough that the resulting MARCXML is greater than 1MB)
2. search for this biblio (in a search that would return multiple results, not just this title). You should get the title in
the results list
3. attempt to click the link to this biblio's details page; the biblionumber should be blank, leading to a 404
To test solution:
1. Apply patch
2. modify the biblio slightly (click the 005 for example) and save
OR manually add the biblio to zebraqueue for reindexing
3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The title should still appear.
4. click the link, and find yourself on the biblio detail page as desired
Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Fri, 14 Oct 2011 20:37:54 +0000 (16:37 -0400)]
Bug 5995 Followup: checkpw was returning inconsistent values
In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
userid. This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
desired value in the right way.
Owen Leonard [Wed, 5 Oct 2011 13:53:02 +0000 (09:53 -0400)]
Fix for Bug 6970 - logout not redirecting to login page
For some reason the latest version of Firefox doesn't like
the javascript which empties the cart on logout. As Ian points
out, there is code which tries to redirect to "about:blank"
and close the window (since the main context of the function
is the Cart's popup window.
This patch adds a parameter to the delBasket function so
that we can pass a "popup" context to the function and
choose whether or not we want to ask JS to close the window.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Fri, 9 Sep 2011 15:17:19 +0000 (11:17 -0400)]
Bug 6862: Duplicate VOKAL Book icons
Removes duplicate VOKAL icons for Book.png and Book-32px.png. Database updated in both
itemtypes and authorised_values tables to reflect change, so no icon loss should be seen
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
projects / koha.git / log
![13 years agoBug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space](/gitweb/Members/js/jscripts/bar_r.gif?p=koha.git;a=commit;h=224140a2b60aa7bbf4aeb352e1c31f80974a05db){kind=link}
![13 years agoBug 7027: [SIGNED-OFF] Corrections to German web installer txt files](/gitweb/Members/js/jscripts/bar_r.gif?p=koha.git;a=commit;h=a46cbc03ee60b8894e5f37f830d2deea4629aa05){kind=link}
![13 years agoBug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl](/gitweb/Members/js/jscripts/bar_r.gif?p=koha.git;a=commit;h=e5e5e3155e4c4b3f51415d08a324f84142e91f3d){kind=link}
